rsmp 0.35.0 → 0.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1dba9786324c2d99518c96c0d254f5552a887fd39bd0881ca3250a4a9bedd8d
-  data.tar.gz: 2e852125b614b5ab45c5ba9b10b981a01b9394239ff66662f2011ae8cb0c37b3
+  metadata.gz: e5c0f93062b73555dd67edda6564054299c1df0240c4ce55f0b854abc7e94931
+  data.tar.gz: 2659660e29f1ba7b50533b3e89bb80c81ae69f81768cbc4012db6da6776ccebc
 SHA512:
-  metadata.gz: f307ea704153b59de79f2777871b52eb5e0767910602da521a67d18c55e01370763f6dc5022336f13cc2b1500f2d80cac3d45603e62315428d500bceefd179ff
-  data.tar.gz: 85230904f92aa9ad230be72c4e94b16783908a5b1cb5fd34fc9837c97fb780c3ebfd1797e6da8c2a17fef0b19c6cc96116179ee534e59c6fcfc870cdc45f3c51
+  metadata.gz: c48367c147156f5adb8cdabfd5fc81cde4cbb3e842f05c982307b6400f6fb33deb583cc57737faa2e7a1fe2a87f7e629dde7b335f063e126a403e45f49774c2f
+  data.tar.gz: 77c5e1343d7106bd9a60ff55e666d69cb4589655e7ad9bcbcf84cb95101e3b7c004bf373943f018d24b38d5cb6f6cccc97f7a0202fe2c8f5dc6ad7e687134c1b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.35.0)
+    rsmp (0.35.2)
       async (~> 2.21)
       async-io (~> 1.43)
       colorize (~> 1.1)
@@ -18,21 +18,23 @@ GEM
       cucumber (>= 8.0, < 10.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (2.21.1)
+    async (2.23.0)
       console (~> 1.29)
       fiber-annotation
-      io-event (~> 1.6, >= 1.6.5)
+      io-event (~> 1.9)
+      metrics (~> 0.12)
+      traces (~> 0.15)
     async-io (1.43.2)
       async
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     colorize (1.1.0)
-    console (1.29.2)
+    console (1.29.3)
       fiber-annotation
       fiber-local (~> 1.1)
       json
     contracts (0.17.2)
-    cucumber (9.2.0)
+    cucumber (9.2.1)
       builder (~> 3.2)
       cucumber-ci-environment (> 9, < 11)
       cucumber-core (> 13, < 14)
@@ -53,38 +55,39 @@ GEM
       bigdecimal
     cucumber-gherkin (27.0.0)
       cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.7.0)
-      cucumber-messages (> 19, < 27)
+    cucumber-html-formatter (21.9.0)
+      cucumber-messages (> 19, < 28)
     cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.1)
-    diff-lcs (1.5.1)
-    ffi (1.17.0)
+    cucumber-tag-expressions (6.1.2)
+    diff-lcs (1.6.0)
+    ffi (1.17.1)
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
     fiber-storage (1.0.0)
     hana (1.3.7)
-    io-event (1.7.5)
-    json (2.9.0)
+    io-event (1.9.0)
+    json (2.10.1)
     json_schemer (2.3.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
-    logger (1.6.3)
+    logger (1.6.6)
+    metrics (0.12.1)
     mini_mime (1.1.5)
     multi_test (1.1.0)
     ostruct (0.6.1)
     rake (13.2.1)
-    regexp_parser (2.9.3)
-    rsmp_schema (0.8.5)
+    regexp_parser (2.10.0)
+    rsmp_schema (0.8.7)
       json_schemer (~> 2.3.0)
       thor (~> 1.3.1)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.3)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -98,6 +101,7 @@ GEM
       ffi (~> 1.1)
     thor (1.3.2)
     timecop (0.9.10)
+    traces (0.15.2)
 
 PLATFORMS
   arm64-darwin-22

data/lib/rsmp/error.rb

@@ -9,6 +9,7 @@ module RSMP
 	end
 
 	class SchemaError < Error
+		attr_accessor :schemas
 	end
 
 	class InvalidMessage < Error

data/lib/rsmp/message.rb

@@ -153,7 +153,9 @@ module RSMP
       errors = RSMP::Schema.validate attributes, schemas
       if errors
         error_string = errors.map {|item| item.reject {|e| e=='' } }.compact.join(', ').strip
-        raise SchemaError.new error_string
+        err = SchemaError.new "#{error_string}"
+        err.schemas = schemas
+        raise err
       end
     end
 

data/lib/rsmp/proxy.rb

@@ -353,7 +353,8 @@ module RSMP
     rescue EOFError, IOError
       buffer_message message
     rescue SchemaError, RSMP::Schema::Error => e
-      str = "Could not send #{message.type} because schema validation failed: #{e.message}"
+      schemas_string = e.schemas.map {|schema| "#{schema.first}: #{schema.last}"}.join(", ")
+      str = "Could not send #{message.type} because schema validation failed (#{schemas_string}): #{e.message}"
       log str, message: message, level: :error
       distribute_error e.exception("#{str} #{message.json}")
     end
@@ -416,7 +417,8 @@ module RSMP
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
     rescue SchemaError, RSMP::Schema::Error => e
-      reason = "schema errors: #{e.message}"
+      schemas_string = e.schemas.map {|schema| "#{schema.first}: #{schema.last}"}.join(", ")
+      reason = "schema errors (#{schemas_string}): #{e.message}"
       str = "Received invalid #{message.type}"
       distribute_error e.exception(str), message: message
       dont_acknowledge message, str, reason

data/lib/rsmp/supervisor_proxy.rb

@@ -312,9 +312,14 @@ module RSMP
       send_message response
     end
 
-    def rsmpify_value v
-      return v if v.is_a?(Array) || v.is_a?(Set)
-      v.to_s
+    def rsmpify_value v, q
+      if v.is_a?(Array) || v.is_a?(Set)
+        v
+      elsif ['undefined','unknown'].include?(q.to_s)
+        nil
+      else
+        v.to_s
+      end
     end
 
     def process_status_request message, options={}
@@ -324,7 +329,7 @@ module RSMP
         component = @site.find_component component_id
         sS = message.attributes["sS"].map do |arg|
           value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
-          { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
+          { "s" => rsmpify_value(value, quality), "q" => quality.to_s }.merge arg
         end
         log "Received #{message.type}", message: message, level: :log
 
@@ -434,8 +439,8 @@ module RSMP
             if subscription[:interval] == 0
               # send as soon as the data changes
               if component_object
-                current, age = *(component_object.get_status code, name)
-                current = rsmpify_value(current)
+                current, quality = *(component_object.get_status code, name)
+                current = rsmpify_value(current,quality)
               end
               last_sent = fetch_last_sent_status component, code, name
               if current != last_sent
@@ -473,7 +478,7 @@ module RSMP
             end
             sS << { "sCI" => code,
                      "n" => status_name,
-                     "s" => rsmpify_value(value),
+                     "s" => rsmpify_value(value, quality),
                      "q" => quality }
           end
         end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -1045,7 +1045,9 @@ module RSMP
         when 'start'
           TrafficControllerSite.make_status clock.to_s
         when 'occupancy'
-          TrafficControllerSite.make_status 0
+          values = [-1,0,50,100]
+          output = @detector_logics.each_with_index.map {|dl,i| values[i%values.size] }.join(",")
+          TrafficControllerSite.make_status output
         end
       end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.35.0"
+  VERSION = "0.35.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.35.2
 platform: ruby
 authors:
 - Emil Tin
 bindir: exe
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger