weel 1.99.105 → 1.99.108

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36eb4b85ca61d7f3581ed326a038ded4e7efcebfb07df13f5d449d3e4b60784f
-  data.tar.gz: 655750bd2f7ba16c7951eb0d93c111f06788193120a445478108d16d6a9a35ac
+  metadata.gz: 511cda1fdaa0d79582c2a839872cbbadf5770d196cb447ef986b4c1700ca656b
+  data.tar.gz: 71e38ec4147d9407a93f2b36dfcd2963164f3f6dbc67a1686fbd10d4c5db30f2
 SHA512:
-  metadata.gz: 1e60b5ea0829d5507f61599a917473eaa51b4fe5fb7f786c377ee8005a2fcf6ae295875729c634588815e1ad76f0fb46058b332b5a0b55528b7030f6d911b7e5
-  data.tar.gz: ae3b62411608b8725e734900520e7a42d99559852d131f24609699b72cdbbfa6f2d845ddcfa17c4a03a9bf3ab906da8911c36c71cdf0d27d40189f40c85c84f9
+  metadata.gz: a925eb9537591d6e2f736fb240541106cc709e886058269d3b5037c95deb37b956dd0481b54d5a1940775791d932eab4c4ddd794118b913cae6782df8e681f4f
+  data.tar.gz: 0ed0009b0a88731e993afe4201e8a7460c529e9abc029548d72acb1f96a891d50dd00d2fba3944cabdf469f64746d47498a9fc15f038622bc1f7608915785a26

data/lib/weel.rb

@@ -43,7 +43,7 @@ class WEEL
   end # }}}
 
   class ReadStructure # {{{
-    def initialize(data,endpoints,additional)
+    def initialize(data,endpoints,local,additional)
       @__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
@@ -56,6 +56,7 @@ class WEEL
         end
       end
       @__weel_endpoints = endpoints.transform_values{ |v| v.dup }
+      @__weel_local = local
       @additional = additional
     end
 
@@ -91,14 +92,18 @@ class WEEL
     def endpoints
       ReadHash.new(@__weel_endpoints)
     end
+    def local
+      @__weel_local.first
+    end
   end # }}}
   class ManipulateStructure # {{{
-    def initialize(data,endpoints,status,additional)
+    def initialize(data,endpoints,status,local,additional)
       @__weel_data = data
       @__weel_data_orig = @__weel_data.transform_values{|val| Marshal.dump(val) } rescue nil
       @__weel_endpoints = endpoints
       @__weel_endpoints_orig = @__weel_endpoints.transform_values{|val| Marshal.dump(val) }
       @__weel_status = status
+      @__weel_local = local
       @changed_status = "#{status.id}-#{status.message}"
       @changed_data = []
       @touched_data = []
@@ -165,6 +170,9 @@ class WEEL
     def endpoints
       ManipulateHash.new(@__weel_endpoints,@touched_endpoints,@changed_endpoints)
     end
+    def local
+      @__weel_local.first
+    end
     def status
       @__weel_status
     end
@@ -325,6 +333,7 @@ class WEEL
 
     def activity_stop; end
     def activity_passthrough_value; end
+    def activity_uuid; '42424242-cpee-cpee-cpee-424242424242'; end
 
     def activity_no_longer_necessary; end
 
@@ -351,15 +360,16 @@ class WEEL
   end  # }}}
 
   class Position # {{{
-    attr_reader :position
+    attr_reader :position, :uuid
     attr_accessor :detail, :passthrough
-    def initialize(position, detail=:at, passthrough=nil) # :at or :after or :unmark
+    def initialize(position, uuid, detail=:at, passthrough=nil) # :at or :after or :unmark
       @position = position
       @detail = detail
+      @uuid = uuid
       @passthrough = passthrough
     end
     def as_json(*)
-      jsn = { 'position' => @position }
+      jsn = { 'position' => @position, 'uuid' => @uuid }
       jsn['passthrough'] = @passthrough if @passthrough
       jsn
     end
@@ -543,6 +553,7 @@ class WEEL
         Thread.current[:branch_status] = false
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
+        Thread.current[:local] = local
         Thread.current[:branch_wait_count_cancel_active] = false
         branch_parent[:mutex].synchronize do
           Thread.current[:branch_traces_id] = branch_parent[:branch_traces_ids]
@@ -727,7 +738,7 @@ class WEEL
         Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] << position
       end
 
-      __weel_progress position, true
+      __weel_progress position, 0, true
       self.__weel_state = :stopping
     end #}}}
 
@@ -759,7 +770,7 @@ class WEEL
     def __weel_eval_condition(condition) #{{{
       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,connectionwrapper.additional),condition)
+        condition.is_a?(Proc) ? condition.call : connectionwrapper.test_condition(ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional),condition)
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
@@ -772,7 +783,7 @@ class WEEL
       end
     end #}}}
 
-    def __weel_progress(position, skip=false) #{{{
+    def __weel_progress(position, uuid, skip=false) #{{{
       ipc = {}
       branch = Thread.current
       if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
@@ -788,9 +799,9 @@ 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
       ipc[skip ? :after : :at] = [wp]
 
@@ -830,7 +841,7 @@ class WEEL
           Thread.current[:branch_parent][:branch_traces][Thread.current[:branch_traces_id]] << position
         end
 
-        wp = __weel_progress position
+        wp = __weel_progress position, connectionwrapper.activity_uuid
 
         # searchmode position is after, jump directly to vote_sync_after
         raise Signal::Proceed if searchmode == :after
@@ -844,10 +855,10 @@ class WEEL
               connectionwrapper.activity_manipulate_handle(parameters)
               connectionwrapper.inform_activity_manipulate
               if finalize.is_a?(Proc)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                 mr.instance_eval(&finalize)
               elsif finalize.is_a?(String)
-                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                 connectionwrapper.manipulate(mr,finalize,'Activity ' + position.to_s)
               end
               connectionwrapper.inform_manipulate_change(
@@ -865,7 +876,7 @@ class WEEL
             begin
               again = catch Signal::Again do
                 connectionwrapper.mem_guard
-                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,connectionwrapper.additional)
+                rs = ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional)
                 if prepare
                   if prepare.is_a?(Proc)
                     rs.instance_exec(&prepare)
@@ -909,7 +920,7 @@ class WEEL
                   if code.is_a?(Proc) || code.is_a?(String)
                     connectionwrapper.inform_activity_manipulate
                     if code.is_a?(Proc)
-                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                       ma = catch Signal::Again do
                         case code.arity
                           when 1; mr.instance_exec(connectionwrapper.activity_result_value,&code)
@@ -920,7 +931,7 @@ class WEEL
                         '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,connectionwrapper.additional)
+                      mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional)
                       ma = catch Signal::Again do
                         connectionwrapper.manipulate(mr,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
                         'yes' # ma sadly will have nil when i just throw

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.105"
+  s.version          = "1.99.108"
   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.105
+  version: 1.99.108
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit