diff options
| author | Guillaume | 2017-11-16 17:15:51 +0100 |
|---|---|---|
| committer | Guillaume | 2017-11-16 17:15:51 +0100 |
| commit | b98be0d687a200624b5cf0f8eef7e0892493552f (patch) | |
| tree | 11ae7d2d0801f05653d873cc83e14f647cb5c567 | |
| parent | 3f39b62beb9ff7af741696a6c3c7e87737c3a257 (diff) | |
| download | chouette-core-b98be0d687a200624b5cf0f8eef7e0892493552f.tar.bz2 | |
Refs #4941 rename ObjectidFormater modules to ObjectidFormatter
| -rw-r--r-- | app/models/chouette/objectid_formater/netex.rb | 4 | ||||
| -rw-r--r-- | app/models/chouette/objectid_formater/stif_codifligne.rb | 4 | ||||
| -rw-r--r-- | app/models/chouette/objectid_formater/stif_netex.rb | 4 | ||||
| -rw-r--r-- | app/models/chouette/objectid_formater/stif_reflex.rb | 4 | ||||
| -rw-r--r-- | app/models/concerns/objectid_formater_support.rb | 6 | ||||
| -rw-r--r-- | app/models/line_referential.rb | 2 | ||||
| -rw-r--r-- | app/models/referential.rb | 2 | ||||
| -rw-r--r-- | app/models/stop_area_referential.rb | 2 | ||||
| -rw-r--r-- | app/models/workbench.rb | 2 |
9 files changed, 15 insertions, 15 deletions
diff --git a/app/models/chouette/objectid_formater/netex.rb b/app/models/chouette/objectid_formater/netex.rb index 0736b6ff9..13bcc195e 100644 --- a/app/models/chouette/objectid_formater/netex.rb +++ b/app/models/chouette/objectid_formater/netex.rb @@ -1,5 +1,5 @@ module Chouette - module ObjectidFormater + module ObjectidFormatter class Netex def before_validation(model) model.objectid ||= Chouette::Objectid::Netex.new(local_id: SecureRandom.uuid, object_type: model.class.name.gsub(/Chouette::/,'')).to_s @@ -15,4 +15,4 @@ module Chouette end end end -end
\ No newline at end of file +end diff --git a/app/models/chouette/objectid_formater/stif_codifligne.rb b/app/models/chouette/objectid_formater/stif_codifligne.rb index 53fd28c82..b033b9b7d 100644 --- a/app/models/chouette/objectid_formater/stif_codifligne.rb +++ b/app/models/chouette/objectid_formater/stif_codifligne.rb @@ -1,5 +1,5 @@ module Chouette - module ObjectidFormater + module ObjectidFormatter class StifCodifligne def before_validation(model) # unused method in this context @@ -15,4 +15,4 @@ module Chouette end end end -end
\ No newline at end of file +end diff --git a/app/models/chouette/objectid_formater/stif_netex.rb b/app/models/chouette/objectid_formater/stif_netex.rb index 88995dd05..004dd2ec9 100644 --- a/app/models/chouette/objectid_formater/stif_netex.rb +++ b/app/models/chouette/objectid_formater/stif_netex.rb @@ -1,5 +1,5 @@ module Chouette - module ObjectidFormater + module ObjectidFormatter class StifNetex def before_validation(model) model.objectid ||= "__pending_id__#{rand(50)+ rand(50)}" @@ -17,4 +17,4 @@ module Chouette end end end -end
\ No newline at end of file +end diff --git a/app/models/chouette/objectid_formater/stif_reflex.rb b/app/models/chouette/objectid_formater/stif_reflex.rb index e6c6a6a70..c9e19d87b 100644 --- a/app/models/chouette/objectid_formater/stif_reflex.rb +++ b/app/models/chouette/objectid_formater/stif_reflex.rb @@ -1,5 +1,5 @@ module Chouette - module ObjectidFormater + module ObjectidFormatter class StifReflex def before_validation(model) # unused method in this context @@ -15,4 +15,4 @@ module Chouette end end end -end
\ No newline at end of file +end diff --git a/app/models/concerns/objectid_formater_support.rb b/app/models/concerns/objectid_formater_support.rb index 1064b156f..2138ac89e 100644 --- a/app/models/concerns/objectid_formater_support.rb +++ b/app/models/concerns/objectid_formater_support.rb @@ -1,4 +1,4 @@ -module ObjectidFormaterSupport +module ObjectidFormatterSupport extend ActiveSupport::Concern included do @@ -9,7 +9,7 @@ module ObjectidFormaterSupport end def objectid_formater_class - "Chouette::ObjectidFormater::#{read_attribute(:objectid_format).camelcase}".constantize if read_attribute(:objectid_format) + "Chouette::ObjectidFormatter::#{read_attribute(:objectid_format).camelcase}".constantize if read_attribute(:objectid_format) end end -end
\ No newline at end of file +end diff --git a/app/models/line_referential.rb b/app/models/line_referential.rb index 90a045935..f4cf9cb30 100644 --- a/app/models/line_referential.rb +++ b/app/models/line_referential.rb @@ -1,5 +1,5 @@ class LineReferential < ActiveRecord::Base - include ObjectidFormaterSupport + include ObjectidFormatterSupport extend StifTransportModeEnumerations extend Enumerize diff --git a/app/models/referential.rb b/app/models/referential.rb index 04b5e3102..ca6a21e35 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -1,6 +1,6 @@ class Referential < ActiveRecord::Base include DataFormatEnumerations - include ObjectidFormaterSupport + include ObjectidFormatterSupport extend Enumerize validates_presence_of :name diff --git a/app/models/stop_area_referential.rb b/app/models/stop_area_referential.rb index 1e544e116..20644c3bb 100644 --- a/app/models/stop_area_referential.rb +++ b/app/models/stop_area_referential.rb @@ -1,6 +1,6 @@ class StopAreaReferential < ActiveRecord::Base extend Enumerize - include ObjectidFormaterSupport + include ObjectidFormatterSupport has_many :stop_area_referential_memberships has_many :organisations, through: :stop_area_referential_memberships diff --git a/app/models/workbench.rb b/app/models/workbench.rb index 5c8bfa782..1f0593cfe 100644 --- a/app/models/workbench.rb +++ b/app/models/workbench.rb @@ -1,5 +1,5 @@ class Workbench < ActiveRecord::Base - include ObjectidFormaterSupport + include ObjectidFormatterSupport extend Enumerize belongs_to :organisation belongs_to :line_referential |
