From ea6537e2f520ca9abba0ca63c68ee42afe08d872 Mon Sep 17 00:00:00 2001
From: Robert
Date: Fri, 29 Sep 2017 17:01:18 +0200
Subject: Refs: #4627@0.15h;

Put old behavior under tests, thusly also showing the motivation of this ticket.
---
 app/models/compliance_control.rb                   | 1 +
 app/models/generic_attribute_control/min_max.rb    | 1 +
 app/models/generic_attribute_control/pattern.rb    | 3 ++-
 app/models/generic_attribute_control/uniqueness.rb | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/models')

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 42f45b6ca..7317b81b8 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -3,6 +3,7 @@ class ComplianceControl < ActiveRecord::Base
   belongs_to :compliance_control_set
   belongs_to :compliance_control_block
 
+  cattr_reader :default_criticity, :default_code
   @@default_criticity = :warning
   @@default_code = ""
 
diff --git a/app/models/generic_attribute_control/min_max.rb b/app/models/generic_attribute_control/min_max.rb
index 6a2e1f284..d18ff6344 100644
--- a/app/models/generic_attribute_control/min_max.rb
+++ b/app/models/generic_attribute_control/min_max.rb
@@ -2,6 +2,7 @@ module GenericAttributeControl
   class MinMax < ComplianceControl
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
+    cattr_reader :default_criticity, :default_code
     @@default_criticity = :warning
     @@default_code = "3-Generic-2"
 
diff --git a/app/models/generic_attribute_control/pattern.rb b/app/models/generic_attribute_control/pattern.rb
index 5b27da54e..9e5a311de 100644
--- a/app/models/generic_attribute_control/pattern.rb
+++ b/app/models/generic_attribute_control/pattern.rb
@@ -2,6 +2,7 @@ module GenericAttributeControl
   class Pattern < ComplianceControl
     hstore_accessor :control_attributes, value: :string, pattern: :string
 
+    cattr_reader :default_criticity, :default_code
     @@default_criticity = :warning
     @@default_code = "3-Generic-3"
 
@@ -10,4 +11,4 @@ module GenericAttributeControl
       true
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/generic_attribute_control/uniqueness.rb b/app/models/generic_attribute_control/uniqueness.rb
index 4f1a82083..3efe1deac 100644
--- a/app/models/generic_attribute_control/uniqueness.rb
+++ b/app/models/generic_attribute_control/uniqueness.rb
@@ -2,6 +2,7 @@ module GenericAttributeControl
   class Uniqueness < ComplianceControl
     hstore_accessor :control_attributes, name: :string
 
+    cattr_reader :default_criticity, :default_code
     @@default_criticity = :warning
     @@default_code = "3-Generic-3"
 
@@ -10,4 +11,4 @@ module GenericAttributeControl
       true
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 1bc4ab6684803a3974bd65f6531bd43a57c15fd0 Mon Sep 17 00:00:00 2001
From: Robert
Date: Fri, 29 Sep 2017 18:23:56 +0200
Subject: Refs: #4627@2h;

        Comprehensive Tests for ComplianceControl Class Level Default Attributes
---
 app/models/compliance_control.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/models')

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 7317b81b8..0763de477 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -32,6 +32,9 @@ class ComplianceControl < ActiveRecord::Base
    self.name ||= self.class.name
    self.code ||= @@default_code
    self.origin_code ||= @@default_code
+   # TODO: Remove this very ambigous line, as a matter of fact it is never triggered
+   # **unless** `criticity` is **explicitly** set to nil, thusly bypassing the att's
+   # initialisation by `Enumerize`'s default.
    self.criticity ||= @@default_criticity
   end
 
-- 
cgit v1.2.3


From 30bdfe7c5557ba85f2c6cb18abe4b0308faa217d Mon Sep 17 00:00:00 2001
From: Robert
Date: Mon, 2 Oct 2017 08:53:18 +0200
Subject: Fixes: #4627@0.55h;

        Class Methods replace Class Attributes
---
 app/models/compliance_control.rb                   | 31 +++++++++++-----------
 app/models/generic_attribute_control/min_max.rb    | 11 ++++----
 app/models/generic_attribute_control/pattern.rb    |  9 ++++---
 app/models/generic_attribute_control/uniqueness.rb |  9 ++++---
 4 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'app/models')

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 0763de477..930d54fe8 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -3,10 +3,6 @@ class ComplianceControl < ActiveRecord::Base
   belongs_to :compliance_control_set
   belongs_to :compliance_control_block
 
-  cattr_reader :default_criticity, :default_code
-  @@default_criticity = :warning
-  @@default_code = ""
-
   enumerize :criticity, in: %i(info warning error), scope: true, default: :info
 
   validates :criticity, presence: true
@@ -15,27 +11,32 @@ class ComplianceControl < ActiveRecord::Base
   validates :origin_code, presence: true
   validates :compliance_control_set, presence: true
 
-  def self.policy_class
-    ComplianceControlPolicy
-  end
+  class << self
+    def default_criticity; :warning end
+    def default_code; "" end
+
+    def policy_class
+      ComplianceControlPolicy
+    end
 
-  def self.inherited(child)
-    child.instance_eval do
-      def model_name
-        ComplianceControl.model_name
+    def inherited(child)
+      child.instance_eval do
+        def model_name
+          ComplianceControl.model_name
+        end
       end
+      super
     end
-    super
   end
 
   before_validation(on: :create) do
    self.name ||= self.class.name
-   self.code ||= @@default_code
-   self.origin_code ||= @@default_code
+   self.code ||= self.class.default_code
+   self.origin_code ||= self.class.default_code
    # TODO: Remove this very ambigous line, as a matter of fact it is never triggered
    # **unless** `criticity` is **explicitly** set to nil, thusly bypassing the att's
    # initialisation by `Enumerize`'s default.
-   self.criticity ||= @@default_criticity
+   self.criticity ||= self.class.default_criticity
   end
 
 end
diff --git a/app/models/generic_attribute_control/min_max.rb b/app/models/generic_attribute_control/min_max.rb
index d18ff6344..0b0e5a9a7 100644
--- a/app/models/generic_attribute_control/min_max.rb
+++ b/app/models/generic_attribute_control/min_max.rb
@@ -2,17 +2,18 @@ module GenericAttributeControl
   class MinMax < ComplianceControl
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
-    cattr_reader :default_criticity, :default_code
-    @@default_criticity = :warning
-    @@default_code = "3-Generic-2"
 
     validate :min_max_values
     def min_max_values
       true
     end
 
-    def self.dynamic_attributes
-      self.hstore_metadata_for_control_attributes.keys
+    class << self
+      def default_criticity; :warning end
+      def default_code; "3-Generic-2" end
+      def dynamic_attributes
+        hstore_metadata_for_control_attributes.keys
+      end
     end
   end
 end
diff --git a/app/models/generic_attribute_control/pattern.rb b/app/models/generic_attribute_control/pattern.rb
index 9e5a311de..72bb1770a 100644
--- a/app/models/generic_attribute_control/pattern.rb
+++ b/app/models/generic_attribute_control/pattern.rb
@@ -2,13 +2,14 @@ module GenericAttributeControl
   class Pattern < ComplianceControl
     hstore_accessor :control_attributes, value: :string, pattern: :string
 
-    cattr_reader :default_criticity, :default_code
-    @@default_criticity = :warning
-    @@default_code = "3-Generic-3"
-
     validate :pattern_match
     def pattern_match
       true
     end
+
+    class << self
+      def default_criticity; :warning end
+      def default_code; "3-Generic-3" end
+    end
   end
 end
diff --git a/app/models/generic_attribute_control/uniqueness.rb b/app/models/generic_attribute_control/uniqueness.rb
index 3efe1deac..6ffe78565 100644
--- a/app/models/generic_attribute_control/uniqueness.rb
+++ b/app/models/generic_attribute_control/uniqueness.rb
@@ -2,13 +2,14 @@ module GenericAttributeControl
   class Uniqueness < ComplianceControl
     hstore_accessor :control_attributes, name: :string
 
-    cattr_reader :default_criticity, :default_code
-    @@default_criticity = :warning
-    @@default_code = "3-Generic-3"
-
     validate :unique_values
     def unique_values
       true
     end
+
+    class << self
+      def default_criticity; :warning end
+      def default_code; "3-Generic-3" end
+    end
   end
 end
-- 
cgit v1.2.3


From ee88198df36ffc666b7b5bb8dda6851ce953af4a Mon Sep 17 00:00:00 2001
From: Robert
Date: Mon, 2 Oct 2017 13:38:11 +0200
Subject: Refs: #4267@0.45h;

- setting up a CCCLD subdir struct for CCCLD related tests
- removed all occcurances of `@@default_criticity`
---
 app/models/journey_pattern_control/duplicates.rb                    | 1 -
 app/models/journey_pattern_control/vehicle_journey.rb               | 3 +--
 app/models/line_control/route.rb                                    | 3 +--
 app/models/route_control/duplicates.rb                              | 1 -
 app/models/route_control/journey_pattern.rb                         | 3 +--
 app/models/route_control/minimum_length.rb                          | 1 -
 app/models/route_control/omnibus_journey_pattern.rb                 | 1 -
 app/models/route_control/opposite_route.rb                          | 1 -
 app/models/route_control/opposite_route_terminus.rb                 | 3 +--
 app/models/route_control/speed.rb                                   | 1 -
 app/models/route_control/stop_points_in_journey_pattern.rb          | 1 -
 app/models/route_control/time_table.rb                              | 1 -
 app/models/route_control/unactivated_stop_points.rb                 | 1 -
 app/models/route_control/vehicle_journey_at_stops.rb                | 1 -
 app/models/route_control/zdl_stop_area.rb                           | 1 -
 app/models/routing_constaint_zone_control/maximum_length.rb         | 3 +--
 app/models/routing_constaint_zone_control/minimum_length.rb         | 3 +--
 app/models/routing_constaint_zone_control/unactivated_stop_point.rb | 1 -
 app/models/vechicle_journey_control/delta.rb                        | 1 -
 app/models/vechicle_journey_control/waiting_time.rb                 | 1 -
 20 files changed, 6 insertions(+), 26 deletions(-)

(limited to 'app/models')

diff --git a/app/models/journey_pattern_control/duplicates.rb b/app/models/journey_pattern_control/duplicates.rb
index d3908cfc0..e988fbcc5 100644
--- a/app/models/journey_pattern_control/duplicates.rb
+++ b/app/models/journey_pattern_control/duplicates.rb
@@ -1,7 +1,6 @@
 module JourneyPatternControl
   class Duplicates < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-1"
   end
 end
diff --git a/app/models/journey_pattern_control/vehicle_journey.rb b/app/models/journey_pattern_control/vehicle_journey.rb
index d7151f147..cf8bdf7e8 100644
--- a/app/models/journey_pattern_control/vehicle_journey.rb
+++ b/app/models/journey_pattern_control/vehicle_journey.rb
@@ -1,7 +1,6 @@
 module JourneyPatternControl
   class VehicleJourney < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-JourneyPattern-2"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index 21c5eca06..f16cad8d4 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -1,7 +1,6 @@
 module LineControl
   class Route < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Line-1"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/duplicates.rb b/app/models/route_control/duplicates.rb
index fb9c34e0a..b57b3241b 100644
--- a/app/models/route_control/duplicates.rb
+++ b/app/models/route_control/duplicates.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class Duplicates < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-4"
   end
 end
diff --git a/app/models/route_control/journey_pattern.rb b/app/models/route_control/journey_pattern.rb
index 08f603d8f..0a26322e0 100644
--- a/app/models/route_control/journey_pattern.rb
+++ b/app/models/route_control/journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class JourneyPattern < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-3"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb
index f42b88748..aec8c7a3f 100644
--- a/app/models/route_control/minimum_length.rb
+++ b/app/models/route_control/minimum_length.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class MinimumLength < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-6"
   end
 end
diff --git a/app/models/route_control/omnibus_journey_pattern.rb b/app/models/route_control/omnibus_journey_pattern.rb
index 3b9f6d06f..8cc91e4e4 100644
--- a/app/models/route_control/omnibus_journey_pattern.rb
+++ b/app/models/route_control/omnibus_journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OmnibusJourneyPattern < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-9"
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index e91b081e2..9a168cfc5 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OppositeRoute < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-2"
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index fd62b7684..c791ae385 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class OppositeRouteTerminus < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-5"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index 0a2b6ac76..84d892c70 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -3,7 +3,6 @@ module VehicleJourneyControl
 
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-2"
   end
 end
diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb
index dced6c005..48a66298d 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class StopPointInJourneyPattern < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-Route-6"
   end
 end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 5d0f21b40..1153a5269 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class TimeTable < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-VehicleJourney-4"
   end
 end
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index dee846cbb..b7276baaf 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class UnactivatedStopPoint < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-10"
   end
 end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index 149282fe6..e1c0e8c6b 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class VehicleJourneyAtStops < ComplianceControl
 
-    @@default_criticity = :error
     @@default_code = "3-VehicleJourney-5"
   end
 end
diff --git a/app/models/route_control/zdl_stop_area.rb b/app/models/route_control/zdl_stop_area.rb
index 088a1d2f2..49a5ad56f 100644
--- a/app/models/route_control/zdl_stop_area.rb
+++ b/app/models/route_control/zdl_stop_area.rb
@@ -1,7 +1,6 @@
 module RouteControl
   class ZDLStopArea < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-Route-1"
   end
 end
diff --git a/app/models/routing_constaint_zone_control/maximum_length.rb b/app/models/routing_constaint_zone_control/maximum_length.rb
index 4d289de63..cb04c6806 100644
--- a/app/models/routing_constaint_zone_control/maximum_length.rb
+++ b/app/models/routing_constaint_zone_control/maximum_length.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class MaximumLength < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-2"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/routing_constaint_zone_control/minimum_length.rb b/app/models/routing_constaint_zone_control/minimum_length.rb
index 28f0791a7..7b510131b 100644
--- a/app/models/routing_constaint_zone_control/minimum_length.rb
+++ b/app/models/routing_constaint_zone_control/minimum_length.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class MinimumLength < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-3"
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
index fe5381a34..6efa384a2 100644
--- a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
+++ b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
@@ -1,7 +1,6 @@
 module RoutingConstaintZoneControl
   class UnactivatedStopPoint < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-ITL-1"
   end
 end
diff --git a/app/models/vechicle_journey_control/delta.rb b/app/models/vechicle_journey_control/delta.rb
index d77eff48a..c90e05abd 100644
--- a/app/models/vechicle_journey_control/delta.rb
+++ b/app/models/vechicle_journey_control/delta.rb
@@ -3,7 +3,6 @@ module VehicleJourneyControl
 
     hstore_accessor :control_attributes, delta: :integer
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-3"
   end
 end
diff --git a/app/models/vechicle_journey_control/waiting_time.rb b/app/models/vechicle_journey_control/waiting_time.rb
index cbffa5526..9f4192520 100644
--- a/app/models/vechicle_journey_control/waiting_time.rb
+++ b/app/models/vechicle_journey_control/waiting_time.rb
@@ -1,7 +1,6 @@
 module VehicleJourneyControl
   class WatingTime < ComplianceControl
 
-    @@default_criticity = :warning
     @@default_code = "3-VehicleJourney-1"
   end
 end
-- 
cgit v1.2.3


From c4a2730dd1aa493989ceea7c162f39f2da73267b Mon Sep 17 00:00:00 2001
From: Robert
Date: Mon, 2 Oct 2017 15:41:55 +0200
Subject: Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

   - Working on factories
   - Scaffolding out specs
   - Fixing typos in dir struct and class names for routing_constraint_zone_control
---
 app/models/routing_constaint_zone_control/maximum_length.rb         | 6 ------
 app/models/routing_constaint_zone_control/minimum_length.rb         | 6 ------
 app/models/routing_constaint_zone_control/unactivated_stop_point.rb | 6 ------
 app/models/routing_constraint_zone_control/maximum_length.rb        | 6 ++++++
 app/models/routing_constraint_zone_control/minimum_length.rb        | 6 ++++++
 .../routing_constraint_zone_control/unactivated_stop_point.rb       | 6 ++++++
 6 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 app/models/routing_constaint_zone_control/maximum_length.rb
 delete mode 100644 app/models/routing_constaint_zone_control/minimum_length.rb
 delete mode 100644 app/models/routing_constaint_zone_control/unactivated_stop_point.rb
 create mode 100644 app/models/routing_constraint_zone_control/maximum_length.rb
 create mode 100644 app/models/routing_constraint_zone_control/minimum_length.rb
 create mode 100644 app/models/routing_constraint_zone_control/unactivated_stop_point.rb

(limited to 'app/models')

diff --git a/app/models/routing_constaint_zone_control/maximum_length.rb b/app/models/routing_constaint_zone_control/maximum_length.rb
deleted file mode 100644
index cb04c6806..000000000
--- a/app/models/routing_constaint_zone_control/maximum_length.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module RoutingConstaintZoneControl
-  class MaximumLength < ComplianceControl
-
-    @@default_code = "3-ITL-2"
-  end
-end
diff --git a/app/models/routing_constaint_zone_control/minimum_length.rb b/app/models/routing_constaint_zone_control/minimum_length.rb
deleted file mode 100644
index 7b510131b..000000000
--- a/app/models/routing_constaint_zone_control/minimum_length.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module RoutingConstaintZoneControl
-  class MinimumLength < ComplianceControl
-
-    @@default_code = "3-ITL-3"
-  end
-end
diff --git a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb b/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
deleted file mode 100644
index 6efa384a2..000000000
--- a/app/models/routing_constaint_zone_control/unactivated_stop_point.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module RoutingConstaintZoneControl
-  class UnactivatedStopPoint < ComplianceControl
-
-    @@default_code = "3-ITL-1"
-  end
-end
diff --git a/app/models/routing_constraint_zone_control/maximum_length.rb b/app/models/routing_constraint_zone_control/maximum_length.rb
new file mode 100644
index 000000000..9822346e0
--- /dev/null
+++ b/app/models/routing_constraint_zone_control/maximum_length.rb
@@ -0,0 +1,6 @@
+module RoutingConstraintZoneControl
+  class MaximumLength < ComplianceControl
+
+    @@default_code = "3-ITL-2"
+  end
+end
diff --git a/app/models/routing_constraint_zone_control/minimum_length.rb b/app/models/routing_constraint_zone_control/minimum_length.rb
new file mode 100644
index 000000000..5873eba58
--- /dev/null
+++ b/app/models/routing_constraint_zone_control/minimum_length.rb
@@ -0,0 +1,6 @@
+module RoutingConstraintZoneControl
+  class MinimumLength < ComplianceControl
+
+    @@default_code = "3-ITL-3"
+  end
+end
diff --git a/app/models/routing_constraint_zone_control/unactivated_stop_point.rb b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb
new file mode 100644
index 000000000..c48690159
--- /dev/null
+++ b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb
@@ -0,0 +1,6 @@
+module RoutingConstraintZoneControl
+  class UnactivatedStopPoint < ComplianceControl
+
+    @@default_code = "3-ITL-1"
+  end
+end
-- 
cgit v1.2.3


From 4ecc20567d9e98b4647b163b43edbb27c06bf53a Mon Sep 17 00:00:00 2001
From: Robert
Date: Mon, 2 Oct 2017 16:21:41 +0200
Subject: Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

  - All Specs and Factories implemented
  - Fixing More Typos in dir/file names and incorrect module names; long live copy and paste
---
 app/models/compliance_control.rb                           | 4 ----
 app/models/route_control/speed.rb                          | 2 +-
 app/models/route_control/stop_points_in_journey_pattern.rb | 2 +-
 app/models/route_control/time_table.rb                     | 2 +-
 app/models/route_control/unactivated_stop_points.rb        | 2 +-
 app/models/route_control/vehicle_journey_at_stops.rb       | 2 +-
 app/models/vechicle_journey_control/delta.rb               | 8 --------
 app/models/vechicle_journey_control/waiting_time.rb        | 6 ------
 app/models/vehicle_journey_control/delta.rb                | 8 ++++++++
 app/models/vehicle_journey_control/waiting_time.rb         | 6 ++++++
 10 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 app/models/vechicle_journey_control/delta.rb
 delete mode 100644 app/models/vechicle_journey_control/waiting_time.rb
 create mode 100644 app/models/vehicle_journey_control/delta.rb
 create mode 100644 app/models/vehicle_journey_control/waiting_time.rb

(limited to 'app/models')

diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 930d54fe8..0860f07b6 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -33,10 +33,6 @@ class ComplianceControl < ActiveRecord::Base
    self.name ||= self.class.name
    self.code ||= self.class.default_code
    self.origin_code ||= self.class.default_code
-   # TODO: Remove this very ambigous line, as a matter of fact it is never triggered
-   # **unless** `criticity` is **explicitly** set to nil, thusly bypassing the att's
-   # initialisation by `Enumerize`'s default.
-   self.criticity ||= self.class.default_criticity
   end
 
 end
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index 84d892c70..593b103cc 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class Speed < ComplianceControl
 
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb
index 48a66298d..7b72a9b44 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -1,5 +1,5 @@
 module RouteControl
-  class StopPointInJourneyPattern < ComplianceControl
+  class StopPointsInJourneyPattern < ComplianceControl
 
     @@default_code = "3-Route-6"
   end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 1153a5269..132bd32bb 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class TimeTable < ComplianceControl
 
     @@default_code = "3-VehicleJourney-4"
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index b7276baaf..821fe03cb 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -1,5 +1,5 @@
 module RouteControl
-  class UnactivatedStopPoint < ComplianceControl
+  class UnactivatedStopPoints < ComplianceControl
 
     @@default_code = "3-Route-10"
   end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index e1c0e8c6b..5dd9d6b6d 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -1,4 +1,4 @@
-module VehicleJourneyControl
+module RouteControl
   class VehicleJourneyAtStops < ComplianceControl
 
     @@default_code = "3-VehicleJourney-5"
diff --git a/app/models/vechicle_journey_control/delta.rb b/app/models/vechicle_journey_control/delta.rb
deleted file mode 100644
index c90e05abd..000000000
--- a/app/models/vechicle_journey_control/delta.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module VehicleJourneyControl
-  class Delta < ComplianceControl
-
-    hstore_accessor :control_attributes, delta: :integer
-
-    @@default_code = "3-VehicleJourney-3"
-  end
-end
diff --git a/app/models/vechicle_journey_control/waiting_time.rb b/app/models/vechicle_journey_control/waiting_time.rb
deleted file mode 100644
index 9f4192520..000000000
--- a/app/models/vechicle_journey_control/waiting_time.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module VehicleJourneyControl
-  class WatingTime < ComplianceControl
-
-    @@default_code = "3-VehicleJourney-1"
-  end
-end
diff --git a/app/models/vehicle_journey_control/delta.rb b/app/models/vehicle_journey_control/delta.rb
new file mode 100644
index 000000000..c90e05abd
--- /dev/null
+++ b/app/models/vehicle_journey_control/delta.rb
@@ -0,0 +1,8 @@
+module VehicleJourneyControl
+  class Delta < ComplianceControl
+
+    hstore_accessor :control_attributes, delta: :integer
+
+    @@default_code = "3-VehicleJourney-3"
+  end
+end
diff --git a/app/models/vehicle_journey_control/waiting_time.rb b/app/models/vehicle_journey_control/waiting_time.rb
new file mode 100644
index 000000000..9f4192520
--- /dev/null
+++ b/app/models/vehicle_journey_control/waiting_time.rb
@@ -0,0 +1,6 @@
+module VehicleJourneyControl
+  class WatingTime < ComplianceControl
+
+    @@default_code = "3-VehicleJourney-1"
+  end
+end
-- 
cgit v1.2.3


From 87ddd6bc3db3e0ef0792db532973d1de47b7bfef Mon Sep 17 00:00:00 2001
From: Robert
Date: Mon, 2 Oct 2017 21:06:54 +0200
Subject: Refs: #4267@1.5h; ComplianceControlClassLevelDefaults

        All implemented as class methods
---
 app/models/journey_pattern_control/duplicates.rb                     | 2 +-
 app/models/journey_pattern_control/vehicle_journey.rb                | 2 +-
 app/models/line_control/route.rb                                     | 2 +-
 app/models/route_control/duplicates.rb                               | 2 +-
 app/models/route_control/journey_pattern.rb                          | 2 +-
 app/models/route_control/minimum_length.rb                           | 2 +-
 app/models/route_control/omnibus_journey_pattern.rb                  | 2 +-
 app/models/route_control/opposite_route.rb                           | 2 +-
 app/models/route_control/opposite_route_terminus.rb                  | 2 +-
 app/models/route_control/speed.rb                                    | 2 +-
 app/models/route_control/stop_points_in_journey_pattern.rb           | 2 +-
 app/models/route_control/time_table.rb                               | 2 +-
 app/models/route_control/unactivated_stop_points.rb                  | 2 +-
 app/models/route_control/vehicle_journey_at_stops.rb                 | 2 +-
 app/models/route_control/zdl_stop_area.rb                            | 2 +-
 app/models/routing_constraint_zone_control/maximum_length.rb         | 2 +-
 app/models/routing_constraint_zone_control/minimum_length.rb         | 2 +-
 app/models/routing_constraint_zone_control/unactivated_stop_point.rb | 2 +-
 app/models/vehicle_journey_control/delta.rb                          | 2 +-
 app/models/vehicle_journey_control/waiting_time.rb                   | 4 ++--
 20 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'app/models')

diff --git a/app/models/journey_pattern_control/duplicates.rb b/app/models/journey_pattern_control/duplicates.rb
index e988fbcc5..e06e6021b 100644
--- a/app/models/journey_pattern_control/duplicates.rb
+++ b/app/models/journey_pattern_control/duplicates.rb
@@ -1,6 +1,6 @@
 module JourneyPatternControl
   class Duplicates < ComplianceControl
 
-    @@default_code = "3-JourneyPattern-1"
+    def self.default_code; "3-JourneyPattern-1" end
   end
 end
diff --git a/app/models/journey_pattern_control/vehicle_journey.rb b/app/models/journey_pattern_control/vehicle_journey.rb
index cf8bdf7e8..dfaf42beb 100644
--- a/app/models/journey_pattern_control/vehicle_journey.rb
+++ b/app/models/journey_pattern_control/vehicle_journey.rb
@@ -1,6 +1,6 @@
 module JourneyPatternControl
   class VehicleJourney < ComplianceControl
 
-    @@default_code = "3-JourneyPattern-2"
+    def self.default_code; "3-JourneyPattern-2" end
   end
 end
diff --git a/app/models/line_control/route.rb b/app/models/line_control/route.rb
index f16cad8d4..aabd2f347 100644
--- a/app/models/line_control/route.rb
+++ b/app/models/line_control/route.rb
@@ -1,6 +1,6 @@
 module LineControl
   class Route < ComplianceControl
 
-    @@default_code = "3-Line-1"
+    def self.default_code; "3-Line-1" end
   end
 end
diff --git a/app/models/route_control/duplicates.rb b/app/models/route_control/duplicates.rb
index b57b3241b..99e3b3aa8 100644
--- a/app/models/route_control/duplicates.rb
+++ b/app/models/route_control/duplicates.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class Duplicates < ComplianceControl
 
-    @@default_code = "3-Route-4"
+    def self.default_code; "3-Route-4" end
   end
 end
diff --git a/app/models/route_control/journey_pattern.rb b/app/models/route_control/journey_pattern.rb
index 0a26322e0..63cec2a41 100644
--- a/app/models/route_control/journey_pattern.rb
+++ b/app/models/route_control/journey_pattern.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class JourneyPattern < ComplianceControl
 
-    @@default_code = "3-Route-3"
+    def self.default_code; "3-Route-3" end
   end
 end
diff --git a/app/models/route_control/minimum_length.rb b/app/models/route_control/minimum_length.rb
index aec8c7a3f..56becfb2b 100644
--- a/app/models/route_control/minimum_length.rb
+++ b/app/models/route_control/minimum_length.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class MinimumLength < ComplianceControl
 
-    @@default_code = "3-Route-6"
+    def self.default_code; "3-Route-6" end
   end
 end
diff --git a/app/models/route_control/omnibus_journey_pattern.rb b/app/models/route_control/omnibus_journey_pattern.rb
index 8cc91e4e4..af3004ad7 100644
--- a/app/models/route_control/omnibus_journey_pattern.rb
+++ b/app/models/route_control/omnibus_journey_pattern.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class OmnibusJourneyPattern < ComplianceControl
 
-    @@default_code = "3-Route-9"
+    def self.default_code; "3-Route-9" end
   end
 end
diff --git a/app/models/route_control/opposite_route.rb b/app/models/route_control/opposite_route.rb
index 9a168cfc5..0148087ca 100644
--- a/app/models/route_control/opposite_route.rb
+++ b/app/models/route_control/opposite_route.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class OppositeRoute < ComplianceControl
 
-    @@default_code = "3-Route-2"
+    def self.default_code; "3-Route-2" end
   end
 end
diff --git a/app/models/route_control/opposite_route_terminus.rb b/app/models/route_control/opposite_route_terminus.rb
index c791ae385..e12690d48 100644
--- a/app/models/route_control/opposite_route_terminus.rb
+++ b/app/models/route_control/opposite_route_terminus.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class OppositeRouteTerminus < ComplianceControl
 
-    @@default_code = "3-Route-5"
+    def self.default_code; "3-Route-5" end
   end
 end
diff --git a/app/models/route_control/speed.rb b/app/models/route_control/speed.rb
index 593b103cc..d5798d153 100644
--- a/app/models/route_control/speed.rb
+++ b/app/models/route_control/speed.rb
@@ -3,6 +3,6 @@ module RouteControl
 
     hstore_accessor :control_attributes, minimum: :integer, maximum: :integer
 
-    @@default_code = "3-VehicleJourney-2"
+    def self.default_code; "3-VehicleJourney-2" end
   end
 end
diff --git a/app/models/route_control/stop_points_in_journey_pattern.rb b/app/models/route_control/stop_points_in_journey_pattern.rb
index 7b72a9b44..400bef5ef 100644
--- a/app/models/route_control/stop_points_in_journey_pattern.rb
+++ b/app/models/route_control/stop_points_in_journey_pattern.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class StopPointsInJourneyPattern < ComplianceControl
 
-    @@default_code = "3-Route-6"
+    def self.default_code; "3-Route-6" end
   end
 end
diff --git a/app/models/route_control/time_table.rb b/app/models/route_control/time_table.rb
index 132bd32bb..069cd0a9e 100644
--- a/app/models/route_control/time_table.rb
+++ b/app/models/route_control/time_table.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class TimeTable < ComplianceControl
 
-    @@default_code = "3-VehicleJourney-4"
+    def self.default_code; "3-VehicleJourney-4" end
   end
 end
diff --git a/app/models/route_control/unactivated_stop_points.rb b/app/models/route_control/unactivated_stop_points.rb
index 821fe03cb..a903fff53 100644
--- a/app/models/route_control/unactivated_stop_points.rb
+++ b/app/models/route_control/unactivated_stop_points.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class UnactivatedStopPoints < ComplianceControl
 
-    @@default_code = "3-Route-10"
+    def self.default_code; "3-Route-10" end
   end
 end
diff --git a/app/models/route_control/vehicle_journey_at_stops.rb b/app/models/route_control/vehicle_journey_at_stops.rb
index 5dd9d6b6d..7c376a2da 100644
--- a/app/models/route_control/vehicle_journey_at_stops.rb
+++ b/app/models/route_control/vehicle_journey_at_stops.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class VehicleJourneyAtStops < ComplianceControl
 
-    @@default_code = "3-VehicleJourney-5"
+    def self.default_code; "3-VehicleJourney-5" end
   end
 end
diff --git a/app/models/route_control/zdl_stop_area.rb b/app/models/route_control/zdl_stop_area.rb
index 49a5ad56f..2efd892df 100644
--- a/app/models/route_control/zdl_stop_area.rb
+++ b/app/models/route_control/zdl_stop_area.rb
@@ -1,6 +1,6 @@
 module RouteControl
   class ZDLStopArea < ComplianceControl
 
-    @@default_code = "3-Route-1"
+    def self.default_code; "3-Route-1" end
   end
 end
diff --git a/app/models/routing_constraint_zone_control/maximum_length.rb b/app/models/routing_constraint_zone_control/maximum_length.rb
index 9822346e0..6b726e38c 100644
--- a/app/models/routing_constraint_zone_control/maximum_length.rb
+++ b/app/models/routing_constraint_zone_control/maximum_length.rb
@@ -1,6 +1,6 @@
 module RoutingConstraintZoneControl
   class MaximumLength < ComplianceControl
 
-    @@default_code = "3-ITL-2"
+    def self.default_code; "3-ITL-2" end
   end
 end
diff --git a/app/models/routing_constraint_zone_control/minimum_length.rb b/app/models/routing_constraint_zone_control/minimum_length.rb
index 5873eba58..38f583bc5 100644
--- a/app/models/routing_constraint_zone_control/minimum_length.rb
+++ b/app/models/routing_constraint_zone_control/minimum_length.rb
@@ -1,6 +1,6 @@
 module RoutingConstraintZoneControl
   class MinimumLength < ComplianceControl
 
-    @@default_code = "3-ITL-3"
+    def self.default_code; "3-ITL-3" end
   end
 end
diff --git a/app/models/routing_constraint_zone_control/unactivated_stop_point.rb b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb
index c48690159..c03bb2324 100644
--- a/app/models/routing_constraint_zone_control/unactivated_stop_point.rb
+++ b/app/models/routing_constraint_zone_control/unactivated_stop_point.rb
@@ -1,6 +1,6 @@
 module RoutingConstraintZoneControl
   class UnactivatedStopPoint < ComplianceControl
 
-    @@default_code = "3-ITL-1"
+    def self.default_code; "3-ITL-1" end
   end
 end
diff --git a/app/models/vehicle_journey_control/delta.rb b/app/models/vehicle_journey_control/delta.rb
index c90e05abd..797072fdd 100644
--- a/app/models/vehicle_journey_control/delta.rb
+++ b/app/models/vehicle_journey_control/delta.rb
@@ -3,6 +3,6 @@ module VehicleJourneyControl
 
     hstore_accessor :control_attributes, delta: :integer
 
-    @@default_code = "3-VehicleJourney-3"
+    def self.default_code; "3-VehicleJourney-3" end
   end
 end
diff --git a/app/models/vehicle_journey_control/waiting_time.rb b/app/models/vehicle_journey_control/waiting_time.rb
index 9f4192520..614f401bb 100644
--- a/app/models/vehicle_journey_control/waiting_time.rb
+++ b/app/models/vehicle_journey_control/waiting_time.rb
@@ -1,6 +1,6 @@
 module VehicleJourneyControl
-  class WatingTime < ComplianceControl
+  class WaitingTime < ComplianceControl
 
-    @@default_code = "3-VehicleJourney-1"
+    def self.default_code; "3-VehicleJourney-1" end
   end
 end
-- 
cgit v1.2.3