weel 1.99.101 → 1.99.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 030dcffc555d0badc6c5c4a22538562c6a2f893b08dbccd48b7b9c5553810e10
-  data.tar.gz: f368fadc1a33b23e20216f01f329a28faac6dacdb32b928186aa3b4e18a636e4
+  metadata.gz: 7bc4118f9af75b1f635758821fc31af172b7f02151bc0a05902999123885754d
+  data.tar.gz: '09c0d3b3de4f1810ed59e4debc90a8f734fa3cdf634bd623eb79a75191ece2bf'
 SHA512:
-  metadata.gz: c2eb9d5daca03086f6b2029fe20a334fab264b1f145b91261027ff7bd6e546c77611709721a074d0e3f7348b48558fa144228fe85f97f9cf3b50010035058451
-  data.tar.gz: 28d6afad61ba96bbf89b23cbfe0c7ddfb276c25abc05ef280b6d6a1a5c93448a6edff9bcc6be68aeba9ee4ead0db7345cb681b07ced26e3ca84930b0a73bcfa2
+  metadata.gz: 0b0d10b86028537026755946a1dc5969ed5b9fb93b10a5a914f09f7cf3d2343f52d5f0875dc2caffa757eb62cdce0414511b0f90514ae6854b9a812583ebfa1d
+  data.tar.gz: a3754737a7bab106885e47cfe7968ee0ed2fbc8db637f08aad6ed35dba102cb71d171618da98e1cb99c35ab23adb430f2425aa7f99a0f74b83db4d677b6fe019

data/lib/weel.rb

@@ -59,6 +59,18 @@ class WEEL
       @additional = additional
     end
 
+    def to_json(*a)
+      {
+        'data' => @__weel_data,
+        'endpoints' => @__weel_endpoints,
+        'additional' => @additional,
+        'status' => {
+          'id' => @__weel_status.id,
+          'message' => @__weel_status.message
+        }
+      }.to_json(*a)
+    end
+
     def method_missing(m,*args,&block)
       if @additional.include?(m)
         begin
@@ -95,6 +107,18 @@ class WEEL
       @additional = additional
     end
 
+    def to_json(*a)
+      {
+        'data' => @__weel_data,
+        'endpoints' => @__weel_endpoints,
+        'additional' => @additional,
+        'status' => {
+          'id' => @__weel_status.id,
+          'message' => @__weel_status.message
+        }
+      }.to_json(*a)
+    end
+
     def method_missing(m,*args,&block)
       if @additional.include?(m)
         begin
@@ -280,7 +304,7 @@ class WEEL
     def mem_guard; end
 
     def test_condition(mr,code); mr.instance_eval(code); end
-    def manipulate(mr,code,result=nil,options=nil); mr.instance_eval(code); end
+    def manipulate(mr,code,where,result=nil,options=nil); mr.instance_eval(code,where,1); end
   end  # }}}
 
   class Position # {{{
@@ -759,7 +783,7 @@ class WEEL
                 mr.instance_eval(&finalize)
               elsif finalize.is_a?(String)
                 mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
-                connectionwrapper.manipulate(mr,finalize)
+                connectionwrapper.manipulate(mr,finalize,'Activity ' + position.to_s)
               end
               connectionwrapper.inform_manipulate_change(
                 ((mr && mr.changed_status) ? @__weel_status : nil),
@@ -781,7 +805,7 @@ class WEEL
                   if prepare.is_a?(Proc)
                     rs.instance_exec(&prepare)
                   elsif prepare.is_a?(String)
-                    rs.instance_eval prepare
+                    connectionwrapper.manipulate(rs,prepare,'Activity ' + position.to_s)
                   end
                 end
                 params = connectionwrapper.prepare(rs,endpoint,parameters,@__weel_replay)
@@ -833,7 +857,7 @@ class WEEL
                     elsif code.is_a?(String)
                       mr = ManipulateStructure.new(@__weel_data,@__weel_endpoints,@__weel_status,connectionwrapper.additional)
                       ma = catch Signal::Again do
-                        connectionwrapper.manipulate(mr,code,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
+                        connectionwrapper.manipulate(mr,code,'Activity ' + position.to_s,connectionwrapper.activity_result_value,connectionwrapper.activity_result_options)
                         'yes' # ma sadly will have nil when i just throw
                       end
                     end

data/test/TestConnectionWrapper.rb

@@ -106,11 +106,4 @@ class TestConnectionWrapper < WEEL::ConnectionWrapperBase
     $short_track << "F#{@__myhandler_position}"
     raise(err)
   end #}}}
-
-  def manipulate(mr,code,result=nil,status=nil)
-    mr.instance_eval(code)
-  end
-  def test_condition(mr,code)
-    mr.instance_eval(code)
-  end
 end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.101"
+  s.version          = "1.99.103"
   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.101
+  version: 1.99.103
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Workflow Execution Engine Library (WEEL)