cpee 2.1.108 → 2.1.109

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 360f0ae54376a01dc9d31257fcf9de7ece89f12837be7e26a7000a221025de66
-  data.tar.gz: e897607c38bd2ea67c1fe637ff5c88fc4cf2387ba61cbdbbcc90259ec9be6ebd
+  metadata.gz: cb5004fe53cd5de27b756835cde118bc7eb7f0a8231478d544bd84e1c5ff6408
+  data.tar.gz: f4940048028217a3d0a21efbe06a76a081792f02e5010a13591908af83732ab2
 SHA512:
-  metadata.gz: 95f6e48d23fe7208dce29d7bbda4dc0e4dd330acd9e91db58bb56872fa695e78a3fac56cce6dc0d14b433df320e4f17a95cb6d7c2aa63e6b27debfb6739e7ee5
-  data.tar.gz: 43d9d9fe7a048f973c59b40e8ff3938690862e74d3a5b96be72bd4c0c74f558cb313865fbca2e0d24ae1631a32c1be0d5c9fc95867d7571d05c7a18cb63d11c4
+  metadata.gz: 1d8381762bccbeeb16254c8b26b754b8f369a17d16d323b594cf6d8f04ecebfd43a600764d2babeb26b7663a11c9c39abd2a82d05e352817693c0d063c8f4cf1
+  data.tar.gz: 70c84b57562d54acf06d4d3567b8ec99b3f2c5648bc137d07b0109f7124f1a6a340db42b9491fe380cf02f6329a4ea3f9cf025cb46263d0fb57f75f4b9194c05

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.108"
+  s.version          = "2.1.109"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/server/executionhandlers/eval/connection.rb

@@ -329,6 +329,24 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
+  def argument_transform_value(obj, struct)
+    return nil unless obj.is_a?(Array) || obj.is_a?(Hash) || obj.is_a?(WEEL::ProcString)
+    case obj
+      when Hash
+        obj.each { |k, v| ret = argument_transform_value(v, struct); obj[k] = ret unless ret.nil? }
+        nil
+      when Array
+        obj.each_with_index { |v,i| ret = argument_transform_value(v, struct); obj[i] = ret unless ret.nil?  }
+        nil
+      when WEEL::ProcString
+        argument_eval obj.code, struct
+    end
+  end
+
+  def argument_eval(__code,__struct)
+    __struct.instance_eval __code, 'Parameter', 1
+  end
+
   def prepare(__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__exec_endpoints,__exec_parameters) #{{{
     __struct = if __code
       manipulate(true,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,'Parameter')
@@ -345,7 +363,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     __params[:arguments]&.map! do |__ele|
       __tmp = __ele.dup
       if __tmp.value.is_a?(WEEL::ProcString)
-        __tmp.value = __struct.instance_eval __tmp.value.code, 'Parameter', 1
+        __tmp.value = argument_eval(__tmp.value.code, __struct)
+      elsif __tmp.value.is_a?(Array) || __tmp.value.is_a?(Hash)
+        argument_transform_value __tmp.value, __struct
       end
       __tmp
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.108
+  version: 2.1.109
 platform: ruby
 authors:
 - Juergen eTM Mangler