rsmp 0.4.0 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d67026eef7404afe7979c198bcfe97bd63e231400e174988ab14454f23ea09
-  data.tar.gz: e82717dc287f0eb2e91577cf5e02d752cdf1d1fef6bdac6f4cf3569494d8da3e
+  metadata.gz: b82a88e9cd80aeb3bf0bc89b774727155dc8c6418520493c34a852809eb29e94
+  data.tar.gz: 16cb2331281e470233ff28fcf6ac1e89124a88628d920f8f3d7e486b0a076b2f
 SHA512:
-  metadata.gz: 0d971e86ebd1ef25ff52cc4babd23567b2b5e870cc70f7edfc18ce7925a850fd94dfa851e70c16a43d4df1ef174045999ad41c0fd5ad2ed7c074ae022282e441
-  data.tar.gz: 5f991d2aee4af7ac5a30b133ecfa8e1505b005fbc8e7092551f0d28bd4d26cee36fb645aa188e8a9664c0a7d5c991c78a2059445c82e1ec697ff14a8df3d2cdf
+  metadata.gz: 47d08d2fab1e0dd76dc5e988b3ee4e56a3110258402ffc9d1d8213ca7cbd889e94d08119100b785dfc5803dfd5f0618ac25c2597e1499cebd7fbd2db500614d5
+  data.tar.gz: 321f695677507a66fa03a81fc2bdc87350df51278e53e95bb6f75e5eeea180ea3e1503f0ee072aea425970d32e7a814a8a683cd33abdf7d832cd8c83e216ff97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.4.0)
+    rsmp (0.4.3)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/lib/rsmp/collect/collector.rb

@@ -1,6 +1,6 @@
 module RSMP
 
-  # Collects ingoing and/or outgoing messages.
+  # Collects ingoing and/or outgoing messages from a notifier.
   # Can filter by message type and wakes up the client once the desired number of messages has been collected.
   class Collector < Listener
     attr_reader :condition, :messages, :done
@@ -17,22 +17,29 @@ module RSMP
       reset
     end
 
+    # Inspect formatter that shows the message we have collected
     def inspect
       "#<#{self.class.name}:#{self.object_id}, #{inspector(:@messages)}>"
     end
 
+    # Want ingoing messages?
     def ingoing?
       @ingoing == true
     end
 
+    # Want outgoing messages?
     def outgoing?
       @outgoing == true
     end
 
+    # Block until all messages have been collected
     def wait
       @condition.wait
     end
 
+    # Collect message
+    # Will block until all messages have been collected,
+    # or we time out 
     def collect task, options={}, &block
       @options.merge! options
       @block = block
@@ -46,9 +53,9 @@ module RSMP
       return @error if @error
       self
     rescue Async::TimeoutError
-      str = "Did not receive #{@title}"
+      str = "#{@title.capitalize} collection"
       str << " in response to #{options[:m_id]}" if options[:m_id]
-      str << " within #{@options[:timeout]}s"
+      str << " didn't complete within #{@options[:timeout]}s"
       raise RSMP::TimeoutError.new str
     end
 

data/lib/rsmp/collect/matcher.rb

@@ -35,10 +35,11 @@ module RSMP
   class Matcher < Collector
     attr_reader :queries
 
-    # Initialize with a list a wanted statuses
+    # Initialize with a list of wanted statuses
     def initialize proxy, want, options={}
       super proxy, options.merge( ingoing: true, outgoing: false)
-      @queries = want.map { |wanted_item| build_query wanted_item }
+      @queries = want.map { |item| build_query item }
+      @want = want
     end
 
     # Build a query object.
@@ -51,10 +52,15 @@ module RSMP
     def query_result want
       query = @queries.find { |q| q.want == want}
       raise unless query
-      query.item
+      query.got
     end
 
-    # get the first message. Useful when you only collected one mesage
+    # Get an array of the last item received for each query
+    def reached
+      @queries.map { |query| query.got }.compact
+    end
+
+    # get the first message. Useful when you only collect one mesage
     def message
       @queries.first.message
     end
@@ -64,11 +70,6 @@ module RSMP
       @queries.map { |query| query.message }.uniq
     end
 
-    # Get items from results
-    def items
-      @queries.map { |query| query.item }.uniq
-    end
-
     # Are there queries left to match?
     def done?
       @queries.all? { |query| query.done? }
@@ -77,24 +78,30 @@ module RSMP
     # Get a simplified hash of queries, with values set to either true or false,
     # indicating which queries have been matched.
     def status
-      @queries.map { |query| [query.query,query.done?] }.to_h
+      @queries.map { |query| [query.want, query.done?] }.to_h
     end
 
-    # Get a simply array of bools, showing which queries ahve been matched.
+    # Get a simply array of bools, showing which queries have been matched.
     def summary
       @queries.map { |query| query.done? }
     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
-          break if query.check_match(item,message) != nil #check_item_match message, query, item
+        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
+      @proxy.log "#{@title.capitalize} collect reached #{summary}", level: :debug
     end
+
   end
 end

data/lib/rsmp/collect/message_queries.rb

@@ -23,9 +23,9 @@ module RSMP
       return nil if @want['n'] && @want['n'] != item['n']
       return false if @want['q'] && @want['q'] != item['q']
       if @want['s'].is_a? Regexp
-        return false if @want['s'] && item['s'] !~ @want['s']
-      else
-        return false if @want['s'] && item['s'] != @want['s']
+        return false if item['s'] !~ @want['s']
+      elsif @want['s']
+        return false if item['s'] != @want['s']
       end
       true
     end

data/lib/rsmp/collect/query.rb

@@ -2,43 +2,33 @@ module RSMP
     
   # Class that matches a single status or command item
   class Query
-    attr_reader :want, :item, :message
+    attr_reader :want, :got, :message
 
     def initialize want
       @want = want
-      @item = nil
+      @got = nil
       @message = nil
       @done = false
     end
 
+    # Are we done, i.e. did the last checked item match?
     def done?
       @done
     end
 
+    # Check an item and set @done to true if it matches
+    # Store the item and corresponding message if there's a positive or negative match
     def check_match item, message
       matched = match? item
-      if matched == true
-        keep message, item
-        true
-      elsif matched == false
-        forget
-        true
+      if matched != nil
+        @message = message
+        @got = item
+        @done = matched
       end
+      matched
     end
 
     def match? item
     end
-
-    # Mark a query as matched and store item and message
-    def keep message, item
-      @message = message
-      @item = item
-      @done = true
-    end
-
-    # Mark a query as not matched
-    def forget
-      @done = false
-    end
   end
 end

data/lib/rsmp/tlc.rb

@@ -293,7 +293,6 @@ module RSMP
     def handle_s0002 status_code, status_name=nil
       case status_name
       when 'detectorlogicstatus'
-        RSMP::Tlc.make_status @detector_logics.each { |dl| p dl.value }
         RSMP::Tlc.make_status @detector_logics.map { |dl| dl.value ? '1' : '0' }.join
       end
     end

data/lib/rsmp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.4
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async