rsmp 0.42.1 → 0.42.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d22cc3891135d1349e9c0c41aeaa16338f7ec77aaa6055de5da51899454332
-  data.tar.gz: '09df465e7c6bd906003b451a61f403f8ea472cf3b92c01b9b136d620b019d391'
+  metadata.gz: a9f368cd8292402eeed0301ea65feee0e4ce5c88fd60e3c992d25d8b72060724
+  data.tar.gz: fc14b6c538ffb6674453cfe35d2067ca62cb0cf52a42030422c231cab995ce3c
 SHA512:
-  metadata.gz: f4440c010e54e8a655f8424e2cc4c3a169fd1dcc992f838c8fc06894eebcccb12b5d0417b263b0de32fbffb66ebdccfb5b60940a3bd5122a9aa369921cd97e29
-  data.tar.gz: ae5f358894fe2ac1eded4d05be8e225959da65ba79251af378fb658f995569fd51b5f4dfe62bcbd9f0dabd560d07f42df56afe6ec6214fb44ea0f8cdaa9a3cfd
+  metadata.gz: fb4f875c05f517b3ddf9b8e966945bcc72bbb86278c03d85d08547cc44fac7589bf6de89ac370ff1ff5d931ef897e766fcdba7a46bddf9ea43baed8e2ea1576e
+  data.tar.gz: '095469321f19b0558c45ef4d683bcc0779b567ffa5ffe52a4364d7a603825ea27224c6fd418a416efd87089d1d629f346c04fb709e5929a199560d88f5073c26'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.42.1)
+    rsmp (0.42.3)
       async (~> 2.32)
       colorize (~> 1.1)
       io-endpoint (~> 0.15)

data/lib/rsmp/proxy/site/modules/status.rb

@@ -144,7 +144,7 @@ module RSMP
         # unsubscribes to all statuses (with all attributes) defined in the used SXL
         def unsubscribe_from_all(component: nil)
           component ||= main.c_id
-          catalogue = RSMP::Schema.status_catalogue(@sxl, sxl_version)
+          catalogue = RSMP::Schema.status_catalogue(@sxl, RSMP::Schema.sanitize_version(sxl_version))
           status_list = catalogue.flat_map do |status_code_id, names|
             names.map { |name| { 'sCI' => status_code_id.to_s, 'n' => name.to_s } }
           end

data/lib/rsmp/proxy/site/site_proxy.rb

@@ -50,8 +50,7 @@ module RSMP
 
     def handshake_complete
       super
-      sanitized_sxl_version = RSMP::Schema.sanitize_version(@site_sxl_version)
-      log "Connection to site #{@site_id} established, using core #{@core_version}, #{@sxl} #{sanitized_sxl_version}",
+      log "Connection to site #{@site_id} established, using core #{@core_version}, #{@sxl} #{@site_sxl_version}",
           level: :info
       start_watchdog
     end
@@ -126,12 +125,12 @@ module RSMP
       # note that the type comes from the site config, while the version
       # comes from the Version message send by the site
       type = @site_settings['sxl']
-      version = message.attribute 'SXL'
-      RSMP::Schema.find_schema! type, version, lenient: true
+      sanitized_version = RSMP::Schema.sanitize_version(message.attribute('SXL'))
+      RSMP::Schema.find_schema! type, sanitized_version
 
-      # store sxl version requested by site
+      # store raw sxl version from site (may be 2-part like "1.2"), so we echo it back unchanged
       # TODO should check agaist site settings
-      @site_sxl_version = message.attribute 'SXL'
+      @site_sxl_version = message.attribute('SXL')
     rescue RSMP::Schema::UnknownSchemaError => e
       dont_acknowledge message, "Rejected #{message.type} message,", e.to_s
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.42.1'.freeze
+  VERSION = '0.42.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.42.1
+  version: 0.42.3
 platform: ruby
 authors:
 - Emil Tin