weel 1.99.70 → 1.99.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0747682705e0b3fc0480a1453ec3d9eb384cbfe3c5efe0fe8c54252f25d8b3
-  data.tar.gz: 05fb3d2130621def8028235bf368bac843af93edad483755d96b9dd7188cb345
+  metadata.gz: 2dc2c88d480b5299d495afce0adfaeff05e082d52a11be513365f7b5968fd9a7
+  data.tar.gz: 9c8e93373ba216e2554e15cf80f4658615700f02a8f9b1264e9fa067d507e894
 SHA512:
-  metadata.gz: fa801199b59a79e88e8c3f3fc554cb35fda18609eb7ad5415a6822eee9477e6a5b68f882cb013004d9d76fc6cfe8e048abfec0f44fdb8f73d4022101349d037c
-  data.tar.gz: c6538dde3e220125181620a59a40c4fa494037be711fdde99d538ad781afcccf7d91e642640d0604246bb4267a2e6c4ff3ea76fbfe0c3129db87cb2bbd30be29
+  metadata.gz: 3cda29ab7590661e3cd8e666f2b5a5d3e7b30af34baf7385a2877dd4ac4033b31ac7c49bb8f9c5176e9bc53e8be0693ad3facd29f5de8439d0ea688ddc4ae4ab
+  data.tar.gz: aae4ee0f1e624ce92254cf451177fffabf6ebb9b4aa76d04ced9ba4c1e037db79d7ec5cafaffe1c9236eaa632ed8bd7d0b5cae83be95cb418ec45df3a9ab8e59

data/lib/weel.rb

@@ -215,6 +215,7 @@ class WEEL
     def self::inform_syntax_error(arguments,err,code); end
     def self::inform_handlerwrapper_error(arguments,err); end
     def self::inform_position_change(arguments,ipc); end
+    def self::modify_position_details(arguments); end
 
     def initialize(arguments,endpoint=nil,position=nil,continue=nil); end
 
@@ -256,6 +257,17 @@ class WEEL
       @detail = detail
       @passthrough = passthrough
     end
+    def as_json(*)
+      jsn = { 'position' => @position }
+      jsn['passtrough'] = @passthrough if @passthrough
+      jsn
+    end
+    def to_s
+      as_json.to_s
+    end
+    def to_json(*args)
+      as_json.to_json(*args)
+    end
   end # }}}
 
    class Continue # {{{
@@ -449,7 +461,7 @@ class WEEL
             @__weel_positions.delete Thread.current[:branch_position]
             begin
               ipc = {}
-              ipc[:unmark] = [Thread.current[:branch_position].position]
+              ipc[:unmark] = [Thread.current[:branch_position]]
               @__weel_handlerwrapper::inform_position_change(@__weel_handlerwrapper_args,ipc)
             end rescue nil
             Thread.current[:branch_position] = nil
@@ -624,21 +636,21 @@ class WEEL
       ipc = {}
       if searchmode == :after
         wp = WEEL::Position.new(position, :after, nil)
-        ipc[:after] = [wp.position]
+        ipc[:after] = [wp]
       else
         if Thread.current[:branch_parent] && Thread.current[:branch_parent][:branch_position]
           @__weel_positions.delete Thread.current[:branch_parent][:branch_position]
           ipc[:unmark] ||= []
-          ipc[:unmark] << Thread.current[:branch_parent][:branch_position].position rescue nil
+          ipc[:unmark] << Thread.current[:branch_parent][:branch_position] rescue nil
           Thread.current[:branch_parent][:branch_position] = nil
         end
         if Thread.current[:branch_position]
           @__weel_positions.delete Thread.current[:branch_position]
           ipc[:unmark] ||= []
-          ipc[:unmark] << Thread.current[:branch_position].position rescue nil
+          ipc[:unmark] << Thread.current[:branch_position] rescue nil
         end
         wp = WEEL::Position.new(position, skip ? :after : :at, nil)
-        ipc[skip ? :after : :at] = [wp.position]
+        ipc[skip ? :after : :at] = [wp]
       end
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
@@ -691,7 +703,7 @@ class WEEL
               )
               handlerwrapper.inform_activity_done
               wp.detail = :after
-              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp.position]
+              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
             end
           when :call
             params = { }
@@ -727,6 +739,9 @@ class WEEL
 
             handlerwrapper.activity_handle passthrough, params
             wp.passthrough = handlerwrapper.activity_passthrough_value
+            unless wp.passthrough.nil?
+              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :wait => [wp]
+            end
             begin
               # with loop if catching Signal::Again
               # handshake call and wait until it finished
@@ -770,8 +785,9 @@ class WEEL
             end while waitingresult == Signal::Again
             if handlerwrapper.activity_passthrough_value.nil?
               handlerwrapper.inform_activity_done
+              wp.passthrough = nil
               wp.detail = :after
-              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp.position]
+              @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :after => [wp]
             end
         end
         raise Signal::Proceed
@@ -784,7 +800,7 @@ class WEEL
         @__weel_positions.delete wp
         Thread.current[:branch_position] = nil
         wp.detail = :unmark
-        @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :unmark => [wp.position]
+        @__weel_handlerwrapper::inform_position_change @__weel_handlerwrapper_args, :unmark => [wp]
       rescue Signal::StopSkipManipulate, Signal::Stop
         self.__weel_state = :stopping
       rescue Signal::Skip
@@ -1007,7 +1023,7 @@ public
         end
         if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing
           ipc = { :unmark => [] }
-          @dslr.__weel_positions.each{ |wp| ipc[:unmark] << wp.position }
+          @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_state = :finished

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.70"
+  s.version          = "1.99.71"
   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.70
+  version: 1.99.71
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit