rsmp 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499cc4c58205e41108099bd05cd2c3bc792f962abf4bdbe3082345a2e3953094
-  data.tar.gz: 7cca20987f24697c9def7d638ebd89b99ecbc006f6d7bb8f8445d5b50d5cad23
+  metadata.gz: b82a88e9cd80aeb3bf0bc89b774727155dc8c6418520493c34a852809eb29e94
+  data.tar.gz: 16cb2331281e470233ff28fcf6ac1e89124a88628d920f8f3d7e486b0a076b2f
 SHA512:
-  metadata.gz: f585bdc07e8ca52f1d809779894dab0a6e61c85f6fcfdd61bac593808e5e04ec0a006af662f47f16d2bd9f720096809d9412caff46ff3532a4fc687f99ede730
-  data.tar.gz: 88c2c437f41c22e5e9d3a8a281ec01a02379b70b9e46cdecb9f36d97753eb77d075c79a859d71fa6cd8ae1ce0ed310936891124dec9984b699979378510e6006
+  metadata.gz: 47d08d2fab1e0dd76dc5e988b3ee4e56a3110258402ffc9d1d8213ca7cbd889e94d08119100b785dfc5803dfd5f0618ac25c2597e1499cebd7fbd2db500614d5
+  data.tar.gz: 321f695677507a66fa03a81fc2bdc87350df51278e53e95bb6f75e5eeea180ea3e1503f0ee072aea425970d32e7a814a8a683cd33abdf7d832cd8c83e216ff97

data/lib/rsmp/collect/matcher.rb

@@ -87,16 +87,16 @@ module RSMP
     end
 
     # Check if a messages matches our criteria.
-    # We iterate through each of the status items or return values in the message
-    # Breaks as soon as where done matching all queries
+    # Match each query against each item in the message
     def check_match message
       return unless match?(message)
       @queries.each do |query|       # look through queries
-        get_items(message).each do |item|  # look through status items in message
+        get_items(message).each do |item|  # look through items in message
           matched = query.check_match(item,message)
           if matched != nil
             type = {true=>'match',false=>'mismatch'}[matched]
             @proxy.log "#{@title.capitalize} #{message.m_id_short} collect #{type} #{query.want}, item #{item}", level: :debug
+            break
           end
         end
       end

data/lib/rsmp/collect/query.rb

@@ -17,12 +17,14 @@ module RSMP
     end
 
     # Check an item and set @done to true if it matches
-    # Always store the item and corresponding message.
+    # Store the item and corresponding message if there's a positive or negative match
     def check_match item, message
-      @message = message
-      @got = item
       matched = match? item
-      @done = matched if matched != nil
+      if matched != nil
+        @message = message
+        @got = item
+        @done = matched
+      end
       matched
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

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