weel 1.99.47 → 1.99.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e512ed17d908d193bc911bbda62c98d86ba73637
-  data.tar.gz: adbf3510bf0fac7e91ea79e052dcd259a072b19f
+  metadata.gz: 647bf30b67c32ae612517fed9eb84b12ac1076c5
+  data.tar.gz: 0d3b5c2e3dc17d34aa2ab2bb4c6d1fcd120c3e3b
 SHA512:
-  metadata.gz: 40a4d4741e1eae8b1a0f494af2096cbe811b44c69289771e19c9072bf50567e1a754a0da846de306a4759deeee50dbdf091829b799a4b61d8e10c8cbe500ddb2
-  data.tar.gz: defb457c23b4d3470ca588ef4951aa03e05e8c7461d52201056fca69e6fd01738ea63de5b0216df8ca397c1da27ba6aa5237285d170f2be8a6d374eb289dc715
+  metadata.gz: 8fe3e4735f2c837f8ea27608af0c9f1895b8ed63475ae5f119b0e32dc022670400e06a8c8668b396644680b3bd6cf6e8ba3bc6c5ce9bcc5916ff13a141dfbb09
+  data.tar.gz: 521a8f632c9912a2e31ed9db3ef01414cd77f8f77f43ae6c1ff0339fdbe94ad9951b77d3eff64256429848f9791783e26dcdc291767b65b98dbfa14fa2910049

data/lib/weel.rb

@@ -331,7 +331,7 @@ class WEEL
 
       hw, pos = __weel_sim_start(:parallel) if __weel_sim
 
-      __weel_protect_yield &Proc.new
+      __weel_protect_yield(&Proc.new)
 
       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)
       1.upto Thread.current[:branches].size do
@@ -400,7 +400,7 @@ class WEEL
           handlerwrapper.simulate(:parallel_branch,:start,Thread.current[:branch_sim_pos],current_branch_sim_pos)
         end
 
-        __weel_protect_yield *local, &Proc.new
+        __weel_protect_yield(*local, &Proc.new)
 
         __weel_sim_stop(:parallel_branch,handlerwrapper,current_branch_sim_pos) if __weel_sim
 
@@ -435,7 +435,7 @@ class WEEL
       Thread.current[:alternative_executed] << false
       Thread.current[:alternative_mode] << mode
       hw, pos = __weel_sim_start(:choose,:mode => Thread.current[:alternative_mode].last) if __weel_sim
-      __weel_protect_yield &Proc.new
+      __weel_protect_yield(&Proc.new)
       __weel_sim_stop(:choose,hw,pos,:mode => Thread.current[:alternative_mode].last) if __weel_sim
       Thread.current[:alternative_executed].pop
       Thread.current[:alternative_mode].pop
@@ -476,7 +476,7 @@ class WEEL
         @__weel_critical_sections[id] = semaphore if id
       end
       semaphore.synchronize do
-        __weel_protect_yield &Proc.new
+        __weel_protect_yield(&Proc.new)
       end
     end # }}}
 
@@ -488,7 +488,7 @@ class WEEL
       return if self.__weel_state == :stopping || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       if __weel_is_in_search_mode
         catch :escape do
-          __weel_protect_yield &Proc.new
+          __weel_protect_yield(&Proc.new)
         end
         return if __weel_is_in_search_mode
       end
@@ -496,7 +496,7 @@ class WEEL
         cond = condition[0].is_a?(Proc) ? true : condition[0]
         hw, pos = __weel_sim_start(:loop,args.merge(:testing=>condition[1],:condition=>cond))
         catch :escape do
-          __weel_protect_yield &Proc.new
+          __weel_protect_yield(&Proc.new)
         end
         __weel_sim_stop(:loop,hw,pos,args.merge(:testing=>condition[1],:condition=>cond))
         return
@@ -505,11 +505,11 @@ class WEEL
         case condition[1]
           when :pre_test
             while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
-              __weel_protect_yield &Proc.new
+              __weel_protect_yield(&Proc.new)
             end
           when :post_test
             begin
-              __weel_protect_yield &Proc.new
+              __weel_protect_yield(&Proc.new)
             end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped
         end
       end
@@ -538,7 +538,7 @@ class WEEL
     def __weel_protect_yield(*local)
       begin
         yield(*local) if block_given?
-      rescue => err
+      rescue # => err # don't look into it, or it will explode
         self.__weel_state = :stopping
         @__weel_handlerwrapper::inform_syntax_error(@__weel_handlerwrapper_args,Exception.new("DSL error. I don't want to tell you where and why."),nil)
         nil
@@ -549,7 +549,7 @@ class WEEL
       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),condition)
-      rescue => err
+      rescue # => 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("Condition error. I don't want to tell you where and why."),nil)
@@ -916,7 +916,7 @@ public
           else
             @dslr.instance_eval(code)
           end
-        rescue Exception => err
+        rescue # => 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("DSL error. I don't want to tell you where and why."),code)
         end

data/test/TestHandlerWrapper.rb

@@ -1,4 +1,14 @@
 class TestHandlerWrapper < WEEL::HandlerWrapperBase
+  def self::inform_state_change(arguments,newstate)
+    $long_track += "---> STATE #{newstate}\n"
+    $short_track << "|#{newstate}|"
+  end
+  def self::inform_syntax_error(arguments,err,code)
+    $long_track += "ERROR: Syntax messed with error #{err}\n"
+    $short_track << "E"
+    raise(err)
+  end
+
   def initialize(args,endpoint=nil,position=nil,continue=nil)
     @__myhandler_stopped = false
     @__myhandler_position = position
@@ -9,7 +19,7 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
 
   # executes a ws-call to the given endpoint with the given parameters. the call
   # can be executed asynchron, see finished_call & return_value
-  def activity_handle(passthrough, parameters)
+  def activity_handle(passthrough, parameters) #{{{
     $long_track << "CALL #{@__myhandler_position}: passthrough=[#{passthrough}], endpoint=[#{@__myhandler_endpoint}], parameters=[#{parameters.inspect}]\n"
     $short_track << "C#{@__myhandler_position}"
 
@@ -23,7 +33,7 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
           @__myhandler_continue.continue WEEL::Signal::Again
           sleep 1
         end
-        @__myhandler_continue.continue 
+        @__myhandler_continue.continue
       end
       return
     end
@@ -32,70 +42,61 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
         parameters[:call].call
         @__myhandler_returnValue = parameters.has_key?(:result) ? parameters[:result] : 'Handler_Dummy_Result'
         @__myhandler_continue.continue
-      end   
-      # give nothing back 
+      end
+      # give nothing back
     else
       @__myhandler_returnValue = parameters.has_key?(:result) ? parameters[:result] : 'Handler_Dummy_Result'
       @__myhandler_continue.continue
-    end  
-  end
- 
+    end
+  end #}}}
+
   # returns the result of the last handled call
-  def activity_result_value
+  def activity_result_value #{{{
     @__myhandler_returnValue
-  end
+  end #}}}
   # Called if the WS-Call should be interrupted. The decision how to deal
   # with this situation is given to the handler. To provide the possibility
   # of a continue the Handler will be asked for a passthrough
-  def activity_stop
+  def activity_stop #{{{
     $long_track += "STOPPED #{@__myhandler_position}\n"
     $short_track << "S#{@__myhandler_position}"
     @t.exit if @t
     @__myhandler_stopped = true
-  end
+  end #}}}
   # is called from WEEL after stop_call to ask for a passthrough-value that may give
   # information about how to continue the call. This passthrough-value is given
   # to activity_handle if the workflow is configured to do so.
-  def activity_passthrough_value
+  def activity_passthrough_value #{{{
     "SOME passthrough"
-  end
+  end #}}}
 
   # Called if the execution of the actual activity_handle is not necessary anymore
   # It is definit that the call will not be continued.
   # At this stage, this is only the case if parallel branches are not needed
   # anymore to continue the workflow
-  def activity_no_longer_necessary
+  def activity_no_longer_necessary #{{{
     $long_track += "NO_LONGER_NECCESARY #{@__myhandler_position}\n"
     $short_track << "NLN#{@__myhandler_position}"
     @t.exit if @t
     @__myhandler_returnValue = "No longer necessary"
     @__myhandler_stopped = true
-  end
+  end #}}}
   # Is called if a Activity is executed correctly
-  def inform_activity_manipulate
+  def inform_activity_manipulate #{{{
     $long_track += "MANIPULATE #{@__myhandler_position}\n"
     $short_track << "M#{@__myhandler_position}"
-  end
+  end #}}}
   # Is called if a Activity is executed correctly
-  def inform_activity_done
+  def inform_activity_done #{{{
     $long_track += "DONE #{@__myhandler_position}\n"
     $short_track << "D#{@__myhandler_position}"
-  end
+  end #}}}
   # Is called if a Activity is executed with an error
-  def inform_activity_failed(err)
+  def inform_activity_failed(err) #{{{
     $long_track += "FAILED #{@__myhandler_position}: #{err}\n"
     $short_track << "F#{@__myhandler_position}"
     raise(err)
-  end
-  def inform_syntax_error(err,code)
-    $long_track += "ERROR: Syntax messed with error #{err}\n"
-    $short_track << "E"
-    raise(err)
-  end
-  def inform_state_change(newstate)
-    $long_track += "---> STATE #{newstate}\n"
-    $short_track << "|#{newstate}|"
-  end
+  end #}}}
 
   def manipulate(mr,code,result=nil,status=nil)
     mr.instance_eval(code)

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.47"
+  s.version          = "1.99.48"
   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.47
+  version: 1.99.48
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit