rsmp 0.13.9 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08492adc58ab046ad5b4ff844ce630aa3dba8962b768ec1787b4867c9d221a38'
-  data.tar.gz: a3f3d1182268d14369bbca723b3bc72cc1969327a4e0c3a6c268f7e920b0b1bb
+  metadata.gz: 38e231d49b1f3b8bf84cd427c830817f1f029aad140feb5a41a254b3085e03cc
+  data.tar.gz: 3d7c432f63819f3fd76c9476fb8aee6ee3160c791031270124ef60e5c34921dd
 SHA512:
-  metadata.gz: 3a1379ea993e6bb1bce084a27fd347db40859113b1d55cbfac6c175e9f66ba47b95aa1f2a41cdd933c4dcc2c0174a217861c13c88f3491b2e5c40bcb393cdcdb
-  data.tar.gz: ed45664a849d801cb9ab385365653055349c4ce4138c701ff5bf3413f71289524fdac532bd14d1b2b6a6d06db964529cef5ac845343428eea061143a440e9f04
+  metadata.gz: 371f226083bca88553ca127e8228442cde2917c54995b57a472fa423339144806aaa3d6271d7f7d5c774f3b3c566ef842866806cce7e3633ed566a8b8a6f0f6f
+  data.tar.gz: f27787a527fc41626dd6903542bd03eb5fb12debee2bfa5e87d1635a965e27c4333d814b179ba937849c6f172b3dd7d0ae6d9e50fed62ef6e51131fc717cf4fc

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.9)
+    rsmp (0.14.2)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schemer
+      rsmp_schema (~> 0.1.0)
       thor (~> 1.2.1)
 
 GEM
@@ -80,8 +80,9 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schemer (0.4.2)
+    rsmp_schema (0.1.1)
       json_schemer (~> 0.2.21)
+      thor (~> 1.2.1)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)

data/lib/rsmp/cli.rb

@@ -74,9 +74,9 @@ module RSMP
       end
     rescue Interrupt
       # cntr-c
-    rescue RSMP::Schemer::UnknownSchemaTypeError => e
+    rescue RSMP::Schema::UnknownSchemaTypeError => e
       puts "Cannot start site: #{e}"
-    rescue RSMP::Schemer::UnknownSchemaVersionError => e
+    rescue RSMP::Schema::UnknownSchemaVersionError => e
       puts "Cannot start site: #{e}"
     rescue Psych::SyntaxError => e
       puts "Cannot read config file #{e}"

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/message.rb

@@ -1,4 +1,4 @@
-require 'rsmp_schemer'
+require 'rsmp_schema'
 
 # rsmp messages
 module RSMP
@@ -146,7 +146,7 @@ module RSMP
     end
 
     def validate schemas
-      errors = RSMP::Schemer.validate attributes, schemas
+      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

data/lib/rsmp/proxy.rb

@@ -230,7 +230,7 @@ module RSMP
         begin
           now = Clock.now
           timer(now)
-        rescue RSMP::Schemer::Error => e
+        rescue RSMP::Schema::Error => e
           log "Timer: Schema error: #{e}", level: :warning
         rescue EOFError => e
           log "Timer: Connection closed: #{e}", level: :warning
@@ -319,7 +319,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 && sxl_version
+      schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version) if sxl && sxl_version
       schemas
     end
 
@@ -335,7 +335,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError, RSMP::Schemer::Error => e
+    rescue SchemaError, RSMP::Schema::Error => e
       str = "Could not send #{message.type} because schema validation failed: #{e.message}"
       log str, message: message, level: :error
       notify_error e.exception("#{str} #{message.json}")
@@ -398,7 +398,7 @@ module RSMP
       log str, message: Malformed.new(attributes), level: :warning
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
-    rescue SchemaError, RSMP::Schemer::Error => e
+    rescue SchemaError, RSMP::Schema::Error => e
       reason = "schema errors: #{e.message}"
       str = "Received invalid #{message.type}, #{reason}"
       log str, message: message, level: :warning

data/lib/rsmp/site.rb

@@ -60,7 +60,7 @@ module RSMP
     def check_sxl_version
       sxl = @site_settings['sxl']
       version = @site_settings['sxl_version']
-      RSMP::Schemer::find_schema! sxl, version, lenient: true
+      RSMP::Schema::find_schema! sxl, version, lenient: true
     end
 
     def run

data/lib/rsmp/site_proxy.rb

@@ -47,7 +47,7 @@ module RSMP
 
     def handshake_complete
       super
-      sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      sanitized_sxl_version = RSMP::Schema.sanitize_version(@site_sxl_version)
       log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :log
       start_watchdog
     end
@@ -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
@@ -312,12 +314,12 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version, lenient: true
+      RSMP::Schema::find_schema! type, version, lenient: true
 
       # store sxl version requested by site
       # TODO should check agaist site settings
       @site_sxl_version = message.attribute 'SXL'
-    rescue RSMP::Schemer::UnknownSchemaError => e
+    rescue RSMP::Schema::UnknownSchemaError => e
       dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 

data/lib/rsmp/supervisor.rb

@@ -52,8 +52,8 @@ module RSMP
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end
-        RSMP::Schemer.find_schemas! sxl if sxl
-      rescue RSMP::Schemer::UnknownSchemaError => e
+        RSMP::Schema.find_schemas! sxl if sxl
+      rescue RSMP::Schema::UnknownSchemaError => e
         raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': #{e}")
       end
     end

data/lib/rsmp/supervisor_proxy.rb

@@ -82,7 +82,7 @@ module RSMP
     end
 
     def handshake_complete
-      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      sanitized_sxl_version = RSMP::Schema.sanitize_version(sxl_version)
       log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
       if @site_settings['send_after_connect']

data/lib/rsmp/version.rb

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

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "rsmp_schemer"
+  spec.add_dependency "rsmp_schema", "~> 0.1.0"
 
   spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.9
+  version: 0.14.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
-  name: rsmp_schemer
+  name: rsmp_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement