weel 1.99.75 → 1.99.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fdb6df90a2944745d919718aaf93e04755b9a996f119c1144b8241da9bc09d
-  data.tar.gz: f30673b37bb604dc635d37206792345ff4938465fe37d82d3b6d37857b141782
+  metadata.gz: 7cb0b00eea5a043d05689d6c2f57460f0852260d8041d5b4428ef5b012a54531
+  data.tar.gz: 64387529527bf0a0f110fdc5dfe0c25ac0189eefcc184a5cc8fa609ec3a93c59
 SHA512:
-  metadata.gz: 9f9166ccd4fa394046d619c0b060ffd9d945992e28439e7321dc01a3309b24d431f89e37e1e0677fe109592f09b70079638508365c4ee0049755f24f4c8c9b7f
-  data.tar.gz: 05a7b83e323f2b9e1912e01edf2bdd3137f76fb06a78b0e7929f358927be1ccf5ace519b62710764741324eb5f7d26f91dca23df68f1364e51c37b3a8d8c2d21
+  metadata.gz: 416b7ecfa75b3df501d738a392fe8fdc43531b7f0479f7a0d60ec30e0beddfe532985ef5edd77a40c3890f6ee86ae43663b7532c3b11da306f92cb3f26ed2e4e
+  data.tar.gz: adcd6e152b2a2405862c02312faae7799f84a9d9be953fc82f6b54763e5dd0b77ee2696266e59621d0618bf9395ef3ea9386d908faa581ecf1b59b6eb2caf1dc

data/lib/weel.rb

@@ -16,29 +16,6 @@
 
 require 'thread'
 
-# OMG!111! deep cloning for ReadHashes
-class Object # {{{
-  def deep_clone
-    return @deep_cloning_obj if @deep_cloning
-    @deep_cloning_obj = clone
-    @deep_cloning_obj.instance_variables.each do |var|
-      val = @deep_cloning_obj.instance_variable_get(var)
-      begin
-        @deep_cloning = true
-        val = val.deep_clone
-      rescue TypeError
-        next
-      ensure
-        @deep_cloning = false
-      end
-      @deep_cloning_obj.instance_variable_set(var, val)
-    end
-    deep_cloning_obj = @deep_cloning_obj
-    @deep_cloning_obj = nil
-    deep_cloning_obj
-  end
-end #}}}
-
 class WEEL
   def initialize(*args)# {{{
     @dslr = DSLRealization.new
@@ -60,27 +37,38 @@ class WEEL
     class NoLongerNecessary < Exception; end
     class Again < Exception; end
     class Error < Exception; end
+    class Salvage < Exception; end
   end # }}}
 
-  class ReadStructure # {{{
-    def initialize(data,endpoints)
-      @__weel_data = data
-      @__weel_endpoints = endpoints
-      @changed_data = []
-      @changed_endpoints = []
+class ReadStructure # {{{
+  def initialize(data,endpoints)
+    @__weel_data = data.dup
+    @__weel_data.transform_values! do |v|
+      if 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
+    @__weel_endpoints = endpoints.dup
+    @__weel_endpoints.transform_values!{ |v| v.dup }
+  end
 
-    def data
-      ReadHash.new(@__weel_data)
-    end
-    def endpoints
-      ReadHash.new(@__weel_endpoints)
-    end
-  end # }}}
+  def data
+    ReadHash.new(@__weel_data)
+  end
+  def endpoints
+    ReadHash.new(@__weel_endpoints)
+  end
+end # }}}
   class ManipulateStructure # {{{
     def initialize(data,endpoints,status)
       @__weel_data = data
-      @__weel_data_orig = @__weel_data.transform_values{|val| Marshal.dump(val) }
+      @__weel_data_orig = @__weel_data.transform_values{|val| Marshal.dump(val) } rescue nil
       @__weel_endpoints = endpoints
       @__weel_endpoints_orig = @__weel_endpoints.transform_values{|val| Marshal.dump(val) }
       @__weel_status = status
@@ -93,7 +81,8 @@ class WEEL
 
     def changed_data
       @touched_data.each do |e|
-        if Marshal.dump(@__weel_data[e]) != @__weel_data_orig[e]
+        td = Marshal.dump(@__weel_data[e]) rescue nil
+        if td != @__weel_data_orig[e]
           @changed_data << e
         end
       end
@@ -104,11 +93,11 @@ class WEEL
     end
 
     def original_data
-      @__weel_data_orig.transform_values{|val| Marshal.load(val) }
+      @__weel_data_orig.transform_values{|val| Marshal.load(val) rescue nil }
     end
 
     def original_endpoints
-      @__weel_endpoints_orig.transform_values{|val| Marshal.load(val) }
+      @__weel_endpoints_orig.transform_values{|val| Marshal.load(val) rescue nil }
     end
 
     def changed_status
@@ -197,15 +186,21 @@ class WEEL
     end
 
     def method_missing(name,*args)
-      if args.empty? && @__weel_values.key?(name)
-        if @__weel_sim
-          "➤#{name}"
-        else
+      if @__weel_sim
+        "➤#{name}"
+      else
+        if args.empty? && @__weel_values.key?(name)
           @__weel_values[name]
+        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
-        #TODO dont let user change stuff e.g. if return value is an array (deep clone and/or deep freeze it?)
-      else
-        nil
       end
     end
   end # }}}
@@ -219,6 +214,8 @@ class WEEL
 
     def initialize(arguments,endpoint=nil,position=nil,continue=nil); end
 
+    def prepare(readonly, endpoints, parameters); parameters; end
+
     def activity_handle(passthrough, parameters); end
     def activity_manipulate_handle(parameters); end
 
@@ -351,8 +348,8 @@ class WEEL
     # position: a unique identifier within the wf-description (may be used by the search to identify a starting point)
     # endpoint: (only with :call) ep of the service
     # parameters: (only with :call) service parameters
-    def call(position, endpoint, parameters: {}, finalize: nil, update: nil, &finalizeblk) #{{{
-      __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update)
+    def call(position, endpoint, parameters: {}, finalize: nil, update: nil, prepare: nil, salvage: nil, &finalizeblk) #{{{
+      __weel_activity(position,:call,endpoint,parameters,finalize||finalizeblk,update,prepare,salvage)
     end #}}}
     # when two params, second param always script
     # when block and two params, parameters stays
@@ -662,7 +659,7 @@ class WEEL
       wp
     end #}}}
 
-    def __weel_activity(position, type, endpoints, parameters, finalize, update=nil)# {{{
+    def __weel_activity(position, type, endpoint, parameters, finalize=nil, update=nil, prepare=nil, salvage=nil)# {{{
       position = __weel_position_test position
       begin
         searchmode = __weel_is_in_search_mode(position)
@@ -670,10 +667,10 @@ class WEEL
         return if self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped || Thread.current[:nolongernecessary]
 
         Thread.current[:continue] = Continue.new
-        handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args, endpoints.is_a?(Array) ? endpoints.map{ |ep| @__weel_endpoints[ep] }.compact : @__weel_endpoints[endpoints], position, Thread.current[:continue]
+        handlerwrapper = @__weel_handlerwrapper.new @__weel_handlerwrapper_args, position, Thread.current[:continue]
 
         if __weel_sim
-          handlerwrapper.simulate(:activity,:none,@__weel_sim += 1,Thread.current[:branch_sim_pos],:position => position,:parameters => parameters,:endpoints => endpoints,:type => type,:finalize => finalize.is_a?(String) ? finalize : nil)
+          handlerwrapper.simulate(:activity,:none,@__weel_sim += 1,Thread.current[:branch_sim_pos],:position => position,:parameters => parameters,:endpoint => endpoint,:type => type,:finalize => finalize.is_a?(String) ? finalize : nil)
           return
         end
 
@@ -730,6 +727,15 @@ class WEEL
               else
                 raise("invalid parameters")
             end
+            rs = ReadStructure.new(@__weel_data,@__weel_endpoints)
+            if prepare
+              if prepare.is_a?(Proc)
+                rs.instance_exec &prepare
+              elsif prepare.is_a?(String)
+                rs.instance_eval prepare
+              end
+            end
+            params = handlerwrapper.prepare(rs,endpoint,params)
             raise Signal::Stop unless handlerwrapper.vote_sync_before(params)
             raise Signal::Skip if self.__weel_state == :stopping || self.__weel_state == :finishing
 
@@ -762,7 +768,13 @@ class WEEL
                 raise Signal::Proceed
               end
 
-              code = waitingresult == Signal::Again ? update : finalize
+              code = if waitingresult == WEEL::Signal::Again
+                update
+              elsif waitingresult == WEEL::Signal::Salvage
+                salvage
+              else
+                finalize
+              end
               if code.is_a?(Proc) || code.is_a?(String)
                 handlerwrapper.inform_activity_manipulate
                 if code.is_a?(Proc)

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.75"
+  s.version          = "1.99.76"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.75
+  version: 1.99.76
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit