weel 1.99.151 → 1.99.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0405b0d78d17afd88497d992ce42aa2dd1be508c51988926a532ce1ac688c69
-  data.tar.gz: b0913081c1722962f5657f4a99fa99bb84d67629686c6def539c45df858d94e6
+  metadata.gz: 98ff5ec5f2c89a41f30f5087cf4f9fb9c58f12569e84d586a3095e29b8390740
+  data.tar.gz: 30686408ed8c016612b825221dff7836331deec7bfad36f32d34ece39d200d4c
 SHA512:
-  metadata.gz: 03bce06826853dffd3757d7c1a02d92126bae53aa9ae835208d5594b01824a2a77f1bf0020fadd2cef07e9103641712ce1f20fab7ec9985fac46bf91a3e3c230
-  data.tar.gz: 72efa2dce42643370ec6de96f7451602c0f35854a61b9353d1a00c44328e7e971d8c891575f34826ac8611f19891d5ce9172353598845fdf280beaa27c722745
+  metadata.gz: 53734eb99a548c08525a41bfc717bc4ab495efcc23bbb8ce8774e82be40e19c83ff4053dda16e76a304c9d96600f57b333771465f3a4817ae5a9a587bd511183
+  data.tar.gz: 4ffa05575fda41d1fbd7218b1379f07deaee1cdb701034b25c613c1818bbf8fcd85db4d66e2fe0103212fb29e6216f99ed6e530a71f34b452364695ce5f9cda6

data/lib/weel.rb

@@ -16,6 +16,8 @@
 
 require 'thread'
 require 'securerandom'
+require 'active_support/core_ext/object/deep_dup'
+require 'msgpack'
 
 class WEEL
   def initialize(*args)# {{{
@@ -50,7 +52,7 @@ class WEEL
           v.root.to_doc
         else
           begin
-            Marshal.load(Marshal.dump(v))
+            v.deep_dup
           rescue
             v.to_s rescue nil
           end
@@ -72,7 +74,7 @@ class WEEL
     def method_missing(m,*args,&block)
       if @additional.include?(m)
         begin
-          tmp = Marshal.load(Marshal.dump(@additional[m]))
+          tmp = @additional[m].deep_dup
           if tmp.is_a? Hash
             ReadHash.new(tmp)
           else
@@ -105,9 +107,9 @@ class WEEL
   class ManipulateStructure # {{{
     def initialize(data,endpoints,status,local,additional)
       @__weel_data = data
-      @__weel_data_orig = @__weel_data.transform_values{|val| Marshal.dump(val) rescue nil }
+      @__weel_data_orig = @__weel_data.transform_values{|val|  MessagePack.pack(val) rescue nil }
       @__weel_endpoints = endpoints
-      @__weel_endpoints_orig = @__weel_endpoints.transform_values{|val| Marshal.dump(val) }
+      @__weel_endpoints_orig = @__weel_endpoints.transform_values{|val|  MessagePack.pack(val) }
       @__weel_status = status
       @__weel_local = local
       @changed_status = "#{status.id}-#{status.message}"
@@ -133,7 +135,7 @@ class WEEL
     def method_missing(m,*args,&block)
       if @additional.include?(m)
         begin
-          tmp = Marshal.load(Marshal.dump(@additional[m]))
+          tmp = @additional[m].deep_dup
           if tmp.is_a? Hash
             ReadHash.new(tmp)
           else
@@ -159,7 +161,7 @@ class WEEL
 
     def changed_data
       @touched_data.each do |e|
-        td = Marshal.dump(@__weel_data[e]) rescue nil
+        td =  MessagePack.pack(@__weel_data[e]) rescue nil
         if td != @__weel_data_orig[e]
           @changed_data << e
         end
@@ -171,11 +173,11 @@ class WEEL
     end
 
     def original_data
-      @__weel_data_orig.transform_values{|val| Marshal.load(val) rescue nil }
+      @__weel_data_orig.transform_values{|val| MessagePack.unpack(val) rescue nil }
     end
 
     def original_endpoints
-      @__weel_endpoints_orig.transform_values{|val| Marshal.load(val) rescue nil }
+      @__weel_endpoints_orig.transform_values{|val| MessagePack.unpack(val) rescue nil }
     end
 
     def changed_status
@@ -306,7 +308,7 @@ class WEEL
           v.root.to_doc
         else
           begin
-            Marshal.load(Marshal.dump(v))
+            v.deep_dup
           rescue
             v.to_s rescue nil
           end
@@ -345,7 +347,7 @@ class WEEL
 
   class ConnectionWrapperBase # {{{
     def self::loop_guard(arguments,lid,count); false; end
-    def self::inform_state_change(arguments,newstate); end
+    def self::inform_state_change(arguments,newstate,data); end
     def self::inform_syntax_error(arguments,err,code); end
     def self::inform_connectionwrapper_error(arguments,err); end
     def self::inform_position_change(arguments,ipc={}); end
@@ -579,7 +581,7 @@ class WEEL
         Thread.current[:branch_search] = @__weel_search_positions.any?
         Thread.current[:branch_parent] = branch_parent
         Thread.current[:start_event] = Continue.new
-        Thread.current[:local] = Marshal.load(Marshal.dump(local))
+        Thread.current[:local] = local.deep_dup
         Thread.current[:branch_wait_count_cancel_active] = false
         branch_parent[:mutex].synchronize do
           Thread.current[:branch_traces_id] = branch_parent[:branch_traces_ids]
@@ -1121,7 +1123,7 @@ class WEEL
     def __weel_finalize #{{{
       __weel_recursive_join(@__weel_main)
       @__weel_state = :stopped
-      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
+      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state, @__weel_data
     end #}}}
 
     def __weel_state=(newState)# {{{
@@ -1130,7 +1132,7 @@ class WEEL
       @__weel_positions = Array.new if newState == :running
       @__weel_state = newState
 
-      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state
+      @__weel_connectionwrapper::inform_state_change @__weel_connectionwrapper_args, @__weel_state, @__weel_data
 
       if newState == :stopping || newState == :finishing
         __weel_recursive_continue(@__weel_main)
@@ -1174,7 +1176,7 @@ public
     @dslr.__weel_state
   end #  }}}
   def state_signal # {{{
-    connectionwrapper::inform_state_change connectionwrapper_args, state
+    connectionwrapper::inform_state_change connectionwrapper_args, state, data
     state
   end # }}}
   def abandon # {{{

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.151"
+  s.version          = "1.99.153"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Workflow Execution Engine Library (WEEL)"
@@ -19,4 +19,6 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'test-unit',  '~> 3.0'
+  s.add_runtime_dependency 'msgpack',  '~> 1'
+  s.add_runtime_dependency 'activesupport', '~> 8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.151
+  version: 1.99.153
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables: []