weel 1.99.85 → 1.99.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7f206a93ca278638856f8ab6b78fda00f60d3f4ef7edd4de39f3cbd815033f
-  data.tar.gz: 3d4aca5885e568a369da106911af21203f452168d94df137f5c7c28756314cae
+  metadata.gz: 26837244dc867c672c8999f93f835092edbe37c02a61d1aad43b0e9b4e9566bf
+  data.tar.gz: b929d66dc9050ad20a130412d219de79715e27b9bed2e2df9c0b67cbe4621471
 SHA512:
-  metadata.gz: fdef4e6efd51ca5e02802ccf7ec18a2d6e0c1170235c2ed4daf2ef42d04b4890f17cc222b0721abf210a169a7bfb2458ee95ab5f4776c33c896957c93de2c725
-  data.tar.gz: 94d63a774749ff47717a4d6d18c8f0b79a026f702a3d0640193a3d80d47a08c558603b2e4359ebd200fa084708e1a84da16d594c817b054dd346243d09195807
+  metadata.gz: a1e2c147083f56c6b2e1229414e118fe2387ed54cab963ae418c8e8b2142bfb7b70fced4fb1d731bc95e2093848fe79011242171c1cdcb469b3ffbe5880b3550
+  data.tar.gz: 59b6025af6e055145637abb28e988693e09c23771cf7f2747fd850dafe635db6c72f512a727320e0ff42fa4ba9218aee2ff30d9e816051a6cbb143b71eab4e01

data/lib/weel.rb

@@ -288,7 +288,7 @@ class WEEL
     end
     def as_json(*)
       jsn = { 'position' => @position }
-      jsn['passtrough'] = @passthrough if @passthrough
+      jsn['passthrough'] = @passthrough if @passthrough
       jsn
     end
     def to_s
@@ -669,24 +669,26 @@ class WEEL
 
     def __weel_progress(searchmode, position, skip=false) #{{{
       ipc = {}
-      if searchmode == :after
-        wp = WEEL::Position.new(position, :after, nil)
-        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] 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] rescue nil
-        end
-        wp = WEEL::Position.new(position, skip ? :after : :at, nil)
-        ipc[skip ? :after : :at] = [wp]
+      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] 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] rescue nil
       end
+      wp = WEEL::Position.new(position, skip ? :after : :at, nil)
+      ipc[skip ? :after : :at] = [wp]
+
+      @__weel_search_positions.each do |k,ele| # some may still be in active search but lets unmark them for good measure
+        ipc[:unmark] ||= []
+        ipc[:unmark] << ele
+        true
+      end
+
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
 
@@ -910,7 +912,7 @@ class WEEL
           branch = branch[:branch_parent]
           branch[:branch_search] = false
         end
-        @__weel_search_positions[position].detail == :after ? :after : false
+        @__weel_search_positions[position].detail == :after
       else
         branch[:branch_search] = true
       end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.85"
+  s.version          = "1.99.88"
   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.85
+  version: 1.99.88
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit