rsmp 0.4.2 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba7b8acadb23f7da783edca08dd93f77ba6183a69d446916a2761945f0e18a2
-  data.tar.gz: 3ac4ae7510f2bb97e2b399e3ae1b4c7d8a8921ae1937c305244d907ff67a1109
+  metadata.gz: c975252bdf622f3e6bd545e2eca8f4fcf2c9c5a5f04acf159cd162882bf4f491
+  data.tar.gz: ec26cc377c14611389a8f0c9b82cf2137a76523cca3ce445513bc7e2ea5466d6
 SHA512:
-  metadata.gz: 62e4656b7628db4d059a9b3375558016e87fc52bfc9e0d605936adbb4a41d07f963d568f331c9498e7bd730bfa947b16c4b0fe20a881d63fdc13dbbbc70a7b2d
-  data.tar.gz: d54c99af5cd58d20c37715ca757ce946a5e0223a3ab64a892ef98f8ff71cf370d5099a459060a050f2f29f63167cf1770315677674cae1efef6c19bd980bb634
+  metadata.gz: 243e70433cafb8573fc9e4ffcd6a55ece6d369df6201041e6481f88810ffdf907830197854330a28c91cfc2075b767cf379590bd7f80214189a94d4a0b3c03e9
+  data.tar.gz: ac86a77b8685491c0f08fb14bd4e15552eabf73d177b7f5415b809628bab2684a71e4df3aad451fc2822c808b44d036d4c4910998b369cb373f0a4b8b2294ece

data/Gemfile.lock

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

data/lib/rsmp/collect/matcher.rb

@@ -81,28 +81,26 @@ module RSMP
       @queries.map { |query| [query.want, query.done?] }.to_h
     end
 
-    # Get a simply array of bools, showing which queries ahve been matched.
+    # Get a simply array of bools, showing which queries have been matched.
     def summary
       @queries.map { |query| query.done? }
     end
 
     # Check if a messages matches our criteria.
-    # We iterate through each of the status items or return values in the message
-    # Breaks as soon as where done matching all queries
+    # Match each query against each item in the message
     def check_match message
       return unless match?(message)
       @queries.each do |query|       # look through queries
-        get_items(message).each do |item|  # look through status items in message
+        get_items(message).each do |item|  # look through items in message
           matched = query.check_match(item,message)
           if matched != nil
-            type = {true=>'positive',false=>'negative'}[matched]
-            @proxy.log "Query #{query.want} has #{type} match with item #{item}, reached #{summary}", message: message, level: :info
-            break matched
+            type = {true=>'match',false=>'mismatch'}[matched]
+            @proxy.log "#{@title.capitalize} #{message.m_id_short} collect #{type} #{query.want}, item #{item}", level: :debug
+            break
           end
         end
       end
-#      @proxy.log "match", level: :info
-      nil
+      @proxy.log "#{@title.capitalize} collect reached #{summary}", level: :debug
     end
 
   end

data/lib/rsmp/collect/notifier.rb

@@ -2,6 +2,8 @@
 
 module RSMP
   module Notifier
+    attr_reader :listeners
+
     include Inspect
 
     def inspect

data/lib/rsmp/collect/query.rb

@@ -17,12 +17,14 @@ module RSMP
     end
 
     # Check an item and set @done to true if it matches
-    # Always store the item and corresponding message.
+    # Store the item and corresponding message if there's a positive or negative match
     def check_match item, message
-      @message = message
-      @got = item
       matched = match? item
-      @done = matched if matched != nil
+      if matched != nil
+        @message = message
+        @got = item
+        @done = matched
+      end
       matched
     end
 

data/lib/rsmp/proxy.rb

@@ -266,7 +266,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl
+      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl && sxl_version
       schemas
     end
 

data/lib/rsmp/supervisor.rb

@@ -7,7 +7,7 @@ module RSMP
     attr_reader :rsmp_versions, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
-      handle_supervisor_settings options
+      handle_supervisor_settings( options[:supervisor_settings] || {} )
       super options
       @proxies = []
       @site_id_condition = Async::Notification.new
@@ -17,7 +17,7 @@ module RSMP
       @supervisor_settings['site_id']
     end
 
-    def handle_supervisor_settings options={}
+    def handle_supervisor_settings supervisor_settings
       defaults = {
         'port' => 12111,
         'ips' => 'all',
@@ -36,8 +36,8 @@ module RSMP
       }
 
       # merge options into defaults
-      @supervisor_settings = defaults.deep_merge(options[:supervisor_settings] || {})
-      @rsmp_versions = @supervisor_settings["rsmp_versions"]
+      @supervisor_settings = defaults.deep_merge(supervisor_settings)
+      @rsmp_versions = @supervisor_settings["guest"]["rsmp_versions"]
       check_site_sxl_types
     end
 

data/lib/rsmp/tlc.rb

@@ -293,7 +293,6 @@ module RSMP
     def handle_s0002 status_code, status_name=nil
       case status_name
       when 'detectorlogicstatus'
-        RSMP::Tlc.make_status @detector_logics.each { |dl| p dl.value }
         RSMP::Tlc.make_status @detector_logics.map { |dl| dl.value ? '1' : '0' }.join
       end
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.4.2"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.