weel 1.99.123 → 1.99.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b3b0d940b57bff46c012f46466be8cbd1188de768e10cc8815f597d0ec2045
-  data.tar.gz: 7cceda505453b4610f79c01d3b38a55d99cf861119d00059b744f2e53ce6be6b
+  metadata.gz: 6838b35c90188d87942d5f17b1d7c37a833a6918cbd6b3701094b4c7c5197213
+  data.tar.gz: '08e6930846e12ead9eb55fd3de58a6bce02aa6105f92b768a9b24421c1067b4f'
 SHA512:
-  metadata.gz: d9691c2f36e38b8552f6c22cd774c7d7920adb9511f5fd9e9838ba9b5f03f00624dfc461d97a2551a76ea3f5c4732e7d70ae6c7ef84a8b9c0ce95992c617f153
-  data.tar.gz: 0565f1fd91b28309fe38343332a423aff7d6f123387f671616fc320cb6dae9edd91051a43bbaf0241e791ef3efd6ae2377c254d2fa1ff40069327bd3f517ec4c
+  metadata.gz: a3e4470dd2868f1f7a5ab2d2ded5339d42330c1cd2ec239a63c9be589d6c64faf284ddaf3d891abac67669c637702041ee600685e21f3461680a2c9fb3dbe554
+  data.tar.gz: d7ee1c97b9e3169fb1acf19dc1ca84abdd5fc5de35f4ded4f9ccdfbb959c3747a9e6697ca9071c79000a3a6520a8d3df4f9bf1316735469751c59fbc62d9e915

data/lib/weel.rb

@@ -66,10 +66,6 @@ class WEEL
         'data' => @__weel_data,
         'endpoints' => @__weel_endpoints,
         'additional' => @additional,
-        'status' => {
-          'id' => @__weel_status.id,
-          'message' => @__weel_status.message
-        }
       }.to_json(*a)
     end
 
@@ -94,9 +90,6 @@ class WEEL
       e.each do |k,v|
         endpoints.send(k+'=',v)
       end if e
-      if s
-        status.update(s['id'],s['message'])
-      end
     end
     def data
       ReadHash.new(@__weel_data)
@@ -298,43 +291,6 @@ class WEEL
     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
     def initialize(code)
@@ -376,7 +332,7 @@ class WEEL
     def callback(result=nil,options={}); end
     def mem_guard; end
 
-    def prepare(readonly, endpoints, parameters); parameters; end
+    def prepare(lock,dataelements,endpoints,status,local,additional,code,exec_endpoints,exec_parameters); end
     def test_condition(dataelements,endpoints,local,additional,code,args={}); ReadStructure.new(dataelements,endpoints,local,additional).instance_eval(code); end
     def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil)
       lock.synchronize do
@@ -762,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
@@ -780,6 +726,10 @@ 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)
@@ -881,13 +831,7 @@ class WEEL
           when :call
             again = catch Signal::Again do
               connectionwrapper.mem_guard
-              struct = if prepare
-                connectionwrapper.manipulate(true,@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,prepare,'Activity ' + position.to_s)
-              else
-                # just the read structure, no code exec necessary
-                ReadStructure.new(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional)
-              end
-              params = connectionwrapper.prepare(struct,endpoint,parameters)
+              params = connectionwrapper.prepare(@__weel_lock,@__weel_data,@__weel_endpoints,@__weel_status,Thread.current[:local],connectionwrapper.additional,prepare,endpoint,parameters)
 
               raise Signal::Stop unless connectionwrapper.vote_sync_before(params)
               raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
@@ -918,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
@@ -931,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(

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.123"
+  s.version          = "1.99.125"
   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.123
+  version: 1.99.125
 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