cpee 2.1.48 → 2.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8c1c8a4054ec0936d19a7684030ed6bb751a2ddfd59efd2fd1428403ec9124
-  data.tar.gz: b54813a2d1f3f00157837ba221a0b8171b80349450dfd78a5f8757da7e92f3bb
+  metadata.gz: ae076f6c9e29ad07d9fde309d7d442c217f4f5e6dc7d53a1568539ac8ab355b5
+  data.tar.gz: 848076eca4541d65022199637c8b49a01a27072a05217e953b56b260e131bbf3
 SHA512:
-  metadata.gz: 9350a27caf326ef86d6241b26f1237cd80be325179d414b0bd44ca483a9c20c5e19d6c84879742e5353bbeea5c071adb4f029fdad849fbffcace2bd10c731115
-  data.tar.gz: d1a8de2949484f76bc4b59da67e7c7d71e43a5d11559a4193bfd049707f50c682c5e3f04e8550d4089ff6d1ca51ac5957884e93d05236e272eeffaca1f7e0c24
+  metadata.gz: 9fb987297935bf548bd59a0547bf11b1b4b2a333d7064d7b4e1b124ece5372384c39263550476d474cf1b255a58a2dfb59ce8858d4b15f5572b7277cccfd755c
+  data.tar.gz: c7ce6bcb5a7d798ea680c160941fd3d2a76c990ee7a32c9ee55da99eff9dc9f75c5073c05cf6b01066d6a05e7afa31e8a13717ffb32e4382e2e3bd8f91c622f7

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.48"
+  s.version          = "2.1.50"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of 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', '~> 0.126'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.111'
   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

@@ -132,7 +132,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     status = result = headers = nil
-    catch :no_mock do
+    begin
       tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
       type = $2 || parameters[:method] || 'post'
 
@@ -144,9 +144,16 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       status, result, headers = client.request type => params
       if status == 561
         @handler_endpoint = @handler_endpoint_orig
-        throw :no_mock
+        params.delete_if { |p| p.name == 'original_endpoint' }
+        params.each do |p|
+          if p.name == 'attributes'
+            t = JSON::parse(p.value) rescue {}
+            t['mock'] = @controller.attributes['mock']
+            p.value = t.to_json
+          end
+        end
       end
-    end
+    end while status == 561
 
     if status < 200 || status >= 300
       headers['CPEE_SALVAGE'] = true
@@ -273,12 +280,14 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
           result = result[0]
         end
       end
+    else
+      Riddl::Parameter::Array[*result]
     end
     if result.is_a? String
       enc = detect_encoding(result)
       enc == 'OTHER' ? result : (result.encode('UTF-8',enc) rescue convert_to_base64(result))
     else
-      Riddl::Parameter::Array[*result]
+      result
     end
   end
 
@@ -379,7 +388,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
   end #}}}
 
-  def test_condition(mr,code)
+  def test_condition(mr,code,args)
     res = mr.instance_eval(code,'Condition',1)
     @controller.notify("gateway/decide", :instance_uuid => @controller.uuid, :code => code, :condition => (res ? "true" : "false"))
     res

data/server/routing/end.pid

@@ -1 +1 @@
-383721
+1105683

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

@@ -1 +1 @@
-383730
+1105692

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-383727
+1105689

data/server/routing/persist.pid

@@ -1 +1 @@
-383724
+1105686

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.48
+  version: 2.1.50
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -35,7 +35,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.99
+        version: 1.99.111
   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.99
+        version: 1.99.111
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement