cpee 2.1.119 → 2.1.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39d6640351bbed07ebe4e967a8b83d625e90cf26c23af8b5f56772408c982fd5
-  data.tar.gz: b1e0f77cfee4cd79623d29e6adf2530b65ae6bfb28533fad8404691c089f7f46
+  metadata.gz: 6bd002e776366ffd4053f69d04e34e88d6e17cede48668ddeec71dd0a8d423c1
+  data.tar.gz: f7141f31c96892dbd83146f6bfe56de06d620f2a1958282815f26db58575ea96
 SHA512:
-  metadata.gz: 33877d90270783fd4ff34ad76ce821314bb2cf6fd772afa3fff60d1d1926c49f48a51bd0746376b20ad5a678e7d449e70a9ba1df22249e99c8a8a3eb279a2c29
-  data.tar.gz: 1747c6805c4b8707860050a88d2562843076179e9736362bbc1ce888f14a0817eb0ba36be869f1836b9fea617aa31bcf318d7dceb11237ece96ca26151da27ee
+  metadata.gz: 92fe3afab3035858ff7be53198418be5364b50e10b39a294a662ddb285d241f12bbb8ac44ce3dca207862f841d73ae47ad6f9c209b5bea9979dfe74829c39da9
+  data.tar.gz: eae4fc2fc3cd2b4f9c206c0318198e9bd6295ea61b49366217b3c81a3c5426aebab5b4e6ea8d99af813d46cc2be7bfb42c65ad018245c556327b6033a924fd0c

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.119"
+  s.version          = "2.1.120"
   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."
@@ -33,4 +33,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'webrick', '~>1.7'
   s.add_runtime_dependency 'by', '~> 1.1', '>= 1.1.0'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.3', '>= 1.3.5'
 end

data/server/executionhandlers/eval/connection.rb

@@ -356,7 +356,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   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')
+      manipulate(true,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,'prepare')
     else
       WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
     end
@@ -381,7 +381,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def test_condition(__eid,__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
     __struct = WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional).instance_eval(__code,'Condition',1)
 
-    @controller.notify("gateway/decide", :eid => __eid, :instance_uuid => @controller.uuid, :code => __code, :condition => (__struct ? "true" : "false"))
+    __struct = 'false' unless __struct
+    __struct = (__struct == 'false' || __struct == 'null' || __struct == 'nil' || __struct == false ? false : true)
+
+    @controller.notify("gateway/decide", :eid => __eid, :instance_uuid => @controller.uuid, :code => __code, :condition => __struct)
     @controller.notify("gateway/annotation", :eid => __eid, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     __struct
   end #}}}

data/server/executionhandlers/eval/controller.rb

@@ -22,6 +22,7 @@ require 'cpee/attributes_helper'
 require 'cpee/message'
 require 'cpee/redis'
 require 'cpee/persistence'
+require 'get_process_mem'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -47,7 +48,6 @@ class Controller
     end
 
     @attributes_helper = AttributesHelper.new
-    @attributes_translated = @attributes_helper.translate(attributes,dataelements,endpoints)
     @thread = nil
     @opts = opts
     @instance = nil
@@ -99,12 +99,14 @@ class Controller
   attr_reader :id
   attr_reader :attributes
   attr_reader :loop_guard
-  attr_reader :attributes_translated
+
+  def attributes_translated
+    @attributes_translated || @attributes_translated = @attributes_helper.translate(attributes,dataelements,endpoints)
+  end
 
   def uuid
     @attributes['uuid']
   end
-
   def host
     @opts[:host]
   end

data/server/executionhandlers/ruby/connection.rb

@@ -372,79 +372,79 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
   end
 
-  def argument_eval(code,struct)
+  def argument_eval(__code,__struct)
     send = []
-    send.push Riddl::Parameter::Simple::new('code',code)
-    send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(struct.data))
-    send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(struct.local)) if struct.local
-    send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(struct.endpoints))
-    send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(struct.additional))
+    send.push Riddl::Parameter::Simple::new('code',__code)
+    send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(__struct.data))
+    send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(__struct.local)) if __struct.local
+    send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(__struct.endpoints))
+    send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(__struct.additional))
 
     status, ret, headers = Riddl::Client.new(@controller.url_code).request 'put' => send
     recv = if status >= 200 && status < 300
       ret.empty? ? nil : JSON::parse(ret[0].value.read)
     else
-      code_error_handling ret, 'Parameter ' + code
+      code_error_handling ret, 'Parameter ' + __code
     end
     recv
   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,'prepare')
+  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,'prepare')
     else
-      WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
+      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]
+    @handler_endpoint = __exec_endpoints.is_a?(Array) ? __exec_endpoints.map{ |ep| __struct.endpoints[ep] }.compact : __struct.endpoints[__exec_endpoints]
     if @controller.attributes['sim_engine']
       @handler_endpoint_orig = @handler_endpoint
       @handler_endpoint = @controller.attributes['sim_engine'].to_s + '?original_endpoint=' + Riddl::Protocols::Utils::escape(@handler_endpoint)
     end
-    params = exec_parameters.dup
-    params[:arguments] = params[:arguments].dup if params[:arguments]
-    params[:arguments]&.map! do |ele|
-      t = ele.dup
-      if t.value.is_a?(WEEL::ProcString)
-        t.value = argument_eval t.value.code, struct
-      elsif t.value.is_a?(Array) || t.value.is_a?(Hash)
-        argument_transform_value t.value, struct
+    __params = __exec_parameters.dup
+    __params[:arguments] = __params[:arguments].dup if __params[:arguments]
+    __params[:arguments]&.map! do |__ele|
+      __tmp = __ele.dup
+      if __tmp.value.is_a?(WEEL::ProcString)
+        __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
-      t
+      __tmp
     end
-    params
+    __params
   end #}}}
-  def test_condition(eid,dataelements,endpoints,local,additional,code,args={}) #{{{
+  def test_condition(__eid,__dataelements,__endpoints,__local,__additional,__code,__args={}) #{{{
     send = []
-    send.push Riddl::Parameter::Simple::new('code',code)
-    send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(dataelements))
-    send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(local)) if local
-    send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(endpoints))
-    send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(additional))
+    send.push Riddl::Parameter::Simple::new('code',__code)
+    send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(__dataelements))
+    send.push Riddl::Parameter::Complex::new('local','application/json', JSON::generate(__local)) if __local
+    send.push Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(__endpoints))
+    send.push Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(__additional))
 
     status, ret, headers = Riddl::Client.new(@controller.url_code).request 'put' => send
-    recv = if status >= 200 && status < 300
+    __struct = if status >= 200 && status < 300
       ret.empty? ? nil : JSON::parse(ret[0].value.read)
     else
       code_error_handling ret, 'Condition ' + code, WEEL::Signal::Error
     end
-    recv = 'false' unless recv
-    recv = (recv == 'false' || recv == 'null' || recv == 'nil' || recv == false ? false : true)
+    __struct = 'false' unless __struct
+    __struct = (__struct == 'false' || __struct == 'null' || __struct == 'nil' || __struct == false ? false : true)
 
-    @controller.notify("gateway/decide", :eid => eid, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
-    @controller.notify("gateway/annotation", :eid => eid, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
-    recv
+    @controller.notify("gateway/decide", :eid => __eid, :instance_uuid => @controller.uuid, :code => __code, :condition => __struct)
+    @controller.notify("gateway/annotation", :eid => __eid, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
+    __struct
   end #}}}
-  def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil) #{{{
-    lock.synchronize do
+  def manipulate(__readonly,__lock,__dataelements,__endpoints,__status,__local,__additional,__code,__where,__result=nil,__options=nil) #{{{
+    __lock.synchronize do
       send = []
-      send.push  Riddl::Parameter::Simple::new('code',code)
-      send.push  Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(dataelements))
-      send.push  Riddl::Parameter::Complex::new('local','application/json', JSON::generate(local)) if local
-      send.push  Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(endpoints))
-      send.push  Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(additional))
-      send.push  Riddl::Parameter::Complex::new('status','application/json', JSON::generate(status)) if status
-      send.push  Riddl::Parameter::Complex::new('call_result','application/json', JSON::generate(result))
-      send.push  Riddl::Parameter::Complex::new('call_headers','application/json', JSON::generate(options))
+      send.push  Riddl::Parameter::Simple::new('code',__code)
+      send.push  Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(__dataelements))
+      send.push  Riddl::Parameter::Complex::new('local','application/json', JSON::generate(__local)) if __local
+      send.push  Riddl::Parameter::Complex::new('endpoints','application/json', JSON::generate(__endpoints))
+      send.push  Riddl::Parameter::Complex::new('additional','application/json', JSON::generate(__additional))
+      send.push  Riddl::Parameter::Complex::new('status','application/json', JSON::generate(__status)) if __status
+      send.push  Riddl::Parameter::Complex::new('call_result','application/json', JSON::generate(__result))
+      send.push  Riddl::Parameter::Complex::new('call_headers','application/json', JSON::generate(__options))
 
       stat, ret, headers = Riddl::Client.new(@controller.url_code).request 'put' => send
 
@@ -457,16 +457,16 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         changed_endpoints = JSON::parse(ret.shift.value.read) if ret.any? && ret[0].name == 'changed_endpoints'
         changed_status = JSON::parse(ret.shift.value.read) if ret.any? && ret[0].name == 'changed_status'
 
-        struct = if readonly
-          WEEL::ReadStructure.new(dataelements,endpoints,local,additional)
+        __struct = if __readonly
+          WEEL::ReadStructure.new(__dataelements,__endpoints,__local,__additional)
         else
-          WEEL::ManipulateStructure.new(dataelements, endpoints, status, local, additional)
+          WEEL::ManipulateStructure.new(__dataelements, __endpoints, __status, __local, __additional)
         end
-        struct.update(changed_dataelements,changed_endpoints,changed_status)
+        __struct.update(changed_dataelements,changed_endpoints,changed_status)
 
-        struct
+        __struct
       else
-        code_error_handling ret, where
+        code_error_handling ret, __where
       end
     end
   end #}}}

data/server/routing/end.pid

@@ -1 +1 @@
-1672922
+2029031

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-1672940
+2029049

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-1672934
+2029043

data/server/routing/persist.pid

@@ -1 +1 @@
-1672928
+2029037

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.119
+  version: 2.1.120
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -191,6 +191,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables: