rsmp 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22d8796a378484c9c7a9d50b3bc48386db2e12893c5af07a1ef83825d2f1b0e
-  data.tar.gz: ee6a4ebb4fcf094cb45e1f541e6f228e6ea9c3364fca6e1526e4fe46026751f2
+  metadata.gz: '06464038166b8a2a0dbd21e7e53d28472117acfb704312755023792d2650943b'
+  data.tar.gz: 149b50fb2e39d2287fd3fbd7fbc6f5520a9922d778315272250a361a6cf4d4be
 SHA512:
-  metadata.gz: a1a495ba2c110ebb42db60596516de255b9c9a9cb903fdd66bf77bd27a3f5d5b786b273436b522af3dbf57e983651676b9a9e67aee7387ba134ef89812261618
-  data.tar.gz: 21f2e48b596dcca6296da89f687ec46d3845eaafb6cad497a16ac4fabca1cb5574da6df324256f4929b7207eeccd17697bd5021b328b4d265ff7d836d2a5e2c3
+  metadata.gz: 115228cc10a63d009bffd2a7f3f0408ad47e2dafd14883f8a25b38870ef99fe73292ddc61ac9e38a1d895d70f53c5a08928492c940d01641d87b19e466764dba
+  data.tar.gz: 6df15fe4e9c6044cb5fab93da68202d4e0bdb32e109bc538fc4d55c232669cbbf745e7aeacee87fa75567658687683d84ee5255d98b9841f05090a918d6b6c49

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.3.5)
+    rsmp (0.3.6)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/lib/rsmp/components.rb

@@ -38,10 +38,23 @@ module RSMP
       Component.new id:id, node: self, grouped: type=='main'
     end
 
-    def find_component component_id
+    def infer_component_type component_id
+      { klass: Component, grouped: false }
+    end
+
+    def find_component component_id, build: true
       component = @components[component_id]
-      raise UnknownComponent.new("Component #{component_id} not found") unless component
-      component
+      return component if component
+      if build
+        inferred = infer_component_type component_id
+        component = inferred[:klass].new node: self, id: component_id
+        @components[ component_id] = component
+        class_name = component.class.name.split('::').last
+        log "Inferred component #{component_id} of type #{class_name} for site #{@site_id}", level: :info
+        component
+      else
+        raise UnknownComponent.new("Component #{component_id} not found") unless component
+      end
     end
 
   end

data/lib/rsmp/site_proxy.rb

@@ -121,21 +121,27 @@ module RSMP
       end
     end
 
+    def infer_component_type component_id
+      if component_id =~ /TC/
+        { klass: TrafficController, grouped: true }
+      elsif component_id =~ /DL/
+        { klass: DetectorLogic, goruped: false }
+      elsif component_id =~ /SG/
+        { klass: SignalGroup, grouped: false }
+      else
+        super
+      end
+    end
+
     def process_aggregated_status message
       se = message.attribute("se")
       validate_aggregated_status(message,se) == false
       c_id = message.attributes["cId"]
-      component = @components[c_id]
-      if component == nil
-        if @site_settings == nil || @site_settings['components'] == nil
-          component = build_component(id:c_id, type:nil)
-          @components[c_id] = component
-          log "Adding component #{c_id} to site #{@site_id}", level: :info
-        else
-          reason = "component #{c_id} not found"
-          dont_acknowledge message, "Ignoring #{message.type}:", reason
-          return
-        end
+      component = find_component c_id
+      unless component
+        reason = "component #{c_id} not found"
+        dont_acknowledge message, "Ignoring #{message.type}:", reason
+        return
       end
 
       component.set_aggregated_status_bools se

data/lib/rsmp/tlc.rb

@@ -5,7 +5,7 @@ module RSMP
   class TrafficController < Component
     attr_reader :pos, :cycle_time
 
-    def initialize node:, id:, cycle_time:
+    def initialize node:, id:, cycle_time: 10
       super node: node, id: id, grouped: true
       @signal_groups = []
       @detector_logics = []

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

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