cpee 2.1.64 → 2.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d5e5c7b5da8458c5a7e2101d018337ba353c6a5d5e3fe5e359456aba9693f02
-  data.tar.gz: f74517ec8299ce372750c0d4e6cce29d678ae328a96942cac80c3e86d73f9a1b
+  metadata.gz: 052d8f4e613153998b5712cadd2204756c242376b4b037e2cb9b8a3a1542116c
+  data.tar.gz: 538940981be635be63e6d0790a5f3bac6bbd855a47b2acfc0fc96ddc26dde6d6
 SHA512:
-  metadata.gz: 2a382615beced6f3af27bee42068b8000d22bc1d9694351659d97b7013ac11b6c8ab34bcadb29789b3f8f46d29b1e19a9f380903f7a04bf19a03c10b70557a96
-  data.tar.gz: 003f97f1487e72749878bf00e34c1d557da3381b325879e3575f2b690584baf65a0b81c0e57490345e289a6c42108a319761bf5a5ec38ce796665ed273fdcc5d
+  metadata.gz: 2dcba10b6275f5cf5f6a7a2fa32fee4439c807cd248e3d22e65ed1a28a9fe6f5c5a1d7f318742ea3154421cbf4dfafe3fd0d96973599339425c7ef1cae4c8d94
+  data.tar.gz: 961f0578ee2657dd785494c3a9d61a289a3a29302f2373ef592ab1f1109cd07704737b9035990820de5c042bed72384055c8a08d7facf95430755f5b7825febc

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.64"
+  s.version          = "2.1.66"
   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."
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.123'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.124'
   s.add_runtime_dependency 'highline', '~> 2.0'
   s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'

data/server/executionhandlers/ruby/connection.rb

@@ -319,13 +319,18 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def prepare(__struct, __endpoints, __parameters) #{{{
-    @handler_endpoint = __endpoints.is_a?(Array) ? __endpoints.map{ |ep| __struct.endpoints[ep] }.compact : __struct.endpoints[__endpoints]
+  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')
+    else
+      WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
+    end
+    @handler_endpoint = __exec_endpoints.is_a?(Array) ? __exec_endpoints.map{ |ep| __struct.endpoints[ep] }.compact : __struct.endpoints[__exec_endpoints]
     if @controller.attributes['twin_engine']
       @handler_endpoint_orig = @handler_endpoint
       @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
-    __params = __parameters.dup
+    __params = __exec_parameters.dup
     __params[:arguments] = __params[:arguments].dup if __params[:arguments]
     __params[:arguments]&.map! do |__ele|
       __tmp = __ele.dup
@@ -338,7 +343,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
   def test_condition(__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
     __struct = WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional).instance_eval(__code,'Condition',1)
-    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => (__struct ? "true" : "false"))
+    @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
     __struct
   end #}}}
   def manipulate(__readonly,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__where,__result=nil,__options=nil) #{{{

data/server/executionhandlers/rubyext/connection.rb

@@ -326,13 +326,18 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     GC.start
   end #}}}
 
-  def prepare(struct, endpoints, parameters) #{{{
-    @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| struct.endpoints[ep] }.compact : struct.endpoints[endpoints]
+  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')
+    else
+      WEEL::ReadStructure.new(data,endpoints,local,additional)
+    end
+    @handler_endpoint = exec_endpoints.is_a?(Array) ? exec_endpoints.map{ |ep| struct.endpoints[ep] }.compact : struct.endpoints[exec_endpoints]
     if @controller.attributes['twin_engine']
       @handler_endpoint_orig = @handler_endpoint
       @handler_endpoint = @controller.attributes['twin_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
-    params = parameters.dup
+    params = exec_parameters.dup
     params[:arguments] = params[:arguments].dup if params[:arguments]
     params[:arguments]&.map! do |ele|
       t = ele.dup
@@ -370,7 +375,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     else
       nil
     end
-    recv = 'false' unless receive
+    recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' ? false : true)
     @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => recv)
     recv

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.64
+  version: 2.1.66
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.123
+        version: 1.99.124
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.123
+        version: 1.99.124
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement