From 9304f16e56c219fd63fa12b7d42a7cbf16b2914a Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 21 Nov 2017 15:32:22 +0100
Subject: Change the way we name classes We now always use modules for
 namespaces => same structure for models, decorators, policies...

---
 app/models/chouette/objectid/netex.rb           | 46 ++++++++++++++-----------
 app/models/chouette/objectid/stif_codifligne.rb | 12 ++++---
 app/models/chouette/objectid/stif_netex.rb      | 18 ++++++----
 app/models/chouette/objectid/stif_reflex.rb     | 13 +++----
 4 files changed, 50 insertions(+), 39 deletions(-)

(limited to 'app/models/chouette/objectid')

diff --git a/app/models/chouette/objectid/netex.rb b/app/models/chouette/objectid/netex.rb
index b83ef7b8d..7953c6b12 100644
--- a/app/models/chouette/objectid/netex.rb
+++ b/app/models/chouette/objectid/netex.rb
@@ -1,29 +1,33 @@
-class Chouette::Objectid::Netex
-  include ActiveModel::Model
+module Chouette
+  module Objectid
+    class Netex
+      include ActiveModel::Model
 
-  attr_accessor :provider_id, :object_type, :local_id, :creation_id
-  validates_presence_of :provider_id, :object_type, :local_id, :creation_id
-  validate :must_respect_format
+      attr_accessor :provider_id, :object_type, :local_id, :creation_id
+      validates_presence_of :provider_id, :object_type, :local_id, :creation_id
+      validate :must_respect_format
 
-  def initialize(**attributes)
-    @provider_id ||= (attributes[:provider_id] ||= 'chouette')
-    @object_type = attributes[:object_type]
-    @local_id = attributes[:local_id]
-    @creation_id = (attributes[:creation_id] ||= 'LOC')
-  end
+      def initialize(**attributes)
+        @provider_id ||= (attributes[:provider_id] ||= 'chouette')
+        @object_type = attributes[:object_type]
+        @local_id = attributes[:local_id]
+        @creation_id = (attributes[:creation_id] ||= 'LOC')
+      end
 
-  @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
-  cattr_reader :format
+      @@format = /^([A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+      cattr_reader :format
 
-  def to_s
-    "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
-  end
+      def to_s
+        "#{self.provider_id}:#{self.object_type}:#{self.local_id}:#{self.creation_id}"
+      end
 
-  def must_respect_format
-    self.to_s.match(format)
-  end
+      def must_respect_format
+        self.to_s.match(format)
+      end
 
-  def short_id
-    local_id
+      def short_id
+        local_id
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_codifligne.rb b/app/models/chouette/objectid/stif_codifligne.rb
index d1a1e7862..a1e40f0a1 100644
--- a/app/models/chouette/objectid/stif_codifligne.rb
+++ b/app/models/chouette/objectid/stif_codifligne.rb
@@ -1,10 +1,12 @@
-class Chouette::Objectid::StifCodifligne < Chouette::Objectid::Netex
+module Chouette
+  module Objectid
+    class StifCodifligne < Chouette::Objectid::Netex
 
-  attr_accessor :sync_id
-  validates_presence_of :sync_id
-  validates :creation_id, presence: false
+      attr_accessor :sync_id
+      validates_presence_of :sync_id
+      validates :creation_id, presence: false
 
-  @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
+      @@format = /^([A-Za-z_]+):([A-Za-z]+):([A-Za-z]+):([0-9A-Za-z_-]+)$/
 
       def initialize(**attributes)
         @provider_id = attributes[:provider_id]
diff --git a/app/models/chouette/objectid/stif_netex.rb b/app/models/chouette/objectid/stif_netex.rb
index 26700bf4b..80208af56 100644
--- a/app/models/chouette/objectid/stif_netex.rb
+++ b/app/models/chouette/objectid/stif_netex.rb
@@ -1,11 +1,15 @@
-class Chouette::Objectid::StifNetex < Chouette::Objectid::Netex
+module Chouette
+  module Objectid
+    class StifNetex < Chouette::Objectid::Netex
 
-  def initialize(**attributes)
-    @provider_id = (attributes[:provider_id] ||= 'stif')
-    super
-  end
+      def initialize(**attributes)
+        @provider_id = (attributes[:provider_id] ||= 'stif')
+        super
+      end
 
-  def short_id
-    local_id.try(:split, "-").try(:[], -1)
+      def short_id
+        local_id.try(:split, "-").try(:[], -1)
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/app/models/chouette/objectid/stif_reflex.rb b/app/models/chouette/objectid/stif_reflex.rb
index 6ffaf7c0e..69a3f52fa 100644
--- a/app/models/chouette/objectid/stif_reflex.rb
+++ b/app/models/chouette/objectid/stif_reflex.rb
@@ -1,10 +1,12 @@
-class Chouette::Objectid::StifReflex < Chouette::Objectid::Netex
+module Chouette
+  module Objectid
+    class StifReflex < Chouette::Objectid::Netex
 
-  attr_accessor :country_code, :zip_code
-  validates_presence_of :country_code, :zip_code
-  validates :creation_id, presence: false
+      attr_accessor :country_code, :zip_code
+      validates_presence_of :country_code, :zip_code
+      validates :creation_id, presence: false
 
-  @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
+      @@format = /^([A-Za-z_]+):([0-9A-Za-z_-]+):([A-Za-z]+):([0-9A-Za-z_-]+):([A-Za-z]+)$/
 
       def initialize(**attributes)
         @provider_id = attributes[:provider_id]
@@ -18,5 +20,4 @@ class Chouette::Objectid::StifReflex < Chouette::Objectid::Netex
       end
     end
   end
-
 end
\ No newline at end of file
-- 
cgit v1.2.3