rsmp 0.40.0 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db642eae802d3f31456b221ab6297516eb081375f1778cf06cd25b597ae3d07
-  data.tar.gz: e64b67b905975ca8862dd3610a2c3553c8527378db05fc0242dbd56996f850a5
+  metadata.gz: 8cafa5ad2e105bea349b42e08a8dca7e15f0635bfdcddca16d30b31062c2582e
+  data.tar.gz: f424bab2c9e1f77f2c8f752b24d2fe591d2b2f057fb78d774319ab216a8469f0
 SHA512:
-  metadata.gz: 9dbceb076fdfd4aee419daceb587c7802eaf664f3bde3bcd7bb944e9e1408e78b9da0987ca7b56ab0e29d65cc120822f2e2c501bff3de2f22676141194394af3
-  data.tar.gz: 25cdeff92403011140b4164541ad94a785ad8b62449563a49f1ae1ccdc99f8489e940a310d140ddda3db34f66bcded08382d5e3bfdc5cf5307cb7529c11f94d7
+  metadata.gz: 7bd78f82df81c06aaff4cb3298a0e94297599deb66d55e582385d89ee70848edd5b60e2d37b9eb21e75cb30d51cadeff6ff10993d7972e27d96629b6cfc9636b
+  data.tar.gz: 5a571aa560ec17d2233945e2ad371f18edad0bfa55ea0f31974ca81adff6d5bd6a10552d13c7c5b48bebc3202235fb4aa6d3e5f4e0001f4dbad783657db2e16f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.40.0)
+    rsmp (0.40.1)
       async (~> 2.32)
       colorize (~> 1.1)
       io-endpoint (~> 0.15)

data/lib/rsmp/tlc/modules/inputs.rb

@@ -7,7 +7,7 @@ module RSMP
         def setup_inputs(inputs)
           if inputs
             num_inputs = inputs['total']
-            @input_programming = inputs['programming']
+            @input_programming = normalize_input_programming(inputs['programming'])
           else
             @input_programming = nil
           end
@@ -167,6 +167,35 @@ module RSMP
             TrafficControllerSite.make_status @inputs.forced_string
           end
         end
+
+        private
+
+        def normalize_input_programming(programming)
+          return nil if programming.nil?
+          return programming if programming.is_a?(Array)
+          return programming unless programming.is_a?(Hash)
+
+          normalized = normalize_programming_keys(programming)
+          return normalized unless normalized.keys.all?(Integer)
+
+          programming_hash_to_array(normalized)
+        end
+
+        def normalize_programming_keys(programming)
+          programming.each_with_object({}) do |(key, value), memo|
+            int_key = key.is_a?(String) && key.match?(/^\d+$/) ? key.to_i : key
+            memo[int_key] = value
+          end
+        end
+
+        def programming_hash_to_array(normalized)
+          max_key = normalized.keys.max
+          program_array = Array.new(max_key + 1)
+          normalized.each do |index, value|
+            program_array[index] = value
+          end
+          program_array
+        end
       end
     end
   end

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -12,7 +12,7 @@ module RSMP
         # setup options before calling super initializer,
         # since build of components depend on options
         @sxl = 'traffic_light_controller'
-        @security_codes = options[:site_settings]['security_codes']
+        @security_codes = normalize_security_codes(options.dig(:site_settings, 'security_codes'))
         @interval = options[:site_settings].dig('intervals', 'timer') || 1
         @startup_sequence = options[:site_settings]['startup_sequence'] || 'efg'
         build_plans options[:site_settings]['signal_plans']
@@ -131,6 +131,15 @@ module RSMP
         raise MessageRejected, "Wrong security code for level #{level}"
       end
 
+      def normalize_security_codes(codes)
+        return {} unless codes.is_a?(Hash)
+
+        codes.each_with_object({}) do |(key, value), memo|
+          int_key = key.is_a?(String) && key.match?(/^\d+$/) ? key.to_i : key
+          memo[int_key] = value
+        end
+      end
+
       def change_security_code(level, old_code, new_code)
         verify_security_code level, old_code
         @security_codes[level] = new_code

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.40.0'.freeze
+  VERSION = '0.40.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.40.1
 platform: ruby
 authors:
 - Emil Tin