split modules objectid_format, remove alias referential

17 files changed, 27 insertions, 18 deletions

diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index ac7a7a0d9..f324dbd04 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -2,7 +2,7 @@ class Chouette::Company < Chouette::ActiveRecord
   include CompanyRestrictions
   include StifCodifligneAttributesSupport
   include LineReferentialSupport
-  include ObjectIdFormat
+  include ObjectIdFormatToLineReferential
 
   has_many :lines
 
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 7c801794f..1ba8ff61a 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -1,7 +1,7 @@
 class Chouette::JourneyPattern < Chouette::TridentActiveRecord
   include ChecksumSupport
   include JourneyPatternRestrictions
-  include ObjectIdFormat
+  include ObjectIdFormatToReferential
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index ba48068c9..383f5ceae 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -2,7 +2,7 @@ class Chouette::Line < Chouette::ActiveRecord
   include StifCodifligneAttributesSupport
   include LineRestrictions
   include LineReferentialSupport
-  include ObjectIdFormat
+  include ObjectIdFormatToLineReferential
   extend StifTransportModeEnumerations
   extend StifTransportSubmodeEnumerations
 
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index 69a0bd484..76c587141 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -2,7 +2,7 @@ class Chouette::Network < Chouette::ActiveRecord
   include StifCodifligneAttributesSupport
   include NetworkRestrictions
   include LineReferentialSupport
-  include ObjectIdFormat
+  include ObjectIdFormatToLineReferential
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 66743afbd..d0c1adf1c 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -1,7 +1,7 @@
 class Chouette::Route < Chouette::TridentActiveRecord
   include RouteRestrictions
   include ChecksumSupport
-  include ObjectIdFormat
+  include ObjectIdFormatToReferential
 
   extend Enumerize
   extend ActiveModel::Naming
diff --git a/app/models/chouette/routing_constraint_zone.rb b/app/models/chouette/routing_constraint_zone.rb
index efe1b7237..0e22acd42 100644
--- a/app/models/chouette/routing_constraint_zone.rb
+++ b/app/models/chouette/routing_constraint_zone.rb
@@ -1,5 +1,6 @@
 class Chouette::RoutingConstraintZone < Chouette::TridentActiveRecord
   include ChecksumSupport
+  include ObjectIdFormatToReferential
 
   belongs_to :route
   has_array_of :stop_points, class_name: 'Chouette::StopPoint'
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index de2d4b01c..0735d9cae 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -10,7 +10,6 @@ class Chouette::StopArea < Chouette::ActiveRecord
   include ProjectionFields
   include StopAreaRestrictions
   include StopAreaReferentialSupport
-  include ObjectIdFormat
 
   extend Enumerize
   enumerize :area_type, in: %i(zdep zder zdlp zdlr lda)
@@ -64,6 +63,10 @@ class Chouette::StopArea < Chouette::ActiveRecord
     end
   end
 
+  def objectid_format
+    "#{self.stop_area_referential.objectid_format}_attributes_support".camelcase.constantize
+  end
+
   def coordinates
       @coordinates || combine_lat_lng
   end
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 7490d175b..99a893602 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -7,7 +7,7 @@ module Chouette
 
     include ForBoardingEnumerations
     include ForAlightingEnumerations
-    include ObjectIdFormat
+    include ObjectIdFormatToReferential
 
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 868b82f59..f4db0c3b1 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -1,7 +1,7 @@
 class Chouette::TimeTable < Chouette::TridentActiveRecord
   include ChecksumSupport
   include TimeTableRestrictions
-  include ObjectIdFormat
+  include ObjectIdFormatToReferential
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index ff7f4dc34..5e1b76ceb 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -2,7 +2,7 @@ module Chouette
   class VehicleJourney < TridentActiveRecord
     include ChecksumSupport
     include VehicleJourneyRestrictions
-    include ObjectIdFormat
+    include ObjectIdFormatToReferential
     extend StifTransportModeEnumerations
     # FIXME http://jira.codehaus.org/browse/JRUBY-6358
     self.primary_key = "id"
diff --git a/app/models/concerns/object_id_format.rb b/app/models/concerns/object_id_format.rb
deleted file mode 100644
index 55b93ec81..000000000
--- a/app/models/concerns/object_id_format.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ObjectIdFormat
-  def object_id_format
-    self.referential.object_id_format
-  end
-end
diff --git a/app/models/concerns/object_id_format_to_line_referential.rb b/app/models/concerns/object_id_format_to_line_referential.rb
new file mode 100644
index 000000000..205f7e4e2
--- /dev/null
+++ b/app/models/concerns/object_id_format_to_line_referential.rb
@@ -0,0 +1,5 @@
+module ObjectIdFormatToLineReferential
+  def objectid_format
+    "#{self.line_referential.objectid_format}_attributes_support".camelcase.constantize
+  end
+end
diff --git a/app/models/concerns/object_id_format_to_referential.rb b/app/models/concerns/object_id_format_to_referential.rb
new file mode 100644
index 000000000..2371aa0be
--- /dev/null
+++ b/app/models/concerns/object_id_format_to_referential.rb
@@ -0,0 +1,5 @@
+module ObjectIdFormatToReferential
+  def objectid_format
+    "#{self.referential.objectid_format}_attributes_support".camelcase.constantize
+  end
+end
diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb
index b841ea6a9..cbe07e9b1 100644
--- a/app/models/line_referential.rb
+++ b/app/models/line_referential.rb
@@ -10,7 +10,7 @@ class LineReferential < ActiveRecord::Base
   has_many :networks, class_name: 'Chouette::Network'
   has_many :line_referential_syncs, -> { order created_at: :desc }
   has_many :workbenches
-  enumerize :object_id_format, in: %w(netx netx_stif)
+  enumerize :objectid_format, in: %w(default_netex stif_netex)
 
   def add_member(organisation, options = {})
     attributes = options.merge organisation: organisation
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 37cad3c7d..e4721a405 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -56,7 +56,7 @@ class Referential < ActiveRecord::Base
 
   belongs_to :referential_suite
 
-  enumerize :object_id_format, in: %w(netx netx_stif)
+  enumerize :objectid_format, in: %w(default_netex stif_netex)
 
   scope :ready, -> { where(ready: true) }
   scope :in_periode, ->(periode) { where(id: referential_ids_in_periode(periode)) }
diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb
index a46dbd908..c05d6e6be 100644
--- a/app/models/stop_area_referential.rb
+++ b/app/models/stop_area_referential.rb
@@ -6,7 +6,7 @@ class StopAreaReferential < ActiveRecord::Base
   has_many :stop_areas, class_name: 'Chouette::StopArea'
   has_many :stop_area_referential_syncs, -> {order created_at: :desc}
   has_many :workbenches
-  enumerize :object_id_format, in: %w(netx netx_stif)
+  enumerize :objectid_format, in: %w(default_netex stif_netex)
 
   def add_member(organisation, options = {})
     attributes = options.merge organisation: organisation
diff --git a/app/models/workbench.rb b/app/models/workbench.rb
index 9b1bb7e09..22cad0f7f 100644
--- a/app/models/workbench.rb
+++ b/app/models/workbench.rb
@@ -4,7 +4,7 @@ class Workbench < ActiveRecord::Base
   belongs_to :line_referential
   belongs_to :stop_area_referential
   belongs_to :output, class_name: 'ReferentialSuite'
-  enumerize :object_id_format, in: %w(netx netx_stif)
+  enumerize :objectid_format, in: %w(default_netex stif_netex)
 
   has_many :lines, -> (workbench) { Stif::MyWorkbenchScopes.new(workbench).line_scope(self) }, through: :line_referential
   has_many :networks, through: :line_referential