rsmp 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49bbf353b5a4adb3d680a56cdba0a116f1b401e8f536b4a2dcc8063c355e547
-  data.tar.gz: b06a26d960020160286b64a45f670783967f2ebb214261ce821ee92126b2fab4
+  metadata.gz: 774c3a61fac3a93f87f5d8512da860cbf28cbfb47ff568d2035006d08ac98cf1
+  data.tar.gz: 238b160b9786c76e78639f9c470abcb196aa24476466a1e2ca53cbca8f41eb03
 SHA512:
-  metadata.gz: c91fa2fd2ed113c3ebb095e7189c1c32c54d547532c76addb1ae2ec38a13804e06e7e2c45371ea366d45a26ab10a4fe5a02d60e7529620023e8f5aae3f35361d
-  data.tar.gz: c32531fe57674815cbef9ff124c6cb0e575891e6de836fe9013e26f391efffe8b671c86b62c2da14d8472752af2b8d023e6175e4cd6eaa2cee92cdd023d52b11
+  metadata.gz: c8573e91e6d88cc6be7806d81098e4894d3b220f50997867fca64b8c1161f5f6019fed0383a70c7ee48d61182cdd0a38feb9be3509d2c624224235147839831c
+  data.tar.gz: 487cc05ad5fdb48ad7efbc5415640f2d1aeac49bebb7c2989b97e251a6d1d34e2bce6c6b03596190083c4eeb9b48eaaf33023d8ce382961c25f09a2c17c9db8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.9.4)
+    rsmp (0.9.5)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/alarm_collector.rb

@@ -1,8 +1,8 @@
 module RSMP
   # Class for waiting for specific command responses
   class AlarmCollector < Collector
-    def initialize proxy, want, options={}
-      @want = want
+    def initialize proxy,options={}
+      @query = options[:query] || {}
       super proxy, options.merge(
         type: 'Alarm',
         title:'alarm'
@@ -11,8 +11,23 @@ module RSMP
 
     def type_match? message
       return false if super(message) == false
-      [:aCId, :aSp, :ack, :aS, :sS, :cat, :pri].each do |key|
-        return false if @want[key] && @want[key] != message.attribute(key.to_s)
+
+      # match fixed attributes
+      %w{aCId aSp ack aS sS cat pri}.each do |key|
+        return false if @query[key] && @query[key] != message.attribute(key)
+      end
+
+      # match rvs items
+      if @query['rvs']
+        query_rvs = @query['rvs']
+        message_rvs = message.attributes['rvs']
+        return false unless message_rvs
+        return false unless query_rvs.all? do |query_item|
+          return false unless message_rvs.any? do |message_item|
+            next message_item['n'] == query_item['n'] && message_item['v'] == query_item['v']
+          end
+          next true
+        end
       end
       true
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async