cpee 1.5.4 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835b66c60a3c5f973c652392a30147cd7158739b08275ce23f0dd623c56a8b05
-  data.tar.gz: cea467eab2cc1a6489ac0485cad08afdd2b87a7024e0787e3fa115af614ba324
+  metadata.gz: eaad30b7640b6c68b4acb529265f577e4a53a6fd034ebd11db4dc5eae34173fe
+  data.tar.gz: 7a3a4862bfd543268546d1385ec8d7b5ea7311b0fa4be84075b57890ff2c4bed
 SHA512:
-  metadata.gz: c1cc53575b713697d77aae2c90ccc1cc72b941a1cf1557f552bcff0fa59ed7582e6608b816456bdd1d19bfbcee645975df4b3fff99f066758003e56601bd0655
-  data.tar.gz: 9a1e8849b603b7e4f59c7b5e7ddf1b0bd546f4b9dfddef1e01ac1b4e32b8c334e52e332261346483d60782544d85c252d5cc857e0602ac2976a29ddc4ba6119d
+  metadata.gz: b247689d4132d5ba3814197ec51dcc2e5ba8fe950610417cf0be4616a11c3dc5fa35c8804e1a533fa9749dcc5f3d37741dbc610adb4043ed52c4a40cc78e588b
+  data.tar.gz: fdf0ceb72d630ff34fb9cdaf26d009317b8652aea51f2fe8a7a44306cfc04b14a45e377a635dbab17cab7f834e349f9817ca10ce6b11e20d27eda168c61fd25d

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.4"
+  s.version          = "1.5.6"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp 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.99'
-  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.76'
+  s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.78'
   s.add_runtime_dependency 'savon', '~> 2'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'json', '~>2.1'

data/server/handlerwrappers/default.rb

@@ -42,17 +42,22 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_position = position
     @handler_passthrough = nil
     @handler_returnValue = nil
+    @handler_returnOptions = nil
     @label = ''
   end # }}}
 
   def prepare(readonly, endpoints, parameters) #{{{
     @handler_endpoint = endpoints.is_a?(Array) ? endpoints.map{ |ep| readonly.endpoints[ep] }.compact : readonly.endpoints[endpoints]
-    parameters[:arguments]&.each do |ele|
-      if ele.value.is_a?(Proc)
-        ele.value = readonly.instance_exec &ele.value
+    params = parameters.dup
+    params[:arguments] = params[:arguments].dup if params[:arguments]
+    params[:arguments]&.map! do |ele|
+      t = ele.dup
+      if t.value.is_a?(Proc)
+        t.value = readonly.instance_exec &t.value
       end
+      t
     end
-    parameters
+    params
   end #}}}
 
   def activity_handle(passthrough, parameters) # {{{
@@ -105,9 +110,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
 
       status, result, headers = client.request type => params
       if status < 200 || status >= 300
+        headers['CPEE_SALVAGE'] = true
         c = result[0]&.value
         c = c.read if c.respond_to? :read
-        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], 'CPEE_SALVAGE' => true)
+        callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
       else
         if headers['CPEE_INSTANTIATION']
           @controller.notify("task/instantiation", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
@@ -118,7 +124,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
         elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
           # do nothing, later on things will happend
         else
-          callback result
+          callback result, headers
         end
       end
     else
@@ -133,6 +139,9 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def activity_result_value # {{{
     @handler_returnValue
   end # }}}
+  def activity_result_options # {{{
+    @handler_returnOptions
+  end # }}}
 
   def activity_stop # {{{
     unless @handler_passthrough.nil?
@@ -238,15 +247,15 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   def callback(result=nil,options={})
     @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
+    @handler_returnValue = result
+    @handler_returnOptions = options
     if options['CPEE_UPDATE']
-      @handler_returnValue = result
       if options['CPEE_UPDATE_STATUS']
         @controller.notify("activity/status", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
       end
       @handler_continue.continue WEEL::Signal::Again
     else
       @controller.callbacks.delete(@handler_passthrough)
-      @handler_returnValue = result
       @handler_passthrough = nil
       if options['CPEE_SALVAGE']
         @handler_continue.continue WEEL::Signal::Salvage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.6
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-10 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -36,7 +36,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.76
+        version: 1.99.78
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -46,7 +46,7 @@ dependencies:
         version: '1.99'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.99.76
+        version: 1.99.78
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement