weel 1.99.83 → 1.99.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05367a0dcc8066aeb8180358efed5612c976b7b97e5ea8f5047a83bc482de8ff
-  data.tar.gz: 87a40bbb853caf454d43a8632e9d2535b4cdcfab040bf2490095dbdcbea2123f
+  metadata.gz: d75c73b084f3926403dc8938f27a1295d7a36d7ccd2299f5eff2af075808da24
+  data.tar.gz: d3d5d52b613217a031392c740442bbe6a6d16d64b38b668dca8d15035a86a078
 SHA512:
-  metadata.gz: b90f1b6a44a0ef9e47a60a8cd1da7f904691377859fd7aab2bcf19b100e1de7eea1534235944060b5101f6836c7c307e868db8828b26cbc9b5363dbb6d10012e
-  data.tar.gz: '077059c2ad549cf6bb0debe569c9bed27b94c5e02c248a0b8662b457c014d726b38924b593b5005abf29dee60cb7b7de164dabcdabb6893ab39c6496319b2634'
+  metadata.gz: 710def978b14664c463ea6e87bb88179b2cc2aa01429fa908142b202b75e2ea8831eacd663573252ec5ff9e0dd54e534b965c5033dc68dc675aa3fe7543a32ca
+  data.tar.gz: 34d4be7d47e4c2ffd243fb1d216c98387de56058dc20bb827085d56dc3e3f08899f1b7bd9ee9d67d39e418ce2b0907f4ccf901ef0484f6d2940d2565bc5ba285

data/lib/weel.rb

@@ -15,6 +15,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'thread'
+require 'securerandom'
 
 class WEEL
   def initialize(*args)# {{{
@@ -59,12 +60,17 @@ class WEEL
       @additional = additional
     end
 
-    def method_missing(m,args,&block)
-      if @additional.exists?(m)
+    def method_missing(m,*args,&block)
+      if @additional.include?(m)
         begin
-          Marshal.load(Marshal.dump(@aditional[m]))
+          tmp = Marshal.load(Marshal.dump(@additional[m]))
+          if tmp.is_a? Hash
+            ReadHash.new(tmp)
+          else
+            tmp
+          end
         rescue
-          v.to_s rescue nil
+          m.to_s rescue nil
         end
       end
     end
@@ -90,12 +96,17 @@ class WEEL
       @additional = additional
     end
 
-    def method_missing(m,args,&block)
-      if @additional.exists?(m)
+    def method_missing(m,*args,&block)
+      if @additional.include?(m)
         begin
-          Marshal.load(Marshal.dump(@aditional[m]))
+          tmp = Marshal.load(Marshal.dump(@additional[m]))
+          if tmp.is_a? Hash
+            ReadHash.new(tmp)
+          else
+            tmp
+          end
         rescue
-          v.to_s rescue nil
+          m.to_s rescue nil
         end
       end
     end
@@ -227,6 +238,7 @@ class WEEL
   end # }}}
 
   class HandlerWrapperBase # {{{
+    def self::loop_guard(lid,count); false; end
     def self::inform_state_change(arguments,newstate); end
     def self::inform_syntax_error(arguments,err,code); end
     def self::inform_handlerwrapper_error(arguments,err); end
@@ -278,7 +290,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
@@ -287,6 +299,12 @@ class WEEL
     def to_json(*args)
       as_json.to_json(*args)
     end
+    def eql?(other)
+      to_s == other.to_s
+    end
+    def hash
+      to_s.hash
+    end
   end # }}}
 
    class Continue # {{{
@@ -574,15 +592,21 @@ class WEEL
         __weel_sim_stop(:loop,hw,pos,args.merge(:testing=>condition[1],:condition=>cond))
         return
       end
+      loop_guard = 0
+      loop_id = SecureRandom.uuid
       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
+              loop_guard += 1
               __weel_protect_yield(&block)
+              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
             end
           when :post_test
             begin
+              loop_guard += 1
               __weel_protect_yield(&block)
+              sleep 1 if @__weel_handlerwrapper::loop_guard(@__weel_handlerwrapper_args,loop_id,loop_guard)
             end while __weel_eval_condition(condition[0]) && self.__weel_state != :stopping && self.__weel_state != :stopped && self.__weel_state != :finishing
         end
       end
@@ -659,24 +683,27 @@ 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
+      ipc[:unmark].uniq!
+
       @__weel_positions << wp
       Thread.current[:branch_position] = wp
 
@@ -770,7 +797,7 @@ class WEEL
                   if self.__weel_state == :stopping || self.__weel_state == :finishing
                     handlerwrapper.activity_stop
                     wp.passthrough = handlerwrapper.activity_passthrough_value
-                    raise Signal::Proceed
+                    raise Signal::Proceed if wp.passthrough # if stop, but no passthrough, let manipulate happen and then stop
                   end
 
                   code = if waitingresult == WEEL::Signal::Again
@@ -900,7 +927,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,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.83"
+  s.version          = "1.99.90"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Workflow Execution Engine Library (WEEL)"
 
   s.description      = "see http://cpee.org"
 
-  s.required_ruby_version = '>=2.6.0'
+  s.required_ruby_version = '>=2.5.0'
 
   s.files            = Dir['{example/**/*,lib/weel.rb}'] + %w(COPYING Changelog FEATURES INSTALL Rakefile weel.gemspec README.md AUTHORS)
   s.require_path     = 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.83
+  version: 1.99.90
 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-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="