weel 1.99.77 → 1.99.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5703894ec21b4ed491f3cc7da6ca0e4db0d7e8524b1af3d3b6be84c8f54bcc
-  data.tar.gz: '0958b8ab64692f7fab4496fc88f572461fc6f53a4d83e5e21ca9919db685940e'
+  metadata.gz: 7ba66fd2448bc777292487140faac23d6f0fd00a264953dff4b16e302a6a9344
+  data.tar.gz: 93a76802212618b1e5fb20dd29475ee671a2d5d53bc7595655b9a8d751332765
 SHA512:
-  metadata.gz: 75d51aaf2ce50bf9eedb4c7454bce2ad5b9da95868b2c7616509a8e265fdb8185f0f8dc68a0d8768fda685f392e863ccb6eb3a0ee18dbd36e68f9884d114cfe4
-  data.tar.gz: 7798fc30a7a05af902462ba5daf3243c66dd28fd12897d3e199fe3b8430a6141f6c73fd5eb5470063620884529e43d375d4e12d203baa278e4ae15945878aaa7
+  metadata.gz: 6a8773185c37a30e34a6f8712cd9c7ad41bd44f6a76bb99e7ab41839448846c1b8a3a4a1285700c913b6a5a2b169b4fe3e38be2e688fc3e42cd08e3dea9b41c6
+  data.tar.gz: 243c9322426d3db3ee97d9e78cf9dd5f9221dab1c7206ce49a983406acf59bcc3f6275a4d95177d4ea9aa70d440a841ad1d8ff1d052fc52849daa65ec9431a75

data/lib/weel.rb

@@ -243,7 +243,7 @@ end # }}}
     def callback(result=nil,options={}); end
 
     def test_condition(mr,code); mr.instance_eval(code); end
-    def manipulate(mr,code,result=nil); mr.instance_eval(code); end
+    def manipulate(mr,code,result=nil,options=nil); mr.instance_eval(code); end
   end  # }}}
 
   class Position # {{{
@@ -706,104 +706,94 @@ end # }}}
               @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
             end
           when :call
-            params = { }
-            case parameters
-              when Hash
-                parameters.each do |k,p|
-                  if p.is_a?(Symbol) && @__weel_data.include?(p)
-                    params[k] = @__weel_data[p]
-                  else
-                    params[k] = p
+            begin
+              again = catch Signal::Again do
+                rs = ReadStructure.new(@__weel_data,@__weel_endpoints)
+                if prepare
+                  if prepare.is_a?(Proc)
+                    rs.instance_exec &prepare
+                  elsif prepare.is_a?(String)
+                    rs.instance_eval prepare
                   end
                 end
-              when Array
-                parameters.each_with_index do |p,i|
-                  if p.is_a?(Symbol) && @__weel_data.include?(p)
-                    params[p] = @__weel_data[p]
-                  else
-                    params[i] = p
-                  end
+                params = handlerwrapper.prepare(rs,endpoint,parameters)
+                raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
+                raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
+
+                if @__weel_search_positions[position]
+                  passthrough = @__weel_search_positions[position].passthrough
+                  @__weel_search_positions[position].passthrough = nil
+                else
+                  passthrough = nil
                 end
-              else
-                raise("invalid parameters")
-            end
-            rs = ReadStructure.new(@__weel_data,@__weel_endpoints)
-            if prepare
-              if prepare.is_a?(Proc)
-                rs.instance_exec &prepare
-              elsif prepare.is_a?(String)
-                rs.instance_eval prepare
-              end
-            end
-            params = handlerwrapper.prepare(rs,endpoint,params)
-            raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
-            raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
-
-            if @__weel_search_positions[position]
-              passthrough = @__weel_search_positions[position].passthrough
-              @__weel_search_positions[position].passthrough = nil
-            else
-              passthrough = nil
-            end
 
-            handlerwrapper.activity_handle passthrough, params
-            wp.passthrough = handlerwrapper.activity_passthrough_value
-            unless wp.passthrough.nil?
-              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :wait => [wp]
-            end
-            begin
-              # with loop if catching Signal::Again
-              # handshake call and wait until it finished
-              waitingresult = nil
-              waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
-              raise waitingresult[1] if !waitingresult.nil? && waitingresult.is_a?(Array) && waitingresult.length == 2 && waitingresult[0] == WEEL::Signal::Error
-
-              if Thread.current[:nolongernecessary]
-                handlerwrapper.activity_no_longer_necessary
-                raise Signal::NoLongerNecessary
-              end
-              if self.__weel_state == :stopping || self.__weel_state == :finishing
-                handlerwrapper.activity_stop
+                handlerwrapper.activity_handle passthrough, params
                 wp.passthrough = handlerwrapper.activity_passthrough_value
-                raise Signal::Proceed
-              end
+                unless wp.passthrough.nil?
+                  @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :wait => [wp]
+                end
+                begin
+                  # with loop if catching Signal::Again
+                  # handshake call and wait until it finished
+                  waitingresult = nil
+                  waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
+                  raise waitingresult[1] if !waitingresult.nil? && waitingresult.is_a?(Array) && waitingresult.length == 2 && waitingresult[0] == WEEL::Signal::Error
+
+                  if Thread.current[:nolongernecessary]
+                    handlerwrapper.activity_no_longer_necessary
+                    raise Signal::NoLongerNecessary
+                  end
+                  if self.__weel_state == :stopping || self.__weel_state == :finishing
+                    handlerwrapper.activity_stop
+                    wp.passthrough = handlerwrapper.activity_passthrough_value
+                    raise Signal::Proceed
+                  end
 
-              code = if waitingresult == WEEL::Signal::Again
-                update
-              elsif waitingresult == WEEL::Signal::Salvage
-                salvage || raise('HTTP Error. The service return status was not between 200 and 300.')
-              else
-                finalize
-              end
-              if code.is_a?(Proc) || code.is_a?(String)
-                handlerwrapper.inform_activity_manipulate
-                if code.is_a?(Proc)
-                  mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
-                  case code.arity
-                    when 1; mr.instance_exec(handlerwrapper.activity_result_value,&code)
-                    when 2; mr.instance_exec(handlerwrapper.activity_result_value,&code)
-                    else
-                      mr.instance_exec(&code)
+                  code = if waitingresult == WEEL::Signal::Again
+                    update
+                  elsif waitingresult == WEEL::Signal::Salvage
+                    salvage || raise('HTTP Error. The service return status was not between 200 and 300.')
+                  else
+                    finalize
+                  end
+                  if code.is_a?(Proc) || code.is_a?(String)
+                    handlerwrapper.inform_activity_manipulate
+                    if code.is_a?(Proc)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
+                      case code.arity
+                        when 1; mr.instance_exec(handlerwrapper.activity_result_value,&code)
+                        when 2; mr.instance_exec(handlerwrapper.activity_result_value,&code)
+                        else
+                          ma = catch Signal::Again do
+                            mr.instance_exec(&code)
+                            'yes' # ma sadly will have nil when i just throw
+                          end
+                      end
+                    elsif code.is_a?(String)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
+                      ma = catch Signal::Again do
+                        handlerwrapper.manipulate(mr,code,handlerwrapper.activity_result_value,handlerwrapper.activity_result_options)
+                        'yes' # ma sadly will have nil when i just throw
+                      end
+                    end
+                    handlerwrapper.inform_manipulate_change(
+                      (mr.changed_status ? @__weel_status : nil),
+                      (mr.changed_data.any? ? mr.changed_data.uniq : nil),
+                      (mr.changed_endpoints.any? ? mr.changed_endpoints.uniq : nil),
+                      @__weel_data,
+                      @__weel_endpoints
+                    )
+                    throw(Signal::Again, Signal::Again) if ma.nil?
                   end
-                elsif code.is_a?(String)
-                  mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
-                  handlerwrapper.manipulate(mr,code,handlerwrapper.activity_result_value)
+                end while waitingresult == Signal::Again
+                if handlerwrapper.activity_passthrough_value.nil?
+                  handlerwrapper.inform_activity_done
+                  wp.passthrough = nil
+                  wp.detail = :after
+                  @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
                 end
-                handlerwrapper.inform_manipulate_change(
-                  (mr.changed_status ? @__weel_status : nil),
-                  (mr.changed_data.any? ? mr.changed_data.uniq : nil),
-                  (mr.changed_endpoints.any? ? mr.changed_endpoints.uniq : nil),
-                  @__weel_data,
-                  @__weel_endpoints
-                )
               end
-            end while waitingresult == Signal::Again
-            if handlerwrapper.activity_passthrough_value.nil?
-              handlerwrapper.inform_activity_done
-              wp.passthrough = nil
-              wp.detail = :after
-              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
-            end
+            end while again == Signal::Again
         end
         raise Signal::Proceed
       rescue Signal::SkipManipulate, Signal::Proceed

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.77"
+  s.version          = "1.99.78"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.77
+  version: 1.99.78
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 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: test-unit