weel 1.99.6 → 1.99.7

data/Changelog

@@ -1,8 +1,12 @@
-1.2.x
+1.99.x
 -----
 
-Ruby >= 1.9.3 only, use Queue instead of Threads and Mutexes of Weel::Continue
-LGPL-3 to achive Aapache 2 compatibility
+* Ruby >= 1.9.3 only, use Queue instead of Threads and Mutexes of Weel::Continue
+* LGPL-3 to achive Aapache 2 compatibility
+* Raise Weel::Signal::Again in HandlerWrapper, to trigger Manipulation and then
+redo the activity. HandlerWrapper is not discarded inbetween, so it is possible
+to continue receiving multiple callbacks. Basically sequential multi instance
+task.
 
 1.1.x
 -----

data/lib/weel.rb

@@ -69,6 +69,7 @@ class WEEL
     class Stop < Exception; end
     class Proceed < Exception; end
     class NoLongerNecessary < Exception; end
+    class Again < Exception; end
   end # }}}
 
   class ReadStructure # {{{
@@ -243,6 +244,9 @@ class WEEL
      def continue
        @q.push nil
      end
+     def clear
+      @q.clear
+     end
      def wait
        @q.deq
      end
@@ -616,40 +620,48 @@ class WEEL
             raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
 
             passthrough = @__weel_search_positions[position] ? @__weel_search_positions[position].passthrough : nil
-            # handshake call and wait until it finished
-            handlerwrapper.activity_handle passthrough, params
-            Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :stopped
+            begin
+              # with loop if catch Signal::Again
+              begin
+                # handshake call and wait until it finished
+                handlerwrapper.activity_handle passthrough, params
+                Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :stopped
+                again = false
+              rescue Signal::Again
+                again = true
+              end
 
-            if Thread.current[:nolongernecessary]
-              handlerwrapper.activity_no_longer_necessary 
-              raise Signal::NoLongerNecessary
-            end  
-            if self.__weel_state == :stopping
-              handlerwrapper.activity_stop
-              wp.passthrough = handlerwrapper.activity_passthrough_value
-            end  
+              if Thread.current[:nolongernecessary]
+                handlerwrapper.activity_no_longer_necessary 
+                raise Signal::NoLongerNecessary
+              end  
+              if self.__weel_state == :stopping
+                handlerwrapper.activity_stop
+                wp.passthrough = handlerwrapper.activity_passthrough_value
+              end  
 
-            if wp.passthrough.nil? && (code.is_a?(Proc) || code.is_a?(String))
-              handlerwrapper.inform_activity_manipulate
-              status = handlerwrapper.activity_result_status
-              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,(status.is_a?(Status)?status:nil),&code)
-                  else
-                    mr.instance_eval(&code)
-                end  
-              elsif code.is_a?(String)  
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
-                handlerwrapper.manipulate(mr,code,handlerwrapper.activity_result_value,(status.is_a?(Status)?status:nil))
+              if wp.passthrough.nil? && (code.is_a?(Proc) || code.is_a?(String))
+                handlerwrapper.inform_activity_manipulate
+                status = handlerwrapper.activity_result_status
+                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,(status.is_a?(Status)?status:nil),&code)
+                    else
+                      mr.instance_eval(&code)
+                  end  
+                elsif code.is_a?(String)  
+                  mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status)
+                  handlerwrapper.manipulate(mr,code,handlerwrapper.activity_result_value,(status.is_a?(Status)?status:nil))
+                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)
+                )
               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)
-              )
-            end
+            end while wp.passthrough.nil? && again
             if wp.passthrough.nil?
               handlerwrapper.inform_activity_done
               wp.detail = :after
@@ -672,6 +684,8 @@ class WEEL
       rescue => err
         handlerwrapper.inform_activity_failed err
         self.__weel_state = :stopping
+      ensure
+        Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
       end
     end # }}}
 

data/test/README

@@ -0,0 +1,7 @@
+basic              ... Basic WEEL tests
+complex            ... Complex WEEL tests
+exec               ... Different Activity types
+wfp_basic          ... Basic Van der Aalst WF patterns
+wfp_iteration      ... Iteration related Van der Aalst WF patterns
+wfp_state_based    ... State Based Van der Aalst WF patterns
+wfp_adv_branching  ... Advanced Branching Van der Aalst WF patterns

data/test/TestHandlerWrapper.rb

@@ -16,6 +16,15 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
     if @__myhandler_endpoint == 'stop it'
       raise WEEL::Signal::Stop
     end
+    if @__myhandler_endpoint == 'again'
+      @__myhandler_returnValue = parameters.has_key?(:result) ? parameters[:result] : 'Handler_Dummy_Result'
+      if parameters[:call].call 
+        raise WEEL::Signal::Again  
+      else
+        @__myhandler_continue.continue 
+      end  
+      return
+    end
     if parameters[:call]
       @t = Thread.new do
         parameters[:call].call

data/test/TestWorkflow.rb

@@ -7,6 +7,7 @@ class TestWorkflow < WEEL
 
   endpoint :endpoint1 => 'http://www.heise.de'
   endpoint :stop => 'stop it'
+  endpoint :again => 'again'
   data :x => 'begin_'
   
   control flow do

data/test/basic/tc_endpoint.rb

@@ -33,7 +33,7 @@ class TestEndpoint < Test::Unit::TestCase
     @wf.endpoints[:endpoint1]="http://www.test2.com" # asure that ep1 has original value
     eps = @wf.endpoints
     assert(eps.is_a?(Hash), "Endpoints should result a Hash but returns a #{eps.class}")
-    assert(eps.size == 3, "Endpoints should have two entries: #{eps.inspect}")
+    assert(eps.size == 4, "Endpoints should have two entries: #{eps.inspect}")
     assert(eps[:endpoint1] == "http://www.test2.com", "Endpoint 1 has wrong value or does not exist: #{eps.inspect}")
     assert(eps[:endpoint2] == "http://www.test.at", "Endpoint 2 has wrong value or does not exist: #{eps.inspect}")
   end

data/test/exec/tc_again.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
+
+class TestChoose < Test::Unit::TestCase
+  include TestMixin
+
+  def test_again
+    @wf.data[:a] = 0
+    @wf.description do
+      call :a_1, :again, :call => Proc.new{data.a < 2}  do
+        data.a += 1
+      end
+    end
+    @wf.start.join
+    wf_assert("CALL a_1")
+    wf_sassert("|running|Ca_1Ma_1Ca_1Ma_1Ca_1Ma_1Da_1|finished|")
+    assert(@wf.data[:a] == 3)
+  end
+
+end

data/test/exec/tc_exec.rb

@@ -0,0 +1,25 @@
+require 'test/unit'
+require File.expand_path(::File.dirname(__FILE__) + '/../TestWorkflow')
+
+class TestChoose < Test::Unit::TestCase
+  include TestMixin
+
+  def test_exec
+    @wf.data[:a] = 0
+    @wf.data[:b] = 0
+    @wf.description do
+      manipulate :a_1, <<-end
+        data.a = 1 
+      end
+      call :a_2, :endpoint1, <<-end
+        data.b = 1
+      end
+    end
+    @wf.start.join
+    wf_assert("MANIPULATE a_1")
+    wf_assert("CALL a_2")
+    assert(@wf.data[:a] == 1)
+    assert(@wf.data[:b] == 1)
+  end
+
+end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.6"
+  s.version          = "1.99.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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.6
+  version: 1.99.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
@@ -19,9 +19,9 @@ extensions: []
 extra_rdoc_files:
 - README
 files:
+- example/SimpleHandlerWrapper.rb
 - example/SimpleWorkflow.rb
 - example/runme.rb
-- example/SimpleHandlerWrapper.rb
 - lib/weel.rb
 - COPYING
 - Changelog
@@ -31,37 +31,40 @@ files:
 - weel.gemspec
 - README
 - AUTHORS
-- test/TestHandlerWrapper.rb
 - test/SimHandlerWrapper.rb
-- test/ContinueTest.rb
 - test/TestMixin.rb
+- test/TestHandlerWrapper.rb
+- test/ContinueTest.rb
+- test/README
 - test/TestWorkflow.rb
-- test/complex/tc_parallel_stop.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
-- test/wfp_state_based/tc_deferredchoice.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/basic/tc_data.rb
-- test/basic/tc_codereplace.rb
-- test/basic/tc_state.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_search.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_parallel.rb
-- test/wfp_iteration/tc_structuredloop.rb
 - test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
 - test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_multimerge.rb
 - test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
 - test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_iteration/tc_structuredloop.rb
+- test/basic/tc_codereplace.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_parallel.rb
+- test/basic/tc_search.rb
+- test/basic/tc_state.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_data.rb
+- test/basic/tc_wf_control.rb
+- test/exec/tc_exec.rb
+- test/exec/tc_again.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_state_based/tc_deferredchoice.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/complex/tc_parallel_stop.rb
 homepage: http://cpee.org/
 licenses:
 - LGPL-3
@@ -88,34 +91,37 @@ signing_key:
 specification_version: 3
 summary: Preliminary release of the Workflow Execution Engine Library (WEEL)
 test_files:
-- test/TestHandlerWrapper.rb
 - test/SimHandlerWrapper.rb
-- test/ContinueTest.rb
 - test/TestMixin.rb
+- test/TestHandlerWrapper.rb
+- test/ContinueTest.rb
+- test/README
 - test/TestWorkflow.rb
-- test/complex/tc_parallel_stop.rb
-- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
-- test/wfp_state_based/tc_interleavedparallelrouting.rb
-- test/wfp_state_based/tc_deferredchoice.rb
-- test/wfp_basic/tc_parallelsplit_synchronization.rb
-- test/wfp_basic/tc_sequence.rb
-- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
-- test/basic/tc_data.rb
-- test/basic/tc_codereplace.rb
-- test/basic/tc_state.rb
-- test/basic/tc_wf_control.rb
-- test/basic/tc_choose.rb
-- test/basic/tc_search.rb
-- test/basic/tc_handler.rb
-- test/basic/tc_endpoint.rb
-- test/basic/tc_parallel.rb
-- test/wfp_iteration/tc_structuredloop.rb
 - test/wfp_adv_branching/tc_threadsplit.rb
-- test/wfp_adv_branching/tc_generalizedjoin.rb
-- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_adv_branching/tc_structured_discriminator.rb
 - test/wfp_adv_branching/tc_multichoice_structuredsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_multimerge.rb
 - test/wfp_adv_branching/tc_generalsynchronizingmerge.rb
 - test/wfp_adv_branching/tc_localsynchronizingmerge.rb
-- test/wfp_adv_branching/tc_structured_discriminator.rb
-- test/wfp_adv_branching/tc_multimerge.rb
+- test/wfp_adv_branching/tc_generalizedjoin.rb
+- test/wfp_adv_branching/tc_threadmerge.rb
+- test/wfp_adv_branching/tc_structured_partial_join.rb
+- test/wfp_iteration/tc_structuredloop.rb
+- test/basic/tc_codereplace.rb
+- test/basic/tc_endpoint.rb
+- test/basic/tc_handler.rb
+- test/basic/tc_parallel.rb
+- test/basic/tc_search.rb
+- test/basic/tc_state.rb
+- test/basic/tc_choose.rb
+- test/basic/tc_data.rb
+- test/basic/tc_wf_control.rb
+- test/exec/tc_exec.rb
+- test/exec/tc_again.rb
+- test/wfp_basic/tc_sequence.rb
+- test/wfp_basic/tc_parallelsplit_synchronization.rb
+- test/wfp_basic/tc_exclusivechoice_simplemerge.rb
+- test/wfp_state_based/tc_interleavedparallelrouting.rb
+- test/wfp_state_based/tc_deferredchoice.rb
+- test/complex/tc_generalsynchonizingmerge_loopsearch.rb
+- test/complex/tc_parallel_stop.rb