weel 1.99.109 → 1.99.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e376343e3c78f99b2493270370374a4302f89dea8d0a6f2b8458fb72b6ebf688
-  data.tar.gz: 5db57f52c74226550c86bf7e1c4dc83d891cf52b139b623a202216457c3d310a
+  metadata.gz: b06de4e72e80c63aa6cd62cb267e837823a6099ef8b100031eeb5e817f950ff2
+  data.tar.gz: f227674b5d4f22a49d6d96e823a618fc508e48e250a50dee08603d128d30d5f4
 SHA512:
-  metadata.gz: f0a3bef1073e2b3e253092f1cb46c48cf2153dcf7eaaade3b95c5bb23654ef3cb9d99f402b8eecaf485f5376fc6df0ddddae03f0ec0cf8cef493480c1d4a0afa
-  data.tar.gz: 5f1dc555fd6755c6736b500c67630653d7bd6e541a0c17a67471c094dd4c5c78be3a537dd639e4fb798153ad68079bc089a2acb9ada65db82a98a101fa4c030d
+  metadata.gz: 23321928b269cfb7358187d79e786fd6efef7b0ad4694b35d71af6f0e63f175a2228356ee8a781de4f64d106dc84d790c585a89468065ac37b07dd3cf60c550e
+  data.tar.gz: 8881323b085b5e928412476f21e5ebe5d2f5fd9a9da0f30c65d2da16643c88bd21507331d9ee6b097d99643d25aefa6882cc4a11eb7e4faf32cd4a32f2bc2460

data/lib/weel.rb

@@ -354,19 +354,19 @@ class WEEL
     def callback(result=nil,options={}); end
     def mem_guard; end
 
-    def test_condition(mr,code); mr.instance_eval(code); end
+    def test_condition(mr,code,args={}); mr.instance_eval(code); end
     def join_branches(branches); end
     def manipulate(mr,code,where,result=nil,options=nil); mr.instance_eval(code,where,1); end
   end  # }}}
 
   class Position # {{{
-    attr_reader :position
-    attr_accessor :detail, :passthrough, :uuid
-    def initialize(position, detail=:at, passthrough=nil) # :at or :after or :unmark
+    attr_reader :position, :uuid
+    attr_accessor :detail, :passthrough
+    def initialize(position, uuid, detail=:at, passthrough=nil) # :at or :after or :unmark
       @position = position
       @detail = detail
+      @uuid = uuid
       @passthrough = passthrough
-      @uuid = 0
     end
     def as_json(*)
       jsn = { 'position' => @position, 'uuid' => @uuid }
@@ -632,7 +632,7 @@ class WEEL
       Thread.current[:mutex].synchronize do
         return if Thread.current[:alternative_mode][-1] == :exclusive && Thread.current[:alternative_executed][-1] == true
         if (condition.is_a?(String) || condition.is_a?(Proc)) && !__weel_sim
-          condition = __weel_eval_condition(condition)
+          condition = __weel_eval_condition(condition, args)
         end
         Thread.current[:alternative_executed][-1] = true if condition
       end
@@ -692,7 +692,7 @@ class WEEL
       catch :escape do
         case condition[1]
           when :pre_test
-            while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
+            while __weel_eval_condition(condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
               loop_guard += 1
               __weel_protect_yield(&block)
               sleep 1 if @__weel_connectionwrapper::loop_guard(@__weel_connectionwrapper_args,loop_id,loop_guard)
@@ -702,7 +702,7 @@ class WEEL
               loop_guard += 1
               __weel_protect_yield(&block)
               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 && !Thread.current[:nolongernecessary]
+            end while __weel_eval_condition(condition[0],args) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing && !Thread.current[:nolongernecessary]
         end
       end
     end # }}}
@@ -729,6 +729,7 @@ class WEEL
     end #}}}
     def stop(position) #{{{
       searchmode = __weel_is_in_search_mode(position)
+
       return if searchmode
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
@@ -767,10 +768,10 @@ class WEEL
       end
     end #}}}
 
-    def __weel_eval_condition(condition) #{{{
+    def __weel_eval_condition(condition,args={}) #{{{
       begin
         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,Thread.current[:local],connectionwrapper.additional),condition)
+        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional),condition,args)
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
@@ -799,11 +800,10 @@ class WEEL
       end
       wp = if branch[:branch_search_now] == true
         branch[:branch_search_now] = false
-        WEEL::Position.new(position, skip ? :after : :at, @__weel_search_positions[position]&.passthrough)
+        WEEL::Position.new(position, uuid, skip ? :after : :at, @__weel_search_positions[position]&.passthrough)
       else
-        WEEL::Position.new(position, skip ? :after : :at)
+        WEEL::Position.new(position, uuid, skip ? :after : :at)
       end
-      wp.uuid = uuid
       ipc[skip ? :after : :at] = [wp]
 
       @__weel_search_positions.delete(position)
@@ -915,8 +915,6 @@ class WEEL
                     update
                   elsif waitingresult == WEEL::Signal::Salvage
                     salvage || raise('HTTP Error. The service return status was not between 200 and 300.')
-                  elsif waitingresult == WEEL::Signal::Stop
-                    self.__weel_state = :stopping
                   else
                     finalize
                   end

data/weel.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.109
+  version: 1.99.111
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)