spstrigger_execute 0.4.10 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eea0f188d7b53d0c88ce65d6977121e19c7def29cea073333924750f84994e56
-  data.tar.gz: 6fbea2b50266897f0c7a7a53b18fea1772aa7a4a74b78b21cd7e627cf52541c3
+  metadata.gz: c9e2623d7c28470a080c0db5ae3b4e56bcb022875ef6a17f95a2d20aee88f97e
+  data.tar.gz: 6314c39efb6225437e01a21c6b29111c5b644b8258474a4f91795850960ee13a
 SHA512:
-  metadata.gz: e4d94da641beb9ee15019ec3cb80865051cfa964219cab93451d171c35a4ea4a5c6acad11ddd35248befcdecfda020f41153b5be141a98e6845d365c61d031d3
-  data.tar.gz: e9b2bf6b763558e174b47c726d3115223ffb33f5552915d8dfbbfc9760caea440272ee78f3f78aef5ac0789a6e3139393117b0606e662285b252943844961e7d
+  metadata.gz: 962243ccdd8f1a0e79b9979ee72b319a020931121d98b7bcaa5485915ecc030f3591b4df17dfbd9f5ec077b4cc574949c6890408b36d06e2e0a2940e7d9b4824
+  data.tar.gz: 9af7e7cf7ddca7a312db7e5014b2e85b9face23a1d0564f8ef336d4f0c29d09f70ed47caf4371892fe9106228a46a85a8c7f2b026ce8602077f3569c271393a2

data/lib/spstrigger_execute.rb

@@ -5,51 +5,51 @@
 require 'dynarex'
 require 'chronic_between'
 require 'xmlregistry_objects'
+require 'rxfreader'
 
 
 class SPSTriggerExecute
 
   def initialize(x, reg=nil, polyrexdoc=nil, rws=nil, log: nil)
-    
+
     log.info 'SPSTriggerExecute/initialize: active' if log
-    
+
     @rws, @log = rws, log
-    
+
     @patterns = if x.is_a? Dynarex then
-    
+
       x.to_h
-      
+
     elsif x.is_a? Array
       x
     else
-      
-      buffer, _ = RXFHelper.read x, auto: false
+
+      buffer, _ = RXFReader.read x
       dx = buffer[/^<\?dynarex /] ? Dynarex.new.import(buffer) : \
           Dynarex.new(buffer)
       dx.to_a
-      
-    end    
-    
-    
-    
+
+    end
+
     if reg and polyrexdoc then
-      log.info 'SPSTriggerExecute/initialize: before reg' if log      
+      log.info 'SPSTriggerExecute/initialize: before reg' if log
       puts 'reg: ' + reg.inspect
       xro = XMLRegistryObjects.new(reg, polyrexdoc, log: log)
-      log.info 'SPSTriggerExecute/initialize: after reg' if log      
-      @h = xro.to_h      
-      define_methods = @h.keys.map {|x| "def #{x}() @h[:#{x}] end"}      
-      instance_eval define_methods.join("\n")      
-      
+      log.info 'SPSTriggerExecute/initialize: after reg' if log
+      @h = xro.to_h
+      define_methods = @h.keys.map {|x| "def #{x}() @h[:#{x}] end"}
+      instance_eval define_methods.join("\n")
+
       if log then
-        log.info 'SPSTriggerExecute/initialize: define_methods : ' + 
+        log.info 'SPSTriggerExecute/initialize: define_methods : ' +
             self.public_methods.sort.inspect
       end
     end
 
   end
 
-  def match_and_execute(topic: nil, message: message)
+  def match_and_execute(topicx=nil, messagex=nil, topic: topicx,
+                        message: messagex)
 
     @log.info 'SPSTriggerExecute/match_and_execute: active' if @log
     results = find_match topic, message
@@ -57,31 +57,31 @@ class SPSTriggerExecute
   end
 
   alias mae match_and_execute
-  
+
   def run(s)
     instance_eval s
   end
-    
+
 
   private
 
   def find_match(topicx=nil, message)
-    
-    
+
+
     @patterns.map.with_index.inject([]) do |r, row|
 
       h, i = row
 
       topic, msg,  conditions, job = \
                       %i(topic msg conditions job).map {|x| h[x].to_s }
-      
+
       index ||= i + 1
-      
+
       # note: the index is only present if there is a duplicate
       #       Dynarex record default key
 
       t, m = topic.length > 0, msg.length > 0
-      
+
       result = if topicx && t && m then
 
         r1 = topicx.match(/#{topic}/)
@@ -96,89 +96,98 @@ class SPSTriggerExecute
 
       elsif m then
 
-        r2 = message.match(/#{msg}/)      
+        r2 = message.match(/#{msg}/)
         {msg: r2, index: index} if r2
       else
         {}
-      end      
+      end
 
       if result and conditions.length > 0 then
-        
+
         if @log then
-          @log.info 'SPSTriggerExecute/find_match: conditions: ' + 
+          @log.info 'SPSTriggerExecute/find_match: conditions: ' +
               conditions.inspect
         end
 
         named_match = message.match(/#{msg}/)
-        
+
         variable_assignment = if named_match then
-                  
+
           named_match.names.inject('') do |rs, name|
 
             m = msg =~ /\?<#{name}\>\\d+/ ? 'to_i' : 'to_s'
-            rs << "#{name} = named_match[:#{name}].#{m}\n"            
+            rs << "#{name} = named_match[:#{name}].#{m}\n"
           end
-          
-        else ''  
+
+        else ''
         end
 
 
         success = eval (variable_assignment + conditions)
 
         if @log then
-          @log.info 'SPSTriggerExecute/find_match: success : '  + 
+          @log.info 'SPSTriggerExecute/find_match: success : '  +
               success.inspect
         end
-        
+
         result = nil unless success
       end
 
       result ? r << result : r
-    
+
     end
   end
 
-  
+
   # not yet implemented
-=begin  
+=begin
   def method_missing(method_name, *args)
 
     job = args.shift
     # Rsc object call goes here
     @log.debug 'package: ' + package.inspect
     @rws.run_job package=method_name, job, {}, args
-  end  
-=end  
-  
+  end
+=end
+
   def prepare_jobs(results)
-    
+
     @log.info 'SPSTriggerExecute/prepare_jobs: active' if @log
 
     results.inject([]) do |r,h|
-      
+
       if @log then
-        @log.info 'SPSTriggerExecute/prepare_jobs: inside inject h: ' + 
-            h.inspect 
+        @log.info 'SPSTriggerExecute/prepare_jobs: inside inject h: ' +
+            h.inspect
       end
 
       a = []
       a += h[:topic].captures if h[:topic] && h[:topic].captures.any?
       a += h[:msg].captures if h[:msg]
-      
+
+      params = {}
+      params.merge!(h[:topic].named_captures) if h[:topic]
+      params.merge!(h[:msg].named_captures) if h[:msg]
+
       jobs = @patterns[h[:index].to_i - 1][:job]
-      
-      
+
+
       jobs.split(/\s*;\s*/).each do |job|
 
         job_args = job.split + a
-        
+
         if job[/^\/\//] then
 
-          r << [:rse, job_args]
-          
+          r << [:rse, job_args, params]
+
+
+        elsif job[/^rse:\/\//]
+
+          r << [:rse_uri, job]
+
         elsif job[/^[$\w\/]+:/]
 
-          topic_message = job.gsub(/\$\d/) do |x| 
+          topic_message = job.gsub(/\$\d/) do |x|
 
             i = x[/\d$/].to_i - 1
             x.sub(/\$\d/, a[i].to_s)
@@ -186,33 +195,33 @@ class SPSTriggerExecute
 
           topic_message = topic_message\
             .gsub(/![Tt]ime/,Time.now.strftime("%a %H:%M%P"))\
-            .gsub(/![Dd]ate/,Time.now.strftime("%d %b"))        
+            .gsub(/![Dd]ate/,Time.now.strftime("%d %b"))
+
 
-          
-          r << [:sps, topic_message]          
+          r << [:sps, topic_message]
         else
-          
-          statement = job.gsub(/\$\d/) do |x| 
+
+          statement = job.gsub(/\$\d/) do |x|
             i = x[/\d$/].to_i - 1
             x.sub(/\$\d/, a[i].to_s)
           end
-          
+
           r << [:ste, statement]
-          
+
         end
       end
-      
+
       @log.info 'SPSTriggerExecute/prepare_jobs: result: '  if @log
-      
-      r  
-      
+
+      r
+
     end
   end
 
   def time()
 
     t = Time.now
-    
+
     def t.within?(times)
       ChronicBetween.new(times).within? Time.now
     end
@@ -223,9 +232,9 @@ class SPSTriggerExecute
 
     def t.<(x)
       x.is_a?(String) ? self < Chronic.parse(x) : super(x)
-    end    
+    end
 
     t
   end
-    
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spstrigger_execute
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MTAyOTEwMjIwM1oXDTE4MTAyOTEwMjIwM1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALdpz4D9ctI58pEE/7Web5ATNz9Iz5wRTDyWPZXLK2ND5LBWib5zaBBBiV1q
-  RBDH7sqkmUpPTUFcqx9cDHpArcqomCHd9q40muLlYjaUvFfxmDBJIBX7qoY0HdEm
-  e5cQRhdH/KeLPnYrVeI1Thp+hr2FjRYboLXh+/z8iFUiCO3gLZcPhnHR2ovWYqYF
-  ZgEGgVrngikLKrQ2cASQj7QU/SjJlQpS/WDEB5MEKKnu6xmA561uzHYcu9fVWyvD
-  YvFkQjtscHw5u7vPPYTEqiUb8UruRnBYfLp8lnnLIIwEEZcLYXvksV2LstE4gLaN
-  O576yhzgipq30mfIEE9V3LMsYPMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUwV3xbv465FPDt+UUsUZoA8eSTeswJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEANq0T/0Wo
-  vWGM1aDHmvxq0bmOn7BBtXCODQY410+OWlne1smLJfEKhW9lcyPW7KW5WiSt+HRD
-  mtL30aH2fOBx26IvnjIQeZgQrDZEicM58ZWtWU1EqUHNc7z/+YFXk693iDp2cCt4
-  tCKOGXHyYQfEdfa7B5jhUthtWyMQnvIX2k3gTEB1keesGCvKxFDdh6pSBXpgge2T
-  FBo7GZfN5O1E1SqOqPCgwGBZwF9C46Iu2HXroM9vxhNgT2N893mWYlNmmDxB6VFD
-  Fb4PX9Gy1KygSUYIf5FBCAghq1QMa/KLXbYAar3QWRmU/0Uke/W3lSJt9OuQNJlF
-  na7EIuI+Z46Jhw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTA0NzE1WhcN
+  MjMwMjIzMTA0NzE1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC+4XPH
+  9FRtD3RhUUJIPj2LpnAkre+W29nVImFxhnZKerccXsJUOkLpaN66NPsRAUzmCSo/
+  raGXDb86cFOTww3+IBacxmHyJPYf52YcHAr8l+TmWa405LKtNtTzYEy8T4x1pklI
+  tJtTZz42KfdoWJEeYYWSxBhzT7Rq8k3xuy48sze+epy2o6muxuC1xfYJRL5LhKau
+  v76h/2UL4HusFaPuFL/oIJfhi2wAYB5naUwtgFJ2BUaro3M9//ZK7D9jtbNDVXVX
+  WMHFZL1doect1DjMvDAsOJs+322893NMArQAoBgsYNTZ24OmoSxBLI2PgVJCzZYx
+  1oJ1for6Tg4xauyJ4XivHpA9OeozL7WQeAxcbOSbQyJ3fFC/Qf7VD/JsxZgJYLzA
+  GJf0v/3Q2I+M7k7MIvMb4Nm8y/h6Ue8TeIZ5TUYgW+DyheVugcCsMGgKEIoIaQNp
+  +/ycgf4pDZWNXo7g8j07izQjAntx7puC5eOEsXPHp50IsAR3J3fY9gp3bBsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5XsTfIel
+  Geu3LvSXZ5DRdspxp+QwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEABQ3TeaY6kPDrK31jM+beTnexZ0GRXnHk8d2w05Lk
+  Dtus0Ll6kdJANnG3w+DA8/4/NbyZykCHJ0IFRNJxQk1K/A2l2Ejp56x/byB77bUS
+  MtiTlPceZMzofC6P0Jw4YmATkitddFSDzbWk7SJBzh7ES1ZU7akiMxg5a1zgVdMi
+  3qJC24Kepyrrdjw/LNbwQStp+Wi0vn0SLtlGcwEUK+GX9sgnlFM7DACmFLa+Q07v
+  VMMWMT++elvuzJWh8nzyoC61wFHNv7VuFS3JLS628/fvcaJSv/14kCVxXNvXnB+0
+  pXBBvWBPrM0AbZd/BcMhjQOU4gFBwTZYQPNTIYuxY5+qeSklhlHOxxqjLZ80FNIW
+  mwE7uxev8HERyFxkyylLiD9Rn0BbWPdpvxdMR/ERf/KjoRJt+YHtqRcfHlDI7WYd
+  kcanouQmEubFZ26md+j9mhOx9r117kQmXW19FYMG7BO9KiM1WxGVGt02zAF1OLwF
+  yBsqw3zhA/dhp5I6skt1EWsm
   -----END CERTIFICATE-----
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,62 +43,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.6
 - !ruby/object:Gem::Dependency
   name: chronic_between
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: xmlregistry_objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: An SPS client built for reponding to messages which match keywords and conditions.