weel 1.99.94 → 1.99.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6ec72184bb20d41fdef30320134806cf5f450a3a141efe9bde5adf6f24c44d
-  data.tar.gz: 2732e2b2ad2ec01d554b1b7c94c06a831d5d69ca36404c3c35ad9605cd9f444d
+  metadata.gz: b6d41da4a64d101b885ac475da4625fff4bb4098b9430563f3fc950f7804517e
+  data.tar.gz: b0714d35fa2e112b63b31e19699814607b66545eb60614d834e852d308d1ce7b
 SHA512:
-  metadata.gz: c77da26f6558eec836f5479a0bee9b9f9a62b11fd68e6ecc2002b52f40eabd999dae7118f6ff6f1979953d94abebb33c7f4ec47650c0d78f1cd5e1b7e1cd34b9
-  data.tar.gz: 3d8209e7eae538b910c3ac0d0c7a7f401b601aae696e956262dc5605e56832201071fbf0277468f9f8ffa95e51933fb8acc45b1b2d8da04be0c21d5998075bd2
+  metadata.gz: 9d79e7d56585b62912f638066fb4fee0e9a71786c10ea638819ff04189df8d335282d140d7b28734abd92e18eb8078c761e9b9e3b16666166afafcfd0c631acc
+  data.tar.gz: b3d67a26a4016f7711273025427da307fe989f82319221ee07a1617eefe8f0bd2e04c845acee55d1e3a84619064a31744d53cf2a43344ed09c8568ef57f6a5c3

data/lib/weel.rb

@@ -20,13 +20,14 @@ require 'securerandom'
 class WEEL
   def initialize(*args)# {{{
     @dslr = DSLRealization.new
-    @dslr.__weel_handlerwrapper_args = args
+    @dslr.__weel_connectionwrapper_args = args
 
     initialize_search if methods.include?(:initialize_search)
     initialize_data if methods.include?(:initialize_data)
     initialize_endpoints if methods.include?(:initialize_endpoints)
-    initialize_handlerwrapper if methods.include?(:initialize_handlerwrapper)
+    initialize_connectionwrapper if methods.include?(:initialize_connectionwrapper)
     initialize_control if methods.include?(:initialize_control)
+    initialize_flow_data if methods.include?(:initialize_flow_data)
   end # }}}
 
   module Signal # {{{
@@ -43,8 +44,7 @@ class WEEL
 
   class ReadStructure # {{{
     def initialize(data,endpoints,additional)
-      @__weel_data = data.dup
-      @__weel_data.transform_values! do |v|
+      @__weel_data = data.transform_values do |v|
         if Object.const_defined?(:XML) && XML.const_defined?(:Smart) && v.is_a?(XML::Smart::Dom)
           v.root.to_doc
         else
@@ -55,8 +55,7 @@ class WEEL
           end
         end
       end
-      @__weel_endpoints = endpoints.dup
-      @__weel_endpoints.transform_values!{ |v| v.dup }
+      @__weel_endpoints = endpoints.transform_values{ |v| v.dup }
       @additional = additional
     end
 
@@ -223,6 +222,8 @@ class WEEL
       else
         if args.empty? && @__weel_values.key?(name)
           @__weel_values[name]
+        elsif args.empty? && @__weel_values.key?(name.to_s)
+          @__weel_values[name.to_s]
         elsif name.to_s[-1..-1] == "=" && args.length == 1
           temp = name.to_s[0..-2]
           @__weel_values[temp.to_sym] = args[0]
@@ -237,11 +238,11 @@ class WEEL
     end
   end # }}}
 
-  class HandlerWrapperBase # {{{
+  class ConnectionWrapperBase # {{{
     def self::loop_guard(arguments,lid,count); false; end
     def self::inform_state_change(arguments,newstate); end
     def self::inform_syntax_error(arguments,err,code); end
-    def self::inform_handlerwrapper_error(arguments,err); end
+    def self::inform_connectionwrapper_error(arguments,err); end
     def self::inform_position_change(arguments,ipc={}); end
 
     def initialize(arguments,position=nil,continue=nil); end
@@ -275,6 +276,7 @@ class WEEL
     def simulate(type,nesting,sequence,parent,parameters={}); end
 
     def callback(result=nil,options={}); end
+    def mem_guard; end
 
     def test_condition(mr,code); mr.instance_eval(code); end
     def manipulate(mr,code,result=nil,options=nil); mr.instance_eval(code); end
@@ -352,19 +354,21 @@ class WEEL
       end
     end
   end # }}}
-  def self::handlerwrapper(aClassname, *args)# {{{
-    define_method :initialize_handlerwrapper do
-      self.handlerwrapper = aClassname
-      self.handlerwrapper_args = args unless args.empty?
+  def self::connectionwrapper(aClassname, *args)# {{{
+    define_method :initialize_connectionwrapper do
+      self.connectionwrapper = aClassname
+      self.connectionwrapper_args = args unless args.empty?
     end
   end # }}}
   def self::control(flow, &block)# {{{
-    @@__weel_control_block = block
     define_method :initialize_control do
-      self.description = @@__weel_control_block
+      self.description = block
     end
   end #  }}}
-  def self::flow # {{{
+  def self::flow(flow_data=nil) # {{{
+    define_method :initialize_flow_data do
+      self.flow_data = flow_data
+    end if flow_data
   end #}}}
 
   class DSLRealization # {{{
@@ -374,14 +378,14 @@ class WEEL
       @__weel_main = nil
       @__weel_data ||= Hash.new
       @__weel_endpoints ||= Hash.new
-      @__weel_handlerwrapper = HandlerWrapperBase
-      @__weel_handlerwrapper_args = []
+      @__weel_connectionwrapper = ConnectionWrapperBase
+      @__weel_connectionwrapper_args = []
       @__weel_state = :ready
       @__weel_status = Status.new(0,"undefined")
       @__weel_replay = false
       @__weel_sim = -1
     end #}}}
-    attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_handlerwrapper, :__weel_handlerwrapper_args, :__weel_replay
+    attr_accessor :__weel_search_positions, :__weel_positions, :__weel_main, :__weel_data, :__weel_endpoints, :__weel_connectionwrapper, :__weel_connectionwrapper_args, :__weel_replay
     attr_reader :__weel_state, :__weel_status
 
     # DSL-Constructs for atomic calls to external services (calls) and pure context manipulations (manipulate).
@@ -416,7 +420,9 @@ class WEEL
 
       __weel_protect_yield(&block)
 
-      Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type.size == 1 && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
+      Thread.current[:branch_wait_count] = (type.is_a?(Hash) && type[:wait] != nil && (type[:wait].is_a?(Integer) && type[:wait] > 0) ? type[:wait] : Thread.current[:branches].size)
+      Thread.current[:branch_wait_count_cancel] = 0
+      Thread.current[:branch_wait_count_cancel_condition] = (type.is_a?(Hash) && type[:cancel] != nil && type[:cancel] == :first ) ? :first : :last
       1.upto Thread.current[:branches].size do
         Thread.current[:branch_event].wait
       end
@@ -459,11 +465,12 @@ class WEEL
         current_branch_sim_pos = branch_parent[:branch_sim_pos]
       end
 
-      Thread.current[:branches] << Thread.new(*vars) do |*local|
+      branch_parent[:branches] << Thread.new(*vars) do |*local|
         Thread.current.abort_on_exception = true
         Thread.current[:branch_status] = false
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
+        Thread.current[:branch_wait_count_cancel_active] = false
 
         if __weel_sim
           Thread.current[:branch_sim_pos] = @__weel_sim += 1
@@ -479,15 +486,15 @@ class WEEL
         Thread.current[:start_event].wait unless self.__weel_state == :stopping || self.__weel_state == :stopped || self.__weel_state == :finishing
 
         if __weel_sim
-          handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args
-          handlerwrapper.simulate(:parallel_branch,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos)
+          connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+          connectionwrapper.simulate(:parallel_branch,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos)
         end
 
         unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
           __weel_protect_yield(*local, &block)
         end
 
-        __weel_sim_stop(:parallel_branch,handlerwrapper,current_branch_sim_pos) if __weel_sim
+        __weel_sim_stop(:parallel_branch,connectionwrapper,current_branch_sim_pos) if __weel_sim
 
         branch_parent[:mutex].synchronize do
           Thread.current[:branch_status] = true
@@ -502,7 +509,7 @@ class WEEL
             begin
               ipc = {}
               ipc[:unmark] = [Thread.current[:branch_position]]
-              @__weel_handlerwrapper::inform_position_change(@__weel_handlerwrapper_args,ipc)
+              @__weel_connectionwrapper::inform_position_change(@__weel_connectionwrapper_args,ipc)
             end rescue nil
             Thread.current[:branch_position] = nil
           end
@@ -600,13 +607,13 @@ class WEEL
             while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
               loop_guard += 1
               __weel_protect_yield(&block)
-              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
+              sleep 1 if @__weel_connectionwrapper::loop_guard(@__weel_connectionwrapper_args,loop_id,loop_guard)
             end
           when :post_test
             begin
               loop_guard += 1
               __weel_protect_yield(&block)
-              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
+              sleep 1 if @__weel_connectionwrapper::loop_guard(@__weel_connectionwrapper_args,loop_id,loop_guard)
             end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
         end
       end
@@ -656,27 +663,27 @@ class WEEL
         yield(*local) if block_given?
       rescue NameError => err # don't look into it, or it will explode
         self.__weel_state = :stopping
-        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
       rescue => err
         self.__weel_state = :stopping
-        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new(err.message),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new(err.message),nil)
         nil
       end
     end #}}}
 
     def __weel_eval_condition(condition) #{{{
       begin
-        handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args unless condition.is_a?(Proc)
-        condition.is_a?(Proc) ? condition.call : handlerwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,handlerwrapper.additional),condition)
+        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args unless condition.is_a?(Proc)
+        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,connectionwrapper.additional),condition)
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
-        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("eval_condition: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("eval_condition: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
       rescue => err
         self.__weel_state = :stopping
-        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new(err.message),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new(err.message),nil)
         nil
       end
     end #}}}
@@ -714,7 +721,7 @@ class WEEL
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
 
-      @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, ipc
+      @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, ipc
       wp
     end #}}}
 
@@ -726,10 +733,10 @@ class WEEL
         return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
         Thread.current[:continue] = Continue.new
-        handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args, position, Thread.current[:continue]
+        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args, position, Thread.current[:continue]
 
         if __weel_sim
-          handlerwrapper.simulate(:activity,:none,@__weel_sim += 1,Thread.current[:branch_sim_pos],:position => position,:parameters => parameters,:endpoint => endpoint,:type => type,:finalize => finalize.is_a?(String) ? finalize : nil)
+          connectionwrapper.simulate(:activity,:none,@__weel_sim += 1,Thread.current[:branch_sim_pos],:position => position,:parameters => parameters,:endpoint => endpoint,:type => type,:finalize => finalize.is_a?(String) ? finalize : nil)
           return
         end
 
@@ -740,34 +747,35 @@ class WEEL
 
         case type
           when :manipulate
-            raise Signal::Stop unless handlerwrapper.vote_sync_before
+            raise Signal::Stop unless connectionwrapper.vote_sync_before
             raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
             if finalize.is_a?(Proc) || finalize.is_a?(String)
-              handlerwrapper.activity_manipulate_handle(parameters)
-              handlerwrapper.inform_activity_manipulate
+              connectionwrapper.activity_manipulate_handle(parameters)
+              connectionwrapper.inform_activity_manipulate
               if finalize.is_a?(Proc)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,handlerwrapper.additional)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
                 mr.instance_eval(&finalize)
               elsif finalize.is_a?(String)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,handlerwrapper.additional)
-                handlerwrapper.manipulate(mr,finalize)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                connectionwrapper.manipulate(mr,finalize)
               end
-              handlerwrapper.inform_manipulate_change(
+              connectionwrapper.inform_manipulate_change(
                 ((mr && mr.changed_status) ? @__weel_status : nil),
                 ((mr && mr.changed_data.any?) ? mr.changed_data.uniq : nil),
                 ((mr && mr.changed_endpoints.any?) ? mr.changed_endpoints.uniq : nil),
                 @__weel_data,
                 @__weel_endpoints
               )
-              handlerwrapper.inform_activity_done
+              connectionwrapper.inform_activity_done
               wp.detail = :after
-              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
+              @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :after => [wp]
             end
           when :call
             begin
               again = catch Signal::Again do
-                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,handlerwrapper.additional)
+                connectionwrapper.mem_guard
+                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,connectionwrapper.additional)
                 if prepare
                   if prepare.is_a?(Proc)
                     rs.instance_exec(&prepare)
@@ -775,14 +783,14 @@ class WEEL
                     rs.instance_eval prepare
                   end
                 end
-                params = handlerwrapper.prepare(rs,endpoint,parameters,@__weel_replay)
-                raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
+                params = connectionwrapper.prepare(rs,endpoint,parameters,@__weel_replay)
+                raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
                 raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
-                handlerwrapper.activity_handle wp.passthrough, params
-                wp.passthrough = handlerwrapper.activity_passthrough_value
+                connectionwrapper.activity_handle wp.passthrough, params
+                wp.passthrough = connectionwrapper.activity_passthrough_value
                 unless wp.passthrough.nil?
-                  @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :wait => [wp]
+                  @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :wait => [wp]
                 end
                 begin
                   # with loop if catching Signal::Again
@@ -792,12 +800,12 @@ class WEEL
                   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
+                    connectionwrapper.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
+                    connectionwrapper.activity_stop
+                    wp.passthrough = connectionwrapper.activity_passthrough_value
                     raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
                   end
 
@@ -809,26 +817,26 @@ class WEEL
                     finalize
                   end
                   if code.is_a?(Proc) || code.is_a?(String)
-                    handlerwrapper.inform_activity_manipulate
+                    connectionwrapper.inform_activity_manipulate
                     if code.is_a?(Proc)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,handlerwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
                       ma = catch Signal::Again do
                         case code.arity
-                          when 1; mr.instance_exec(handlerwrapper.activity_result_value,&code)
-                          when 2; mr.instance_exec(handlerwrapper.activity_result_value,&code)
+                          when 1; mr.instance_exec(connectionwrapper.activity_result_value,&code)
+                          when 2; mr.instance_exec(connectionwrapper.activity_result_value,&code)
                           else
                             mr.instance_exec(&code)
                         end
                         'yes' # ma sadly will have nil when i just throw
                       end
                     elsif code.is_a?(String)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,handlerwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
                       ma = catch Signal::Again do
-                        handlerwrapper.manipulate(mr,code,handlerwrapper.activity_result_value,handlerwrapper.activity_result_options)
+                        connectionwrapper.manipulate(mr,code,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
                         'yes' # ma sadly will have nil when i just throw
                       end
                     end
-                    handlerwrapper.inform_manipulate_change(
+                    connectionwrapper.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),
@@ -838,18 +846,18 @@ class WEEL
                     throw(Signal::Again, Signal::Again) if ma.nil?
                   end
                 end while waitingresult == Signal::Again
-                if handlerwrapper.activity_passthrough_value.nil?
-                  handlerwrapper.inform_activity_done
+                if connectionwrapper.activity_passthrough_value.nil?
+                  connectionwrapper.inform_activity_done
                   wp.passthrough = nil
                   wp.detail = :after
-                  @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
+                  @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :after => [wp]
                 end
               end
             end while again == Signal::Again
         end
         raise Signal::Proceed
       rescue Signal::SkipManipulate, Signal::Proceed
-        if self.__weel_state != :stopping && self.__weel_state != :finishing && !handlerwrapper.vote_sync_after
+        if self.__weel_state != :stopping && self.__weel_state != :finishing && !connectionwrapper.vote_sync_after
           self.__weel_state = :stopping
           wp.detail = :unmark
         end
@@ -857,18 +865,37 @@ class WEEL
         @__weel_positions.delete wp
         Thread.current[:branch_position] = nil
         wp.detail = :unmark
-        @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :unmark => [wp]
+        @__weel_connectionwrapper::inform_position_change @__weel_connectionwrapper_args, :unmark => [wp]
       rescue Signal::StopSkipManipulate, Signal::Stop
         self.__weel_state = :stopping
       rescue Signal::Skip
         nil
       rescue SyntaxError => se
-        handlerwrapper.inform_activity_failed se
+        connectionwrapper.inform_activity_failed se
         self.__weel_state = :stopping
       rescue => err
-        @__weel_handlerwrapper::inform_handlerwrapper_error @__weel_handlerwrapper_args, err
+        @__weel_connectionwrapper::inform_connectionwrapper_error @__weel_connectionwrapper_args, err
         self.__weel_state = :stopping
       ensure
+        connectionwrapper.mem_guard unless connectionwrapper.nil?
+        if Thread.current[:branch_parent]
+          Thread.current[:branch_parent][:mutex].synchronize do
+            if Thread.current[:branch_parent][:branch_wait_count_cancel_condition] == :first
+              if !Thread.current[:branch_wait_count_cancel_active]
+                Thread.current[:branch_wait_count_cancel_active] = true
+                Thread.current[:branch_parent][:branch_wait_count_cancel] += 1
+              end
+              if Thread.current[:branch_parent][:branch_wait_count_cancel] ==  Thread.current[:branch_parent][:branch_wait_count]  && self.__weel_state != :stopping && self.__weel_state != :finishing
+                Thread.current[:branch_parent][:branches].each do |thread|
+                  if thread.alive? && thread != Thread.current
+                    thread[:nolongernecessary] = true
+                    __weel_recursive_continue(thread)
+                  end
+                end
+              end
+            end
+          end
+        end
         Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
       end
     end # }}}
@@ -914,7 +941,7 @@ class WEEL
         position
       else
         self.__weel_state = :stopping
-        @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("position (#{position}) not valid"),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("position (#{position}) not valid"),nil)
       end
     end # }}}
 
@@ -943,13 +970,13 @@ class WEEL
     def __weel_sim_start(what,options={}) #{{{
       current_branch_sim_pos = Thread.current[:branch_sim_pos]
       Thread.current[:branch_sim_pos] = @__weel_sim += 1
-      handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args
-      handlerwrapper.simulate(what,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
-      [handlerwrapper, current_branch_sim_pos]
+      connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
+      connectionwrapper.simulate(what,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
+      [connectionwrapper, current_branch_sim_pos]
     end #}}}
 
-    def __weel_sim_stop(what,handlerwrapper,current_branch_sim_pos,options={}) #{{{
-      handlerwrapper.simulate(what,:end,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
+    def __weel_sim_stop(what,connectionwrapper,current_branch_sim_pos,options={}) #{{{
+      connectionwrapper.simulate(what,:end,Thread.current[:branch_sim_pos],current_branch_sim_pos,options)
       Thread.current[:branch_sim_pos] = current_branch_sim_pos
     end #}}}
 
@@ -957,7 +984,7 @@ class WEEL
     def __weel_finalize #{{{
       __weel_recursive_join(@__weel_main)
       @__weel_state = :stopped
-      @__weel_handlerwrapper::inform_state_change @__weel_handlerwrapper_args, @__weel_state
+      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
     end #}}}
 
     def __weel_state=(newState)# {{{
@@ -972,7 +999,7 @@ class WEEL
         __weel_replay = false
       end
 
-      @__weel_handlerwrapper::inform_state_change @__weel_handlerwrapper_args, @__weel_state
+      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
     end # }}}
 
   end # }}}
@@ -982,27 +1009,27 @@ public
     @dslr.__weel_positions
   end # }}}
 
-  # set the handlerwrapper
-  def handlerwrapper # {{{
-    @dslr.__weel_handlerwrapper
+  # set the connectionwrapper
+  def connectionwrapper # {{{
+    @dslr.__weel_connectionwrapper
   end # }}}
-  def handlerwrapper=(new_weel_handlerwrapper) # {{{
-    superclass = new_weel_handlerwrapper
+  def connectionwrapper=(new_weel_connectionwrapper) # {{{
+    superclass = new_weel_connectionwrapper
     while superclass
-      check_ok = true if superclass == WEEL::HandlerWrapperBase
+      check_ok = true if superclass == WEEL::ConnectionWrapperBase
       superclass = superclass.superclass
     end
-    raise "Handlerwrapper is not inherited from HandlerWrapperBase" unless check_ok
-    @dslr.__weel_handlerwrapper = new_weel_handlerwrapper
+    raise "ConnectionWrapper is not inherited from ConnectionWrapperBase" unless check_ok
+    @dslr.__weel_connectionwrapper = new_weel_connectionwrapper
   end # }}}
 
-  # Get/Set the handlerwrapper arguments
-  def handlerwrapper_args # {{{
-    @dslr.__weel_handlerwrapper_args
+  # Get/Set the connectionwrapper arguments
+  def connectionwrapper_args # {{{
+    @dslr.__weel_connectionwrapper_args
   end # }}}
-  def handlerwrapper_args=(args) # {{{
+  def connectionwrapper_args=(args) # {{{
     if args.class == Array
-      @dslr.__weel_handlerwrapper_args = args
+      @dslr.__weel_connectionwrapper_args = args
     end
     nil
   end #  }}}
@@ -1012,7 +1039,7 @@ public
     @dslr.__weel_state
   end #  }}}
   def state_signal # {{{
-    handlerwrapper::inform_state_change handlerwrapper_args, state
+    connectionwrapper::inform_state_change connectionwrapper_args, state
     state
   end # }}}
   def abandon # {{{
@@ -1076,19 +1103,19 @@ public
           end
         rescue SyntaxError => se
           @dslr.__weel_state = :stopping
-          @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,Exception.new(se.message),code)
+          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new(se.message),code)
         rescue NameError => err # don't look into it, or it will explode
           @dslr.__weel_state = :stopping
-          @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,Exception.new("main: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),code)
+          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new("main: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),code)
         rescue => err
           @dslr.__weel_state = :stopping
-          @dslr.__weel_handlerwrapper::inform_syntax_error(@dslr.__weel_handlerwrapper_args,Exception.new(err.message),code)
+          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new(err.message),code)
         end
         if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing
           ipc = { :unmark => [] }
           @dslr.__weel_positions.each{ |wp| ipc[:unmark] << wp }
           @dslr.__weel_positions.clear
-          @dslr.__weel_handlerwrapper::inform_position_change(@dslr.__weel_handlerwrapper_args,ipc)
+          @dslr.__weel_connectionwrapper::inform_position_change(@dslr.__weel_connectionwrapper_args,ipc)
           @dslr.__weel_state = :finished
         end
         if @dslr.__weel_state == :simulating
@@ -1104,8 +1131,12 @@ public
   # Stop the workflow execution
   def stop # {{{
     Thread.new do
-      @dslr.__weel_state = :stopping
-      @dslr.__weel_main.join if @dslr.__weel_main
+      if  @dslr.__weel_state == :running
+        @dslr.__weel_state = :stopping
+        @dslr.__weel_main.join if @dslr.__weel_main
+      elsif @dslr.__weel_state == :ready || @dslr.__weel_state == :stopped
+        @dslr.__weel_state = :stopped
+      end
     end
   end # }}}
   # Start the workflow execution
@@ -1117,7 +1148,7 @@ public
       rescue => e
         puts e.message
         puts e.backtrace
-        handlerwrapper::inform_handlerwrapper_error handlerwrapper_args, e
+        connectionwrapper::inform_connectionwrapper_error connectionwrapper_args, e
       end
     end
   end # }}}

data/test/{SimHandlerWrapper.rb → SimConnectionWrapper.rb}

@@ -1,13 +1,13 @@
 # Apache License, Version 2.0
-# 
+#
 # Copyright (c) 2013 Juergen Mangler
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,18 +15,18 @@
 # limitations under the License.
 
 ######
-# ADVENTURE Simulation Trace Generator Handler Wrapper
+# ADVENTURE Simulation Trace Generator Connection Wrapper
 ######
 
 module TraceBasics #{{{
   def <<(item)
     @elements << item
-    item.parent = self  
+    item.parent = self
   end
   def each
     @elements.each do |ele|
       yield ele
-    end  
+    end
   end
 end #}}}
 
@@ -42,11 +42,11 @@ class Trace #{{{
   end
   def recursive_get_container(container,tid)
     return container if container.respond_to?(:tid) and container.tid == tid
-    container.each do |ele| 
+    container.each do |ele|
       if ele.kind_of?(TraceContainer)
-        ret = recursive_get_container(ele,tid) 
+        ret = recursive_get_container(ele,tid)
         return ret unless ret.nil?
-      end  
+      end
     end
     nil
   end
@@ -79,7 +79,7 @@ class Trace #{{{
           tmp = recursive_generate_list(ele,options)
           add_traces(traces,tmp)
           options[:otherwise] = true
-      end  
+      end
     end
     traces
   end
@@ -137,7 +137,7 @@ class TraceChoose < TraceContainer
   def initialize(tid,mode)
     super tid
     @mode = mode
-  end  
+  end
 end
 class TraceAlternative < TraceContainer; end
 class TraceOtherwise < TraceContainer; end
@@ -145,10 +145,10 @@ class TraceOtherwise < TraceContainer; end
 class PlainTrace
   def initialize
     @container
-  end  
+  end
 end
 
-class SimHandlerWrapper < WEEL::HandlerWrapperBase
+class SimConnectionWrapper < WEEL::ConnectionWrapperBase
   def initialize(args,endpoint=nil,position=nil,continue=nil)
     @__myhandler_stopped = false
     @__myhandler_position = position
@@ -172,19 +172,19 @@ class SimHandlerWrapper < WEEL::HandlerWrapperBase
           clast = $trace.get_container(parent)
           until clast.kind_of?(TraceParallel)
             clast = clast.parent
-          end  
+          end
           clast << TraceParallelBranch.new(tid,parent)
         else
           clast = $trace.get_container(tid)
           clast.close! if clast.open?
-        end  
+        end
       when :choose
         simulate_add_to_container($trace,nesting,parent,tid) { TraceChoose.new(tid,parameters[:mode]) }
       when :alternative
         simulate_add_to_container($trace,nesting,parent,tid) { TraceAlternative.new(tid) }
       when :otherwise
         simulate_add_to_container($trace,nesting,parent,tid) { TraceOtherwise.new(tid) }
-    end  
+    end
   end
 
   private
@@ -196,7 +196,7 @@ class SimHandlerWrapper < WEEL::HandlerWrapperBase
       else
         clast = trace.get_container(tid)
         clast.close! if clast.open?
-      end  
+      end
     end #}}}
 
 end

data/test/{TestHandlerWrapper.rb → TestConnectionWrapper.rb}

@@ -1,4 +1,4 @@
-class TestHandlerWrapper < WEEL::HandlerWrapperBase
+class TestConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::inform_state_change(arguments,newstate)
     $long_track += "---> STATE #{newstate}\n"
     $short_track << "|#{newstate}|"
@@ -8,7 +8,7 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
     $short_track << "E"
     raise(err)
   end
-  def self::inform_handlerwrapper_error(arguments,err)
+  def self::inform_connectionwrapper_error(arguments,err)
     $long_track += "HW ERROR: #{err}\n"
     $short_track << "E"
   end

data/test/TestWorkflow.rb

@@ -1,9 +1,9 @@
 require File.expand_path(::File.dirname(__FILE__) + '/../lib/weel')
 require File.expand_path(::File.dirname(__FILE__) + '/TestMixin')
-require File.expand_path(::File.dirname(__FILE__) + '/TestHandlerWrapper')
+require File.expand_path(::File.dirname(__FILE__) + '/TestConnectionWrapper')
 
 class TestWorkflow < WEEL
-  handlerwrapper TestHandlerWrapper
+  connectionwrapper TestConnectionWrapper
 
   endpoint :endpoint1 => 'http://www.heise.de'
   endpoint :stop => 'stop it'

data/test/basic/tc_handler.rb

@@ -6,14 +6,14 @@ class TestCaseHandler < Test::Unit::TestCase
 
   def test_handler
     assert_raise RuntimeError do
-      @wf.handlerwrapper = String
+      @wf.connectionwrapper = String
     end
     assert_nothing_raised do
-      @wf.handlerwrapper = TestHandlerWrapper
+      @wf.connectionwrapper = TestConnectionWrapper
     end
   end
   def test_handlerargs
-    @wf.handlerwrapper_args =  ["1", "2"]
-    assert(@wf.handlerwrapper_args.is_a?(Array), "Handler arguments is not an array, it is a #{@wf.handlerwrapper_args.inspect}")
+    @wf.connectionwrapper_args =  ["1", "2"]
+    assert(@wf.connectionwrapper_args.is_a?(Array), "Handler arguments is not an array, it is a #{@wf.connectionwrapper_args.inspect}")
   end
 end

data/weel.gemspec

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.94
+  version: 1.99.99
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Gerhard Stuermer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -45,8 +45,8 @@ files:
 - lib/weel.rb
 - test/ContinueTest.rb
 - test/README
-- test/SimHandlerWrapper.rb
-- test/TestHandlerWrapper.rb
+- test/SimConnectionWrapper.rb
+- test/TestConnectionWrapper.rb
 - test/TestMixin.rb
 - test/TestWorkflow.rb
 - test/basic/tc_choose.rb
@@ -86,7 +86,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -101,17 +101,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)
 test_files:
-- test/TestHandlerWrapper.rb
 - test/test
 - test/ContinueTest.rb
 - test/TestWorkflow.rb
 - test/TestMixin.rb
-- test/SimHandlerWrapper.rb
+- test/TestConnectionWrapper.rb
+- test/SimConnectionWrapper.rb
 - test/README
 - test/wfp_iteration/tc_structuredloop.rb
 - test/wfp_adv_branching/tc_structured_partial_join.rb