spstrigger_execute 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8ff58b7f36b70e8c1f169369a6cd8a8ef89a63d
-  data.tar.gz: bc399399205429818912b5109db59ff53af1f950
+  metadata.gz: 54733c7cf3c98b166c5f9f95c063b3f1169c2261
+  data.tar.gz: f6fd39b7143d0a2061e88f1c51a0eb57064483be
 SHA512:
-  metadata.gz: 9b6021e2e6d046e7bf00866de995f1b965702cfd1057e04d8580857d3adca1ac85dfc152a6d33228f860c0b6cf8ec9f0b68931b2ce3892e590ec6989aceb5bbe
-  data.tar.gz: ce4e31aa1e4d49ce93fb7b0f948570bc44a56f8b9def5617b8a855ff908161f88cf3c4c9af1b0a871fcdf35fa3d1b2bed9fa5f0a1608d32f2d33b93ba56683d9
+  metadata.gz: ee4eb71de594b313107b3a651083520bbd16422228e6d1cd20f7380fd22e945ccd76f4ab4274e5407d238b62d2f6ddabe95a200eb9c52b65be089239d483f5f2
+  data.tar.gz: 5c7fd03fdd574fbd138ed9469f74062d041dfa85eab572f387888a10cff0496c0df787a1670f672b2057405d73a5e617b5f779e2e8ffe0e23047358dcf74b8b7

data.tar.gz.sig

@@ -1 +1,2 @@
-N%_l�'�TS�����
\�\�w���5��_�/G��Ǧ��I�A��/�!qw|�5 /�W�����KX�%�7<�#��� �]SxOI=:5�����\�x���*��X����[��+��y����_�ڵEe�tY�W�Mx9�A��ߜ
+	ˌ��ë"����&B�b0c������M0����a�!�>���O��� �#�V��������1%���$K�B������)x���B	b��4h����d~��4X�
+q�ϱ�G��9%�K�D�'Ӊ�@]����j4~7q���g�P-��?Ŀ�74�G�}�x��G��~x�o���L�

data/lib/spstrigger_execute.rb

@@ -9,10 +9,11 @@ require 'xmlregistry_objects'
 
 class SPSTriggerExecute
 
-  def initialize(x, reg=nil, polyrexdoc=nil, rws=nil, logfile: nil)
+  def initialize(x, reg=nil, polyrexdoc=nil, rws=nil, log: nil)
     
-    @log = Logger.new logfile,'daily' if logfile
-    @rws = rws
+    log.info 'SPSTriggerExecute/initialize: active' if log
+    
+    @rws, @log = rws, log
     
     @patterns = if x.is_a? Dynarex then
     
@@ -23,24 +24,35 @@ class SPSTriggerExecute
     else
       
       buffer, _ = RXFHelper.read x
-      dx = buffer[/^<\?dynarex /] ? Dynarex.new.import(buffer) :  Dynarex.new(buffer)
+      dx = buffer[/^<\?dynarex /] ? Dynarex.new.import(buffer) : \
+          Dynarex.new(buffer)
       dx.to_h
       
     end    
-
+    
+    
+    
     if reg and polyrexdoc then
-          
-      xro = XMLRegistryObjects.new(reg, polyrexdoc)
+      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 'define_methods : ' + self.public_methods.sort.inspect
+      
+      if log then
+        log.info 'SPSTriggerExecute/initialize: define_methods : ' + 
+            self.public_methods.sort.inspect
+      end
     end
 
   end
 
-  def match_and_execute(topicx, message)
-    results = find_match topicx, message
+  def match_and_execute(topic: nil, message: message)
+
+    @log.info 'SPSTriggerExecute/match_and_execute: active' if @log
+    results = find_match topic, message
     prepare_jobs(results)
   end
 
@@ -53,8 +65,9 @@ class SPSTriggerExecute
 
   private
 
-  def find_match(topicx, message)
-
+  def find_match(topicx=nil, message)
+    
+    
     @patterns.map.with_index.inject([]) do |r, row|
 
       h, i = row
@@ -64,18 +77,19 @@ class SPSTriggerExecute
       
       index ||= i + 1
       
-      # note: the index is only present if there is a duplicate Dynarex record default key
+      # 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 t && m then
+      result = if topicx && t && m then
 
         r1 = topicx.match(/#{topic}/)
         r2 = message.match(/#{msg}/)
 
         {topic: r1, msg: r2, index: index} if r1 && r2
 
-      elsif t then
+      elsif topicx && t then
 
         r1 = topicx.match(/#{topic}/)
         {topic: r1, index: index} if r1
@@ -90,7 +104,10 @@ class SPSTriggerExecute
 
       if result and conditions.length > 0 then
         
-        log 'conditions: ' + conditions.inspect
+        if @log then
+          @log.info 'SPSTriggerExecute/find_match: conditions: ' + 
+              conditions.inspect
+        end
 
         named_match = message.match(/#{msg}/)
         
@@ -105,9 +122,14 @@ class SPSTriggerExecute
         else ''  
         end
 
+
         success = eval (variable_assignment + conditions)
 
-        log 'success : '  + success.inspect
+        if @log then
+          @log.info 'SPSTriggerExecute/find_match: success : '  + 
+              success.inspect
+        end
+        
         result = nil unless success
       end
 
@@ -116,30 +138,36 @@ class SPSTriggerExecute
     end
   end
 
-  def log(s)
-    if @log then
-      @logger.debug s
-    end
-  end
   
   # not yet implemented
+=begin  
   def method_missing(method_name, *args)
-    puts 'method_missing called'
+
     job = args.shift
     # Rsc object call goes here
+    @log.debug 'package: ' + package.inspect
     @rws.run_job package=method_name, job, {}, args
   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 
+      end
 
       a = []
       a += h[:topic].captures if h[:topic] && h[:topic].captures.any?
       a += h[:msg].captures if h[:msg]
       
       jobs = @patterns[h[:index].to_i - 1][:job]
-
+      
+      
       jobs.split(/\s*;\s*/).each do |job|
 
         job_args = job.split + a
@@ -173,7 +201,9 @@ class SPSTriggerExecute
           
         end
       end
-
+      
+      @log.info 'SPSTriggerExecute/prepare_jobs: result: '  if @log
+      
       r  
       
     end
@@ -190,4 +220,4 @@ class SPSTriggerExecute
     t
   end
     
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spstrigger_execute
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDMwNTIxMDc0NVoXDTE2MDMwNDIxMDc0NVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MTAyOTEwMjIwM1oXDTE4MTAyOTEwMjIwM1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN3D6qgdl+y/qXzkh1+Vs3u0n9GFNFFfzrCJwd4x6oLw3y4fHtWjzeRSQAFY
-  S6+nDhJulKcknrONQsSRLvaXieumzHBqDT7i/HlaHcfrgg2umM6FU2W2cc3SMBk4
-  WrwpzpNmLyFS9l9d2yb/4xOITi0MWuM//nU3W6fqJwG3BL4GpTPPiciJwsepw42c
-  IZouaE9Hl/XYGr3nmF+/drw6p5HcwzvuLNg3A/8w7QHLu5KQpYc2cQCrZJfjhffH
-  xQXoZpNgAGpMlcJdAf+cfAcWKyYPqG07cB3EbSGfEHTV/ot307fy5+wz6KvgWZ96
-  Psy0YVqekzT0lQ7+Td9qInZH2fcCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUVzyskHXE++QnigVA9MhVWnxVTGEwJgYDVR0RBB8w
+  ggEBALdpz4D9ctI58pEE/7Web5ATNz9Iz5wRTDyWPZXLK2ND5LBWib5zaBBBiV1q
+  RBDH7sqkmUpPTUFcqx9cDHpArcqomCHd9q40muLlYjaUvFfxmDBJIBX7qoY0HdEm
+  e5cQRhdH/KeLPnYrVeI1Thp+hr2FjRYboLXh+/z8iFUiCO3gLZcPhnHR2ovWYqYF
+  ZgEGgVrngikLKrQ2cASQj7QU/SjJlQpS/WDEB5MEKKnu6xmA561uzHYcu9fVWyvD
+  YvFkQjtscHw5u7vPPYTEqiUb8UruRnBYfLp8lnnLIIwEEZcLYXvksV2LstE4gLaN
+  O576yhzgipq30mfIEE9V3LMsYPMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUwV3xbv465FPDt+UUsUZoA8eSTeswJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEADBNEPtB4
-  Inogq8wKBtu3KBbKrE/yvnbk7hsRE11mlRiQOiKZDqsw8/Y9D/yRSH4dY3Gq3xQY
-  W2XxMR0okW/bPfSq3IU/gjukc6yqI7A3rU4F7+idbHIhiHLhtS6oaaCFCwIWT8nU
-  YpibuWDr8aRAOfhsU0kLOJbJgSetnWBqOaxGXD17OtmQUkK9iMTbdxRotRXauHWb
-  flYpNYm4CG+D4ZdG69glQaJLQ/qBbtLVwwnrsmVyEeWMIKCws0ttVzM1PO54I83p
-  rlSMrvljzPJPts27UIPIfU02mkTZzELneWPUEQlIK/ADjdiGu2uxlWT5g77gwM+g
-  fYtWdC+NEqa0rg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEANq0T/0Wo
+  vWGM1aDHmvxq0bmOn7BBtXCODQY410+OWlne1smLJfEKhW9lcyPW7KW5WiSt+HRD
+  mtL30aH2fOBx26IvnjIQeZgQrDZEicM58ZWtWU1EqUHNc7z/+YFXk693iDp2cCt4
+  tCKOGXHyYQfEdfa7B5jhUthtWyMQnvIX2k3gTEB1keesGCvKxFDdh6pSBXpgge2T
+  FBo7GZfN5O1E1SqOqPCgwGBZwF9C46Iu2HXroM9vxhNgT2N893mWYlNmmDxB6VFD
+  Fb4PX9Gy1KygSUYIf5FBCAghq1QMa/KLXbYAar3QWRmU/0Uke/W3lSJt9OuQNJlF
+  na7EIuI+Z46Jhw==
   -----END CERTIFICATE-----
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.12
+        version: 1.7.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.12
+        version: 1.7.26
 - !ruby/object:Gem::Dependency
   name: chronic_between
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,29 +72,29 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: xmlregistry_objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.7.4
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An SPS client built for reponding to messages which match keywords and conditions.