weel 1.99.79 → 1.99.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354d1e38d9c446c70b78ecd03ec2c425b56099ba814b0aae48876808c8b7eddc
-  data.tar.gz: ec89487564275d1b6c3d50861e80fcaf9bd0c356bd7ca98d698736fe56e85729
+  metadata.gz: dd7014b809336a6c102633b2d1e46c67bf3ddf4ab7a85e2c16a45d225d397074
+  data.tar.gz: 3e40ca8e6317ccab10f4a7e17928531b851c23481376e66b6bdfb8d67cfef65a
 SHA512:
-  metadata.gz: fd2a9a155bc494b85ca0f192adcacce4a6781b61d761d27b6bb13f4439501da02e0aa22dcc4006c567fb80db796f455dc417e2437cf79ec473bb4b3684f4098f
-  data.tar.gz: cd5d10b557296a8ca0bac8f9e4ac98265e4372f8c8ac93793f10aa9e8d082a42537f166ad627472a07b0c8a8ac17a705a5a80be4d958228b76a8957a36145425
+  metadata.gz: d94a84ff33c81361f70185c220ccddd76bea06c61194f91c1b5767766512f4d07b938270169ca4c45dae962c3e8841f6c4b329c1d096752131747b3f826996b3
+  data.tar.gz: f7fbdf0206fb8fcec716d4254e5b8202f0a749b12c14d0da0fed3a495320097e96adbdf2b7d3e0238a6220335ecf07008c37134881d40727f121d6b1de281135

data/example/SimpleHandlerWrapper.rb

@@ -1,13 +1,13 @@
 # This file is part of WEEL.
-# 
+#
 # WEEL is free software: you can redistribute it and/or modify it under the terms
 # of the GNU General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
-# 
+#
 # WEEL is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along with
 # WEEL (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
@@ -15,14 +15,23 @@
 require "pp"
 
 class SimpleHandlerWrapper < WEEL::HandlerWrapperBase
-  def initialize(args,endpoint=nil,position=nil,continue=nil)
+  def self::inform_state_change(arguments,newstate); puts "#{newstate}: #{arguments}"; end
+  def self::inform_syntax_error(arguments,err,code); puts "Syntax error: #{err}"; end
+  def self::inform_handlerwrapper_error(arguments,err); puts "Handlerwrapper error: #{err}"; end
+
+  def initialize(args,position=nil,continue=nil)
     @__myhandler_stopped = false
     @__myhandler_position = position
     @__myhandler_continue = continue
-    @__myhandler_endpoint = endpoint
+    @__myhandler_endpoint = nil
     @__myhandler_returnValue = nil
   end
 
+  def prepare(readonly, endpoints, parameters, replay=false)
+    @__myhandler_endpoints  = endpoints
+    parameters
+  end
+
   # executes a ws-call to the given endpoint with the given parameters. the call
   # can be executed asynchron, see finished_call & return_value
   def activity_handle(passthrough, parameters)
@@ -35,7 +44,7 @@ class SimpleHandlerWrapper < WEEL::HandlerWrapperBase
     @__myhandler_returnValue = 'Handler_Dummy_Result'
     @__myhandler_continue.continue
   end
- 
+
   # returns the result of the last handled call
   def activity_result_value
     @__myhandler_returnValue

data/example/SimpleWorkflow.rb

@@ -1,13 +1,13 @@
 # This file is part of WEEL.
-# 
+#
 # WEEL is free software: you can redistribute it and/or modify it under the terms
 # of the GNU General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
-# 
+#
 # WEEL is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along with
 # WEEL (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.
@@ -17,12 +17,12 @@ require ::File.dirname(__FILE__) + '/SimpleHandlerWrapper'
 
 class SimpleWorkflow < WEEL
   handlerwrapper SimpleHandlerWrapper
-  
+
   endpoint :ep1 => "orf.at"
   data :a => 17
 
   control flow do
-    activity :a1, :call, :ep1, :a => data.a, :b => 2 do
+    call :a1, :ep1, parameters: { :a => data.a, :b => 2 } do
       data.a += 3
     end
   end

data/example/runme.rb

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 # This file is part of WEEL.
-# 
+#
 # WEEL is free software: you can redistribute it and/or modify it under the terms
 # of the GNU General Public License as published by the Free Software Foundation,
 # either version 3 of the License, or (at your option) any later version.
-# 
+#
 # WEEL is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License along with
 # WEEL (file COPYING in the main directory).  If not, see
 # <http://www.gnu.org/licenses/>.

data/lib/weel.rb

@@ -44,7 +44,7 @@ class ReadStructure # {{{
   def initialize(data,endpoints)
     @__weel_data = data.dup
     @__weel_data.transform_values! do |v|
-      if v.is_a? XML::Smart::Dom
+      if Object.const_defined?(:XML) && XML.const_defined?(:Smart) && v.is_a?(XML::Smart::Dom)
         v.root.to_doc
       else
         begin
@@ -814,7 +814,7 @@ end # }}}
         handlerwrapper.inform_activity_failed se
         self.__weel_state = :stopping
       rescue => err
-        handlerwrapper.inform_activity_failed err
+        @__weel_handlerwrapper::inform_handlerwrapper_error @__weel_handlerwrapper_args, err
         self.__weel_state = :stopping
       ensure
         Thread.current[:continue].clear if Thread.current[:continue] && Thread.current[:continue].is_a?(Continue)
@@ -915,7 +915,7 @@ end # }}}
       if newState == :stopping || newState == :finishing
         @__weel_status.nudge!
         __weel_recursive_continue(@__weel_main)
-        @dslr.__weel_replay = false
+        __weel_replay = false
       end
 
       @__weel_handlerwrapper::inform_state_change @__weel_handlerwrapper_args, @__weel_state

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.79"
+  s.version          = "1.99.80"
   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.79
+  version: 1.99.80
 platform: ruby
 authors:
 - Juergen eTM Mangler