weel 1.99.124 → 1.99.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de93809f2b1350265c3745e9a31be9ea2c7a6fbd2de4b6c282070e4393138684
-  data.tar.gz: 2df4b7700721362353934d54f1a223d4413374b6e6dd54efe5d92ed1fcfac9e8
+  metadata.gz: 60a41686ed63dd69b44c606cc695cfe066d47b7abc183cdd21404307b985895e
+  data.tar.gz: dbe0042ffcb494fbba0ec4a56b0a1c4e6943e97c99a954edea19d16be69a0589
 SHA512:
-  metadata.gz: e5f1e42552289504e1c9bb97c8068948cb0c8b7c839d830da987a442956fb0ecf8103f6a59426c324c805f14cde8fdf6b3424e57cdbda78b33f20312374f269a
-  data.tar.gz: a6bc3fccb1595040956763c938f179bd894422c196ce06e24fe5d0dea54bb81eb6f25c892a8c56c299ca0005ec958176de0fa95b76abee5526f57e78f42d1b95
+  metadata.gz: 5147adca88e3b08f54d972d39a625b1e12f360be7475799324f84029492d8c1b4912e43a700ad142fe4e349f86507642cd55ed8e22aedb5e74733eb01a1b6678
+  data.tar.gz: 543e59f9b75781ac2d87930584fb84032a991e5157dd18a549946ac9c222046ba44c74bae8f76b21138bef46c4a795694cdb3617a47cbe69ce2d0cbf671df7eb

data/lib/weel.rb

@@ -290,42 +290,6 @@ class WEEL
       end
     end
   end # }}}
-  class ReadOnlyHash # {{{
-    def initialize(values)
-      @__weel_values = values.transform_values do |v|
-        if Object.const_defined?(:XML) && XML.const_defined?(:Smart) && v.is_a?(XML::Smart::Dom)
-          v.root.to_doc
-        else
-          begin
-            Marshal.load(Marshal.dump(v))
-          rescue
-            v.to_s rescue nil
-          end
-        end
-      end
-    end
-
-    def to_json(*args)
-      @__weel_values.to_json(*args)
-    end
-
-    def method_missing(name,*args)
-      if args.empty? && @__weel_values.key?(name)
-        @__weel_values[name]
-      elsif args.empty? && @__weel_values.key?(name.to_s)
-        @__weel_values[name.to_s]
-      elsif name.to_s[-1..-1] == "=" && args.length == 1
-        temp = name.to_s[0..-2]
-        @__weel_values[temp.to_sym] = args[0]
-      elsif name.to_s == "[]=" && args.length == 2
-        @__weel_values[args[0]] = args[1]
-      elsif name.to_s == "[]" && args.length == 1
-        @__weel_values[args[0]]
-      else
-        nil
-      end
-    end
-  end # }}}
 
   class ProcString #{{{
     attr_reader :code
@@ -563,11 +527,11 @@ class WEEL
     end # }}}
 
     # Defines a branch of a parallel-Construct
-    def parallel_branch(*vars,&block)# {{{
+    def parallel_branch(data=@__weel_data,&block)# {{{
       return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
       branch_parent = Thread.current
 
-      branch_parent[:branches] << Thread.new(*vars) do |*local|
+      branch_parent[:branches] << Thread.new(data) do |*local|
         Thread.current.abort_on_exception = true
         Thread.current[:branch_search] = @__weel_search_positions.any?
         Thread.current[:branch_parent] = branch_parent
@@ -754,16 +718,6 @@ class WEEL
       self.__weel_state = :stopping
     end #}}}
 
-    def status # {{{
-      @__weel_status
-    end # }}}
-    def data # {{{
-      ReadOnlyHash.new(@__weel_data)
-    end # }}}
-    def endpoints # {{{
-      ReadHash.new(@__weel_endpoints)
-    end # }}}
-
   private
     def __weel_protect_yield(*local) #{{{
       begin
@@ -772,9 +726,13 @@ class WEEL
         self.__weel_state = :stopping
         @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
+      rescue WEEL::Signal::Error => err
+        self.__weel_state = :stopping
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,err,nil)
+        nil
       rescue => err
         self.__weel_state = :stopping
-        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new(err.message),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,err,nil)
         nil
       end
     end #}}}
@@ -786,11 +744,11 @@ class WEEL
       rescue NameError => err # don't look into it, or it will explode
         # if you access $! here, BOOOM
         self.__weel_state = :stopping
-        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("eval_condition: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new("protect_yield: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),nil)
         nil
       rescue => err
         self.__weel_state = :stopping
-        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,Exception.new(err.message),nil)
+        @__weel_connectionwrapper::inform_syntax_error(@__weel_connectionwrapper_args,err,nil)
         nil
       end
     end #}}}
@@ -904,12 +862,12 @@ class WEEL
 
                 next if waitingresult == WEEL::Signal::UpdateAgain && connectionwrapper.activity_result_value&.length == 0
 
-                code = if waitingresult == WEEL::Signal::UpdateAgain
-                  update
+                code, cmess = if waitingresult == WEEL::Signal::UpdateAgain
+                  [update, 'update']
                 elsif waitingresult == WEEL::Signal::Salvage
-                  salvage || raise('HTTP Error. The service return status was not between 200 and 300.')
+                  [salvage, 'salvage'] || raise('HTTP Error. The service return status was not between 200 and 300.')
                 else
-                  finalize
+                  [finalize, 'finalize']
                 end
                 if code.is_a?(String)
                   connectionwrapper.inform_activity_manipulate
@@ -917,7 +875,7 @@ class WEEL
 
                   # when you throw without parameters, ma contains nil, so we return Signal::Proceed to give ma a meaningful value in other cases
                   ma = catch Signal::Again do
-                    struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
+                    struct = connectionwrapper.manipulate(false,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,code,'Activity ' + position.to_s + ' ' + cmess,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
                     Signal::Proceed
                   end
                   connectionwrapper.inform_manipulate_change(
@@ -1131,13 +1089,13 @@ public
           end
         rescue SyntaxError => se
           @dslr.__weel_state = :stopping
-          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new(se.message),code)
+          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,se,code)
         rescue NameError => err # don't look into it, or it will explode
           @dslr.__weel_state = :stopping
           @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new("main: `#{err.name}` is not a thing that can be used. Maybe it is meant to be a string and you forgot quotes?"),code)
         rescue => err
           @dslr.__weel_state = :stopping
-          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,Exception.new(err.message),code)
+          @dslr.__weel_connectionwrapper::inform_syntax_error(@dslr.__weel_connectionwrapper_args,err,code)
         end
         if @dslr.__weel_state == :running || @dslr.__weel_state == :finishing
           ipc = { :unmark => [] }

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.124"
+  s.version          = "1.99.126"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   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.124
+  version: 1.99.126
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit