rsmp 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5316c50ad6cd09d30e7d1baab78e717fac4656c06178272ef4adc1c6647fb544
-  data.tar.gz: 6ef4d635b42f3eac19b94b68bbcb05c59ce94de96e0e27f1f5c7a6deefd4e470
+  metadata.gz: 49e4aee9252ad888e831e5ce0738eff5bba57fdd6f2ec2220d7e74936e0e8177
+  data.tar.gz: 5866b23cb324d0732de17f995abec6304f50673e9cfcaa7b440dea6858102cd8
 SHA512:
-  metadata.gz: 1947906505e532d0d47d93f1d9fe2c8c3199ff58d378b9be3df18865339e966a6ad5f74512aa168ee4a5d641624cf7b0f170436d2c11e4f495bd7d6b88be502f
-  data.tar.gz: ee0ecbb229637276d6cec21ccacc6414199ad7f0392324633231cb4a8632a8b64b1aa2ba5abd979a7699ed6721a5a40b9d9c531f45dc0f59345149662e608b12
+  metadata.gz: 0ff9a48cde72b3fb3963c421a321c4bd08c0edfb9afcd7b4b919e2e92aa37624259a5124c81f4bd0189cc6a3596414edc75a305fb19b0c348fadc4e836bdf7cf
+  data.tar.gz: 490aa51f0a4a5b9a6a197c0f6bbe11b8ae16934e5eecd76a486b6e4e34786ebbb334d4ddabf7340c9f13d4946cad4e162db49205a3fbf04fa064938bf6029e0f

data/Gemfile.lock

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

data/config/tlc.yaml

@@ -21,10 +21,10 @@ signal_plans:
       1: 0
       2: 5
     states:
-      A1: '11NBBB'
-      A2: '1NBBBB'
-      B1: 'BBB11N'
-      B2: 'BBB1NB'
+      A1: '123efg'
+      A2: '123efg'
+      B1: '123efg'
+      B2: '123efg'
   2:
     states:
       A1: '111NBB'

data/lib/rsmp/collect/collector.rb

@@ -80,7 +80,7 @@ module RSMP
       wait
       @status
     ensure
-      @notifier.remove_listener self
+      @notifier.remove_listener self if @notifier
     end
 
     # Collect message
@@ -151,28 +151,26 @@ module RSMP
     # Handle message. and return true when we're done collecting
     def notify message
       raise ArgumentError unless message
-      raise RuntimeError.new("can't process message when done") unless ready? || collecting?
-      unless reject_not_ack(message)
-        perform_match message
-      end
+      raise RuntimeError.new("can't process message when status is :#{@status}, title: #{@title}, desc: #{describe}") unless ready? || collecting?
+      perform_match message
       @status
     end
 
+    def describe
+    end
+
     # Match message against our collection criteria
     def perform_match message
-      return unless type_match?(message)
+      return false if reject_not_ack(message)
+      return false unless type_match?(message)
       if @block
         status = [@block.call(message)].flatten
+        return unless collecting?
         keep message if status.include?(:keep)
-        if status.include?(:cancel)
-          cancel('Cancelled by block')
-        else
-          complete if done?
-        end
       else
         keep message
-        complete if done?
       end
+      complete if done?
     end
 
     # Have we collected the required number of messages?
@@ -224,7 +222,7 @@ module RSMP
     end
 
     # Abort collection
-    def cancel error
+    def cancel error=nil
       @error = error
       @status = :cancelled
       do_stop

data/lib/rsmp/collect/command_response_collector.rb

@@ -14,7 +14,7 @@ module RSMP
 
     # Get items, in our case the return values
     def get_items message
-      message.attributes['rvs']
+      message.attributes['rvs'] || []
     end
   end
 end

data/lib/rsmp/collect/filter.rb

@@ -0,0 +1,31 @@
+module RSMP
+
+  # Filter messages based on type, direction and component id.
+  # Used by Collectors.
+  class Filter
+    def initialize ingoing:true, outgoing:true, type:, component:nil
+      @ingoing = ingoing
+      @outgoing = outgoing
+      @type = type
+      @component = component
+    end
+
+    # Check a message against our match criteria
+    # Return true if there's a match, false if not
+    def accept? message
+      return false if message.direction == :in && @ingoing == false
+      return false if message.direction == :out && @outgoing == false
+      if @type
+        if @type.is_a? Array
+          return false unless @type.include? message.type
+        else
+          return false unless message.type == @type
+        end
+      end
+      if @component
+        return false if message.attributes['cId'] && message.attributes['cId'] != @component
+      end
+      true
+    end
+  end
+end

data/lib/rsmp/collect/listener.rb

@@ -19,13 +19,5 @@ module RSMP
 
     def notify_error error, options={}
     end
-
-    def listen &block
-      @notifier.add_listener self
-      yield
-    ensure
-      @notifier.remove_listener self
-    end
-
   end
 end

data/lib/rsmp/collect/query.rb

@@ -8,26 +8,36 @@ module RSMP
       @want = want
       @got = nil
       @message = nil
-      @done = false
     end
 
     # Are we done, i.e. did the last checked item match?
     def done?
-      @done
+      @got != nil
     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 perform_match item, message
+    def perform_match item, message, block
       matched = match? item
       if matched != nil
-        @message = message
-        @got = item
-        @done = matched
+        if block
+          status = block.call(nil,item)
+          matched = status if status == true || status == false
+        end
       end
       matched
     end
 
+    def keep message, item
+      @message = message
+      @got = item
+    end
+
+    def forget
+      @message = nil
+      @got = nil
+    end
+
     def match? item
     end
   end

data/lib/rsmp/collect/state_collector.rb

@@ -61,7 +61,7 @@ module RSMP
 
     # Get messages from results
     def messages
-      @queries.map { |query| query.message }.uniq
+      @queries.map { |query| query.message }.uniq.compact
     end
 
     # Return progress as completes queries vs. total number of queries
@@ -90,22 +90,33 @@ module RSMP
     # Check if a messages matches our criteria.
     # Match each query against each item in the message
     def perform_match message
-      return unless type_match?(message)
+      return false if super(message) == false
+      return unless collecting?
       @queries.each do |query|       # look through queries
         get_items(message).each do |item|  # look through items in message
-          matched = query.perform_match(item,message)
-          if matched == true
-            matched = @block.call(message,item) if @block
-          end
+          matched = query.perform_match(item,message,@block)
+          return unless collecting?
           if matched != nil
             type = {true=>'match',false=>'mismatch'}[matched]
             @notifier.log "#{@title.capitalize} #{message.m_id_short} collect #{type} #{query.want}, item #{item}", level: :debug
-            break
+            if matched == true
+              query.keep message, item
+            elsif matched == false
+              query.forget
+            end
           end
         end
       end
       complete if done?
       @notifier.log "#{@title.capitalize} collect reached #{summary}", level: :debug
     end
+
+    # don't collect anything. Query will collect them instead
+    def keep message
+    end
+
+    def describe
+      @queries.map {|q| q.want.to_s }
+    end
   end
 end

data/lib/rsmp/collect/status_update_or_response_collector.rb

@@ -2,7 +2,7 @@ module RSMP
   # Base class for waiting for status updates or responses
   class StatusUpdateOrResponseCollector < StateCollector
     def initialize proxy, want, options={}
-      super proxy, want, options.merge
+      super proxy, want, options.merge(outgoing: false)
     end
 
     def build_query want
@@ -11,7 +11,7 @@ module RSMP
 
     # Get items, in our case status values
     def get_items message
-      message.attributes['sS']
+      message.attributes['sS'] || []
     end
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -282,7 +282,7 @@ module RSMP
     end
 
     def fetch_last_sent_status component, code, name
-      @last_status_sent.dig component, code, name
+      @last_status_sent.dig component, code, name if @last_status_sent
     end
 
     def store_last_sent_status message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/rsmp.rb

@@ -21,6 +21,7 @@ require 'rsmp/collect/notifier'
 require 'rsmp/collect/listener'
 require 'rsmp/collect/collector'
 require 'rsmp/collect/state_collector'
+require 'rsmp/collect/filter'
 require 'rsmp/collect/query'
 require 'rsmp/collect/status_query'
 require 'rsmp/collect/command_query'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -211,6 +211,7 @@ files:
 - lib/rsmp/collect/collector.rb
 - lib/rsmp/collect/command_query.rb
 - lib/rsmp/collect/command_response_collector.rb
+- lib/rsmp/collect/filter.rb
 - lib/rsmp/collect/listener.rb
 - lib/rsmp/collect/message_matchers.rb
 - lib/rsmp/collect/notifier.rb