weel 1.99.122 → 1.99.124

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a667f015c959147b33b0acab3119502d4f62b1b5785836f236819324e9fa2bd
-  data.tar.gz: a68fc1c9c3a04525b18faca8cd0b9de14c2863746a8b5a010933108a13e9e675
+  metadata.gz: de93809f2b1350265c3745e9a31be9ea2c7a6fbd2de4b6c282070e4393138684
+  data.tar.gz: 2df4b7700721362353934d54f1a223d4413374b6e6dd54efe5d92ed1fcfac9e8
 SHA512:
-  metadata.gz: '09dd1a1407dd46e8361b6d80266c81298503eb67369462db4120405b8a3497fd658a0bd4cf9f5002690b595494ef23597a84090cd7dcfb03b80e106af7444e90'
-  data.tar.gz: 6fd1dac78629fe28677b0d5fd35ae0d1d802787a1113c6cc765fd8b9d5814c61c6bdf53bf69a188dd9331ed7b2efeb625866c1f49a65ada4579b23bc6fae0731
+  metadata.gz: e5f1e42552289504e1c9bb97c8068948cb0c8b7c839d830da987a442956fb0ecf8103f6a59426c324c805f14cde8fdf6b3424e57cdbda78b33f20312374f269a
+  data.tar.gz: a6bc3fccb1595040956763c938f179bd894422c196ce06e24fe5d0dea54bb81eb6f25c892a8c56c299ca0005ec958176de0fa95b76abee5526f57e78f42d1b95

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)
@@ -105,8 +98,9 @@ class WEEL
       ReadHash.new(@__weel_endpoints)
     end
     def local
-      @__weel_local.first
+      @__weel_local&.first
     end
+    attr_reader :additional
   end # }}}
   class ManipulateStructure # {{{
     def initialize(data,endpoints,status,local,additional)
@@ -195,11 +189,12 @@ class WEEL
       ManipulateHash.new(@__weel_endpoints,@touched_endpoints,@changed_endpoints)
     end
     def local
-      @__weel_local.first
+      @__weel_local&.first
     end
     def status
       @__weel_status
     end
+    attr_reader :additional
   end # }}}
   class ManipulateHash # {{{
     attr_reader :__weel_touched, :__weel_changed
@@ -295,7 +290,6 @@ class WEEL
       end
     end
   end # }}}
-
   class ReadOnlyHash # {{{
     def initialize(values)
       @__weel_values = values.transform_values do |v|
@@ -333,6 +327,13 @@ class WEEL
     end
   end # }}}
 
+  class ProcString #{{{
+    attr_reader :code
+    def initialize(code)
+      @code = code
+    end
+  end #}}}
+
   class ConnectionWrapperBase # {{{
     def self::loop_guard(arguments,lid,count); false; end
     def self::inform_state_change(arguments,newstate); end
@@ -342,7 +343,6 @@ class WEEL
 
     def initialize(arguments,position=nil,continue=nil); end
 
-    def prepare(readonly, endpoints, parameters); parameters; end
     def additional; {}; end
 
     def activity_handle(passthrough, parameters); end
@@ -368,8 +368,8 @@ class WEEL
     def callback(result=nil,options={}); end
     def mem_guard; 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 eval_expression(dataelements,endpoints,local,additional,code); 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
         if readonly
@@ -492,7 +492,7 @@ class WEEL
     attr_reader :__weel_state, :__weel_status, :__weel_status
 
     # DSL-Construct for translating expressions into static parameters
-    def 🠊(code); __weel_eval_expression(code); end
+    def 🠊(code); ProcString.new(code); end
 
     # DSL-Constructs for atomic calls to external services (calls) and pure context manipulations (manipulate).
     # Calls can also manipulate context (after the invoking the external services)
@@ -795,22 +795,6 @@ class WEEL
       end
     end #}}}
 
-    def __weel_eval_expression(expression) #{{{
-      begin
-        connectionwrapper = @__weel_connectionwrapper.new @__weel_connectionwrapper_args
-        connectionwrapper.eval_expression(@__weel_data,@__weel_endpoints,Thread.current[:local],connectionwrapper.additional,expression)
-      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_expression: `#{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)
-        nil
-      end
-    end #}}}
-
     def __weel_progress(position, uuid, skip=false) #{{{
       ipc = {}
       branch = Thread.current
@@ -889,13 +873,8 @@ 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
 

data/weel.gemspec

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