rsmp 0.13.2 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc37b07159cf717f60f293434f6fda0ff6935ad209967b7d5ddb025a9794600
-  data.tar.gz: 5c5e6b1e7728bdffd50776e95a7beb0fd6261dbb58b4ec3f530f7b33ee15cdf4
+  metadata.gz: 71b36c94ecbd9272b5ae78759835c9ea1bfa4180badc3194b9be53bedb79afd3
+  data.tar.gz: 31804088149dac7cd977cbb1a5245275b940f5c949b7568cd16173822cddbf4a
 SHA512:
-  metadata.gz: 201cad0d07ee914d79af82d8ad2ee10740fbe49002e1f3cbb2740b3d573df61c26532688651e6f6f70ea538e0475f51cbe0a46055b2b6331cd5fff48aa4b8d3e
-  data.tar.gz: 74a44c4ac848c9dbe5f0fbd772f2839c5565a8322d7292218d64f7e31f5fdf8e4849e59845fee361d0ca1ed0ecaa2ce067fdc71a86eaf0e50959e0d826742b2f
+  metadata.gz: 9a76596f45499c98ed5935ff4464f9111a43981042447d3900b0ad155ec146627e9241133820385494c51ecf12dc5799fcd8cc48b108b8f4f5278d05c458c5a3
+  data.tar.gz: 508136a654c2040c024405b25a03c1edb8bd179144e5c6e1b6b92ecce86a6fd4d4a447ca8a84b1b41381ff6c6519bd6a87ad8e929df9a3e8ac47bf7d8cb53503

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.2)
+    rsmp (0.13.5)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -27,7 +27,7 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    console (1.15.0)
+    console (1.15.3)
       fiber-local
     contracts (0.17)
     cucumber (7.1.0)

data/lib/rsmp/component_proxy.rb

@@ -1,7 +1,7 @@
 module RSMP
   # A proxy to a remote RSMP component.
   class ComponentProxy < ComponentBase
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:, ntsOId: nil, xNId: nil, grouped: false
       super
       @alarms = {}
       @statuses = {}

data/lib/rsmp/components.rb

@@ -2,10 +2,11 @@
 
 module RSMP
   module Components
-    attr_reader :components
+    attr_reader :components, :main
 
     def initialize_components
       @components = {}
+      @main = nil
     end
 
     def aggregated_status_changed component, options={}
@@ -18,6 +19,7 @@ module RSMP
         if components_by_type
           components_by_type.each_pair do |id,settings|
             @components[id] = build_component(id:id, type:type, settings:settings)
+            @main = @components[id] if type=='main'
           end
         end
       end
@@ -36,10 +38,6 @@ module RSMP
       @components[component.c_id] = component
     end
 
-    #def build_component id:, type:, settings:{}
-    #  Component.new id:id, node: self, grouped: type=='main'
-    #end
-
     def infer_component_type component_id
       Component
     end

data/lib/rsmp/proxy.rb

@@ -438,7 +438,6 @@ module RSMP
     end
 
     def will_not_handle message
-      "WILL NOT HANDLE"
       reason = "since we're a #{self.class.name.downcase}" unless reason
       log "Ignoring #{message.type}, #{reason}", message: message, level: :warning
       dont_acknowledge message, nil, reason
@@ -645,11 +644,8 @@ module RSMP
     end
 
     def set_nts_message_attributes message
-      return unless @site && @site.main
-      ntsOId =  @site.main.ntsOId
-      xNId =  @site.main.xNId
-      message.attributes['ntsOId'] = ntsOId if ntsOId
-      message.attributes['xNId'] = xNId if xNId
+      message.attributes['ntsOId'] = (main && main.ntsOId) ? main.ntsOId : ''
+      message.attributes['xNId'] = (main && main.xNId) ? main.xNId : ''
     end
   end
 end

data/lib/rsmp/site.rb

@@ -161,7 +161,12 @@ module RSMP
     end
 
     def build_component id:, type:, settings:{}
-      Component.new id:id, node: self, grouped: type=='main'
+      if type == 'main'
+        Component.new id:id, node: self, grouped: true,
+          ntsOId: settings['ntsOId'], xNId: settings['xNId']
+      else
+        Component.new id:id, node: self, grouped: false
+      end
     end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -375,7 +375,13 @@ module RSMP
     end
 
     def build_component id:, type:, settings:{}
-      ComponentProxy.new id:id, node: self, grouped: type=='main'
+      settings ||= {}
+      if type == 'main'
+        ComponentProxy.new id:id, node: self, grouped: true,
+          ntsOId: settings['ntsOId'], xNId: settings['xNId']
+      else
+        ComponentProxy.new id:id, node: self, grouped: false
+      end
     end
 
   end

data/lib/rsmp/supervisor_proxy.rb

@@ -254,6 +254,7 @@ module RSMP
         "cTS"=>clock.to_s,
         "rvs"=>rvs
       })
+      set_nts_message_attributes response
       acknowledge message
       send_message response
     end
@@ -272,6 +273,7 @@ module RSMP
         "sS"=>sS,
         "mId" => options[:m_id]
       })
+      set_nts_message_attributes response
       acknowledge message
       send_message response
     end
@@ -409,6 +411,7 @@ module RSMP
           "sTs"=>now,
           "sS"=>sS
         })
+        set_nts_message_attributes update
         send_message update
         store_last_sent_status update
       end
@@ -429,5 +432,8 @@ module RSMP
     def check_sxl_version message
     end
 
+    def main
+      @site.main
+    end
   end
 end

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -15,7 +15,7 @@ module RSMP
 
         super options
 
-        unless @main
+        unless main
           raise ConfigurationError.new "TLC must have a main component"
         end
 
@@ -24,7 +24,7 @@ module RSMP
       def start
         super
         start_tlc_timer
-        @main.initiate_startup_sequence
+        main.initiate_startup_sequence
       end
 
       def stop_subtasks
@@ -52,7 +52,7 @@ module RSMP
       def build_component id:, type:, settings:{}
         component = case type
         when 'main'
-          @main = TrafficController.new node: self,
+          TrafficController.new node: self,
             id: id,
             ntsOId: settings['ntsOId'],
             xNId: settings['xNId'],
@@ -63,11 +63,11 @@ module RSMP
             inputs: @site_settings['inputs']
         when 'signal_group'
           group = SignalGroup.new node: self, id: id
-          @main.add_signal_group group
+          main.add_signal_group group
           group
         when 'detector_logic'
           logic = DetectorLogic.new node: self, id: id
-          @main.add_detector_logic logic
+          main.add_detector_logic logic
           logic
         end
       end
@@ -112,8 +112,8 @@ module RSMP
       end
 
       def timer now
-        return unless @main
-        @main.timer now
+        return unless main
+        main.timer now
       end
 
       def verify_security_code level, code

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.2"
+  VERSION = "0.13.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async