rsmp 0.53.0 → 0.53.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66bd0079bb76c72ad04ce15f191ac3f33a06bcaf4f941c8d23f10b8239c3f308
-  data.tar.gz: 34f6fb37b13637ffe1bdf3f92064e103fc3b8b798fce11e2764d0ab810f23190
+  metadata.gz: c18e33005250515e950be688be2ed3d0070c379724885ca10268846a85d0b5d7
+  data.tar.gz: e9b7ab8838542eb7d0ece090c3944614dbbcd2d6b83c27e15de9a510bbd60856
 SHA512:
-  metadata.gz: 140f8cd7c0f9f5b542d4b4f47fd4d99095ff7eecaaf784bc6b6ae92e5dee1014b4f0a6338159c21e3bdda86e3ef06764f17b9d0055c3880b213a2c18e0e18708
-  data.tar.gz: ab5da12c73a27485b2e94d73cc2090adce96b69aa97dbb4530b5d5819aad20ecf0fa466d2b3b3f5068e678cbe41fcfefdf9808155c25656ad4fb52e78432ce7c
+  metadata.gz: 0cf38acb9093a3939e55d6b21d54ec37459b5950793105ea23a5c8a6633b24e9fb5a2cc53293fa7dc5f1580aa1eb8e412b5fcb987ad6080d6c4a4358a1a9ce13
+  data.tar.gz: 533839b68ef17834741085c7d0e7d1d023f7d997b335608e5f00365c45ba6e28af13d9deab55b1062f58f2f9f323aa1f0a463de09a34febac6ff32c909c18b1c

data/CHANGELOG.md

@@ -738,3 +738,10 @@ Initial release.
 ## 0.53.0
 - update core 3.3.0 support to sync with latest core 3.3.0 draft
 - allow fractional status subscription intervals for all older core versions to align with their specs.
+
+## 0.53.1
+- skip repeated status value checks for buffered values (`q=old`) and unknown subscription settings
+
+## 0.53.2
+- fix issues with Alarm enum casing
+- update TLC schemas

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.53.0)
+    rsmp (0.53.2)
       async (~> 2.45)
       colorize (~> 1.1)
       io-endpoint (~> 0.17)

data/lib/rsmp/collect/alarm_collector.rb

@@ -1,6 +1,8 @@
 module RSMP
   # Class for waiting for specific command responses
   class AlarmCollector < Collector
+    ENUM_ATTRIBUTES = %w[aSp ack aS sS cat pri].freeze
+
     def initialize(proxy, options = {})
       @matcher = options[:matcher] || {}
       super(proxy, options.merge(
@@ -27,12 +29,17 @@ module RSMP
         when Regexp
           return false if got !~ want
         when String
-          return false if got != want
+          return false unless string_attribute_matches?(key, want, got)
         end
       end
       true
     end
 
+    def string_attribute_matches?(key, want, got)
+      # Schemas enforce wire casing; enum matching also supports older Core versions.
+      ENUM_ATTRIBUTES.include?(key) ? want.casecmp?(got) : want == got
+    end
+
     def rvs_attributes_match?(message)
       return true unless @matcher['rvs']
 

data/lib/rsmp/component/alarm_state.rb

@@ -9,9 +9,9 @@ module RSMP
     def self.create_from_message(component, message)
       options = {
         timestamp: RSMP::Clock.parse(message.attribute('aTs')),
-        acknowledged: message.attribute('ack') == 'Acknowledged',
-        suspended: message.attribute('aS') == 'Suspended',
-        active: message.attribute('sS') == 'Active',
+        acknowledged: message.attribute('ack').downcase == 'acknowledged',
+        suspended: message.attribute('sS').downcase == 'suspended',
+        active: message.attribute('aS').downcase == 'active',
         category: message.attribute('cat'),
         priority: message.attribute('pri').to_i,
         rvs: message.attribute('rvs')
@@ -121,9 +121,9 @@ module RSMP
       raise TimestampError, "timestamp is earlier than previous alarm #{message.m_id_short}" if older_message? message
     ensure
       @timestamp = RSMP::Clock.parse message.attribute('aTs')
-      @acknowledged = message.attribute('ack') == 'True'
-      @suspended = message.attribute('sS') == 'True'
-      @active = message.attribute('aS') == 'True'
+      @acknowledged = message.attribute('ack').downcase == 'acknowledged'
+      @suspended = message.attribute('sS').downcase == 'suspended'
+      @active = message.attribute('aS').downcase == 'active'
       @category = message.attribute('cat')
       @priority = message.attribute('pri').to_i
       @rvs = message.attribute('rvs')

data/lib/rsmp/component/component_proxy.rb

@@ -18,8 +18,8 @@ module RSMP
       end
     end
 
-    # Check that were not receiving repeated update values.
-    # The check is not performed for item with an update interval.
+    # Check live values only for known change-only subscriptions. Buffered
+    # values may have been generated under different subscription settings.
     def check_repeat_values(message, subscription_list)
       message.attribute('sS').each do |item|
         check_status_item_for_repeats(item, subscription_list)
@@ -27,6 +27,8 @@ module RSMP
     end
 
     def check_status_item_for_repeats(item, subscription_list)
+      return if item['q'] == 'old'
+
       status_code = item['sCI']
       status_name = item['n']
       return if update_rate_set?(subscription_list, status_code, status_name)
@@ -43,8 +45,9 @@ module RSMP
     end
 
     def should_check_repeats?(subscription_list, status_code, status_name)
-      soc = subscription_list.dig(c_id, status_code, status_name, 'sOc')
-      return false if soc == false
+      subscription = subscription_list.dig(c_id, status_code, status_name)
+      return false unless subscription
+      return false if subscription['sOc'] == false
       return false if @allow_repeat_updates[status_code]&.include?(status_name)
 
       true

data/lib/rsmp/message.rb

@@ -329,7 +329,7 @@ module RSMP
     def initialize(attributes = {})
       super({
         'aSp' => 'Acknowledge',
-        'ack' => 'acknowledged'
+        'ack' => 'Acknowledged'
       }.merge attributes)
     end
   end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.53.0'.freeze
+  VERSION = '0.53.2'.freeze
 end

data/schemas/core/3.2.0/alarm_issue.json

@@ -13,7 +13,7 @@
     "sS" : {
       "description" : "Suspend status",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "Suspended", "notSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core/3.2.1/alarm_issue.json

@@ -13,7 +13,7 @@
     "sS" : {
       "description" : "Suspend status",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "Suspended", "notSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core/3.2.2/alarm_issue.json

@@ -13,7 +13,7 @@
     "sS" : {
       "description" : "Suspend status",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "Suspended", "notSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/core/3.3.0/alarm_issue.json

@@ -13,7 +13,7 @@
     "sS" : {
       "description" : "Suspend status",
       "type" : "string",
-      "enum" : [ "suspended", "notSuspended" ]
+      "enum" : [ "Suspended", "notSuspended" ]
     },
     "aTs" : { "$ref": "definitions.json#/timestamp" },
     "cat" : {

data/schemas/tlc/1.3.0/defs/definitions.json

@@ -68,9 +68,23 @@
     ]
   },
   "component_id": {
-    "description" : "Compoment id",
+    "description" : "Component ID",
     "allOf" : [
-      { "$ref" : "#/rsmp_string" }
+      { "$ref" : "#/rsmp_string" },
+      { "pattern" : "^[A-Za-z0-9_+=-]+(?:/[A-Za-z0-9_+=-]+)*$" }
+    ]
+  },
+  "component_id_selector": {
+    "description" : "Component selector",
+    "anyOf" : [
+      { "$ref" : "#/component_id" },
+      {
+        "allOf" : [
+          { "$ref" : "#/rsmp_string" },
+          { "pattern" : "^[A-Za-z0-9_+=-]+(?:/[A-Za-z0-9_+=-]+)*/$" }
+        ]
+      },
+      { "enum" : [ "/", "", null ] }
     ]
   },
   "component_type": {

metadata

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