spstrigger_execute 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d9f6b1af239118b474670dc39eadd4dea20b808
-  data.tar.gz: bcc1f1f2dd28e7abc4ecd2fd92b2fbcda41ec8ff
+  metadata.gz: d41cf99bc89ef502b8ee404ffbc098af07c4cbf6
+  data.tar.gz: aa0f1e47615b4c153c97332eaece7a94decf9825
 SHA512:
-  metadata.gz: 2456fcf67ee096420d72fe7c308f34f2269d18d5a92ca5c8e9180169efc5afdc4978c3876f9ee0d29ede056cb50e9107ef1709ec1fd6a76992eea6aba36f22e2
-  data.tar.gz: 2e4961effb5dbb80db55baef7003188d5e0186376b979f4e8bf0b920a3c6a73a026c6253bb8c15dc690cf93c6deb1e8b7dcf06639565e4104da04f6e27cfbb9f
+  metadata.gz: d9708ff098ebeeb37bf8f3ddbdcaf7fa4cd85b3db998fbbbf6835175501baf88bf93d127938a1a6e9fc73ab829f91e8ba2d0877eb850d9acc8b249e6bf816cd5
+  data.tar.gz: cac985125350c2f4c649e8aee1a70407fb9532fcfa543cd6edb2476160ead891315b4003140b34d1e0274353562a830a83688c27adeec804d092421a19e2ec2b

data/lib/spstrigger_execute.rb

@@ -19,14 +19,12 @@ class SPSTriggerExecute
     else
       
       buffer, _ = RXFHelper.read x
-      puts 'buffer : ' + buffer.inspect
       buffer[/^<\?dynarex /] ? Dynarex.new.import(buffer) :  Dynarex.new(buffer)
       
     end
     
     @patterns = dx.to_h
-    puts '@patterns : ' + @patterns.inspect
-        
+
     if reg and polyrexdoc then
           
       xro = XMLRegistryObjects.new(reg, polyrexdoc)
@@ -89,7 +87,21 @@ class SPSTriggerExecute
       if result and conditions.length > 0 then
         
         log 'conditions: ' + conditions.inspect
-        success = eval conditions
+
+        named_match = message.match(/#{msg}/)
+        
+        variable_assignment = if named_match then
+                  
+          named_match.names.inject('') do |r, name|
+
+            m = msg =~ /\?<#{name}\>\\d+/ ? 'to_i' : 'to_s'
+            r << "#{name} = named_match[:#{name}].#{m}\n"            
+          end
+          
+        else ''  
+        end
+
+        success = eval (variable_assignment + conditions)
         log 'success : '  + success.inspect
         result = nil unless success
       end
@@ -113,14 +125,10 @@ class SPSTriggerExecute
       a += h[:topic].captures if h[:topic] && h[:topic].captures.any?
       a += h[:msg].captures if h[:msg]
       
-      puts 'row :  ' + @patterns[h[:index].to_i - 1].inspect
       jobs = @patterns[h[:index].to_i - 1][:job]
-      puts 'jobs : ' + jobs.inspect
 
       jobs.split(/\s*;\s*/).each do |job|
 
-        
-        puts 'job : ' + job.inspect
         job_args = job.split + a
         
         if job[/^\/\//] then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spstrigger_execute
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   rlSMrvljzPJPts27UIPIfU02mkTZzELneWPUEQlIK/ADjdiGu2uxlWT5g77gwM+g
   fYtWdC+NEqa0rg==
   -----END CERTIFICATE-----
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex