rsmp 0.13.9 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08492adc58ab046ad5b4ff844ce630aa3dba8962b768ec1787b4867c9d221a38'
-  data.tar.gz: a3f3d1182268d14369bbca723b3bc72cc1969327a4e0c3a6c268f7e920b0b1bb
+  metadata.gz: ff38488f573505ba26ab81c6f586c341a40bc6d00999b33fb97226c48d989dc1
+  data.tar.gz: 5c9d199fcbd87090a65d2148efe02a2521d726a272c0b20a0756570961439c6f
 SHA512:
-  metadata.gz: 3a1379ea993e6bb1bce084a27fd347db40859113b1d55cbfac6c175e9f66ba47b95aa1f2a41cdd933c4dcc2c0174a217861c13c88f3491b2e5c40bcb393cdcdb
-  data.tar.gz: ed45664a849d801cb9ab385365653055349c4ce4138c701ff5bf3413f71289524fdac532bd14d1b2b6a6d06db964529cef5ac845343428eea061143a440e9f04
+  metadata.gz: 9f5dd8a06e3d7684eed3653b0b6b810e2d75f9447078dc93504a2aebd30bdb5b2ede91a7d8b5c3e30e4e2687e0e3c3faf1b5fc625c1b5c197f9a58b77a49f009
+  data.tar.gz: 503e4e15aec9293d4c1b0d057e57f79ed67680db3321ea7c6d513b4290c231da38c3d531f8ac32cf1bc4da649631c54c5374c6a388e90f1646ce3251e40dfd4d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.9)
+    rsmp (0.14.0)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
@@ -80,7 +80,7 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schemer (0.4.2)
+    rsmp_schemer (0.5.0)
       json_schemer (~> 0.2.21)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/lib/rsmp/component_proxy.rb

@@ -25,6 +25,8 @@ module RSMP
         sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
         uRt = subscription_list.dig(c_id,sCI,n,'uRt')
         next if uRt.to_i > 0
+        sOc = subscription_list.dig(c_id,sCI,n,'sOc')
+        next if sOc == 'False'
         next if @allow_repeat_updates[sCI] && @allow_repeat_updates[sCI].include?(n)
         new_values = {'s'=>s,'q'=>q}
         old_values = @statuses.dig(sCI,n)

data/lib/rsmp/convert/export/json_schema.rb

@@ -31,9 +31,9 @@ module RSMP
           if item['list']
             case item['type']
             when "boolean"
-              out["$ref"] = "../../core/definitions.json#/boolean_list"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean_list"
             when "integer", "ordinal", "unit", "scale", "long"
-              out["$ref"] = "../../core/definitions.json#/integer_list"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/integer_list"
             else
               raise "Error: List of #{item['type']} is not supported: #{item.inspect}"
             end
@@ -51,11 +51,11 @@ module RSMP
             when "string", "base64"
               out["type"] = "string"
             when "boolean"
-              out["$ref"] = "../../core/definitions.json#/boolean"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/boolean"
             when "timestamp"
-              out["$ref"] = "../../core/definitions.json#/timestamp"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/timestamp"
             when "integer", "ordinal", "unit", "scale", "long"
-              out["$ref"] = "../../core/definitions.json#/integer"
+              out["$ref"] = "../../../core/3.1.1/definitions.json#/integer"
             else
               out["type"] = "string"
             end
@@ -153,9 +153,11 @@ module RSMP
           out["commands/#{key}.json"] = output_json json
         end
 
-        def self.output_root out
+        def self.output_root out, meta
           json = {
-            "description"=> "A schema validatating message against the RSMP SXL for Traffic Light Controllers",
+            "name"=> meta['name'],
+            "description"=> meta['description'],
+            "version"=> meta['version'],
             "allOf" => [
               {
                 "if" => { "required" => ["type"], "properties" => { "type" => { "const" => "CommandRequest" }}},
@@ -180,7 +182,7 @@ module RSMP
 
         def self.generate sxl
           out = {}
-          output_root out
+          output_root out, sxl[:meta]
           output_alarms out, sxl[:alarms]
           output_statuses out, sxl[:statuses]
           output_commands out, sxl[:commands]

data/lib/rsmp/convert/import/yaml.rb

@@ -19,15 +19,18 @@ module RSMP
 
         def self.convert yaml
           sxl = {
+            meta: {},
             alarms: {},
             statuses: {},
             commands: {}
           }
 
+          sxl[:meta] = yaml['meta']
+
           yaml['objects'].each_pair do |type,object|
-            object["alarms"].each { |id,item| sxl[:alarms][id] = item }
-            object["statuses"].each { |id,item| sxl[:statuses][id] = item }
-            object["commands"].each { |id,item| sxl[:commands][id] = item }
+            object["alarms"].each { |id,item| sxl[:alarms][id] = item } if object["alarms"]
+            object["statuses"].each { |id,item| sxl[:statuses][id] = item } if object["statuses"]
+            object["commands"].each { |id,item| sxl[:commands][id] = item } if object["commands"]
           end
           sxl
         end

data/lib/rsmp/site_proxy.rb

@@ -212,7 +212,7 @@ module RSMP
 
       # additional items can be used when verifying the response,
       # but must be removed from the subscribe message
-      subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt') }
+      subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt','sOc') }
 
       # update our subcription list
       @status_subscriptions[component_id] ||= {}
@@ -220,9 +220,11 @@ module RSMP
         sCI = item["sCI"]
         n = item["n"]
         uRt = item["uRt"]
+        sOc = item["sOc"]
         @status_subscriptions[component_id][sCI] ||= {}
         @status_subscriptions[component_id][sCI][n] ||= {}
         @status_subscriptions[component_id][sCI][n]['uRt'] = uRt
+        @status_subscriptions[component_id][sCI][n]['sOc'] = sOc
       end
 
       component = find_component component_id

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.9"
+  VERSION = "0.14.0"
 end

metadata

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