ruote 2.1.1 → 2.1.2

data/CHANGELOG.txt

@@ -1,8 +1,14 @@
 
-= ruote (OpenWFEru) - CHANGELOG.txt
+= ruote - CHANGELOG.txt
 
-== ruote - 2.0.0    not yet released
+
+== ruote - 2.1.2          released 2010/01/03
+
+- fixed issue when initializing engine without worker. Thanks Matt Nichols.
+
+
+== ruote - 2.1.1          released 2009/12/31
 
 == OpenWFEru - 0.9.2      released 2007/01/26
-== openwfe-ruby - 1.7.0   released 2006-05-08
+== openwfe-ruby - 1.7.0   released 2006/05/08
 

data/CREDITS.txt

@@ -15,6 +15,7 @@ Kenneth Kalmer  http://www.opensourcery.co.za
 Contributors
 ------------
 
+Matt Nichols - http://github.com/mattnichols
 Nicholas Faiz - http://github.com/biv
 Chris Beer - http://github.com/cbeer
 Enrico Bianco - http://github.com/enricob

data/Rakefile

@@ -23,9 +23,9 @@ ruote is an open source ruby workflow engine.
     gem.rubyforge_project = 'ruote'
     gem.test_file = 'test/test.rb'
 
-    gem.add_dependency 'rufus-cloche', '>= 0.1.6'
-    gem.add_dependency 'rufus-dollar'
     gem.add_dependency 'rufus-json'
+    gem.add_dependency 'rufus-cloche', '>= 0.1.10'
+    gem.add_dependency 'rufus-dollar'
     gem.add_dependency 'rufus-lru'
     gem.add_dependency 'rufus-mnemo', '>= 1.1.0'
     gem.add_dependency 'rufus-scheduler', '>= 2.0.3'

data/TODO.txt

@@ -285,3 +285,6 @@
     concurrence terminated (got removed) meanwhile ?
     the reply returns true...
 
+[ ] shell ? irb ? Shell.new(storage)
+[ ] focus on fulldup or json.dup (via fulldup ?)
+

data/lib/ruote/engine.rb

@@ -50,7 +50,7 @@ module Ruote
 
         @worker = nil
         @storage = worker_or_storage
-        @context = Ruote::Context.new(self)
+        @context = Ruote::Context.new(@storage, self)
       end
 
       @variables = EngineVariables.new(@storage)

data/lib/ruote/exp/fe_cancel_process.rb

@@ -62,13 +62,6 @@ module Ruote::Exp
 
       # never called
     end
-
-    def cancel (flavour)
-
-      # has to let the workitem rebound for the whole process to get cancelled
-
-      reply_to_parent(h.applied_workitem)
-    end
   end
 end
 

data/lib/ruote/exp/fe_command.rb

@@ -135,13 +135,6 @@ module Ruote::Exp
       reply_to_parent(h.applied_workitem) unless ancestor
     end
 
-    # Necessary in case of 'pass_command_directly'
-    #
-    def cancel (flavour)
-
-      reply_to_parent(h.applied_workitem)
-    end
-
     protected
 
     # Walks up the expression tree (process instance and returns the first

data/lib/ruote/exp/fe_error.rb

@@ -77,14 +77,6 @@ module Ruote::Exp
 
       raise(Ruote::ForcedError.new(msg))
     end
-
-    def cancel (flavour)
-
-      # TODO : should the error get removed from the process status ?
-      #        it's currently done when the exp gets 'unpersisted'
-
-      reply_to_parent(h.applied_workitem)
-    end
   end
 end
 

data/lib/ruote/exp/fe_listen.rb

@@ -179,11 +179,6 @@ module Ruote::Exp
       end
     end
 
-    def cancel (flavour)
-
-      reply_to_parent(h.applied_workitem)
-    end
-
     protected
 
     def reply_to_parent (workitem)

data/lib/ruote/exp/fe_redo.rb

@@ -73,11 +73,6 @@ module Ruote::Exp
 
       # never called
     end
-
-    def cancel (flavour)
-
-      reply_to_parent(h.applied_workitem)
-    end
   end
 end
 

data/lib/ruote/exp/flowexpression.rb

@@ -251,6 +251,7 @@ module Ruote::Exp
       end
 
       h.children.delete(fei)
+        # accept without any check ?
 
       if h.state != nil # failing or timing out ...
 
@@ -260,7 +261,7 @@ module Ruote::Exp
           persist_or_raise # for the updated h.children
         end
 
-      else
+      else # vanilla reply
 
         reply(workitem)
       end
@@ -282,14 +283,14 @@ module Ruote::Exp
     #
     def do_cancel (msg)
 
-      @msg = Ruote.fulldup(msg)
-
       return if h.state == 'cancelling'
         # cancel on cancel gets discarded
 
+      @msg = Ruote.fulldup(msg)
+
       flavour = msg['flavour']
 
-      return if h.state == 'failed' and flavour == 'timeout'
+      return if h.state == 'failed' && flavour == 'timeout'
         # do not timeout expressions that are "in error" (failed)
 
       h.state = case flavour
@@ -318,6 +319,9 @@ module Ruote::Exp
     #
     def cancel (flavour)
 
+      return reply_to_parent(h.applied_workitem) \
+        unless h.children.find { |cfei| Ruote::FlowExpression.fetch(cfei) }
+
       do_persist || return
         # before firing the cancel message to the children
 

data/lib/ruote/exp/raw.rb

@@ -39,10 +39,6 @@ module Ruote::Exp
     def reply (workitem)
       raise "can't apply or reply [to] raw expression"
     end
-
-    def cancel (flavour)
-      reply_to_parent(h.applied_workitem)
-    end
   end
 end
 

data/lib/ruote/exp/ro_persist.rb

@@ -55,7 +55,7 @@ module Ruote::Exp
       r = @context.storage.put(@h)
 
       #puts "+ per #{h.fei['expid']} #{tree.first} #{h._rev} --> #{r.class}"
-      #Ruote.p_caller('+ per') if r != nil
+      #Ruote.p_caller('+ per') if r != nil || h.fei['expid'] == '0_0'
 
       r
     end
@@ -65,7 +65,7 @@ module Ruote::Exp
       r = @context.storage.delete(@h)
 
       #puts "- unp #{h.fei['expid']} #{tree.first} #{h._rev} --> #{r.class}"
-      #Ruote.p_caller('- unp') if r != nil
+      #Ruote.p_caller('- unp') if r != nil || h.fei['expid'] == '0_0'
 
       return r if r
 
@@ -123,15 +123,13 @@ module Ruote::Exp
 
       case r = self.send("try_#{pers}")
         when true
-          (pers == :unpersist)
-            # persist FALSE : gone... return false "please don't go on"
-            # unpersist TRUE : already gone, should be OK
+          false # don't go on
         when Hash
           self.h = r
           self.send("do_#{@msg['action']}", @msg)
-          false
+          false # don't go on
         else
-          true
+          true # success, please go on
       end
     end
   end

data/lib/ruote/log/fs_history.rb

@@ -51,11 +51,13 @@ module Ruote
       @last = nil
       @file = nil
 
-      if @context.respond_to?(:worker)
+      if @context.worker
+
+        # only care about logging if there is a worker present
+
         @context.worker.subscribe(:all, self)
+        rotate_if_necessary
       end
-
-      rotate_if_necessary
     end
 
     # Makes sure to close the history file.

data/lib/ruote/log/test_logger.rb

@@ -38,12 +38,12 @@ module Ruote
 
       @context = context
 
-      if @context.respond_to?(:worker)
+      if @context.worker
         #
         # this is a worker context, DO log
         #
         @context.worker.subscribe(:all, self)
-      else
+      #else
         #
         # this is not a worker context, DO NOT log, but be ready to
         # be queried

data/lib/ruote/storage/fs_storage.rb

@@ -22,7 +22,11 @@
 # Made in Japan.
 #++
 
-require 'yajl' rescue require 'json'
+begin
+  require 'yajl'
+rescue LoadError
+  require 'json'
+end
   # gem install yajl-ruby OR json OR json_pure OR json-jruby
 
 require 'rufus/json'
@@ -50,7 +54,7 @@ module Ruote
 
     def put (doc, opts={})
 
-      @cloche.put(doc.merge!('put_at' => Ruote.now_to_utc_s))
+      @cloche.put(doc.merge!('put_at' => Ruote.now_to_utc_s), opts)
     end
 
     def get (type, key)

data/lib/ruote/worker.rb

@@ -27,7 +27,7 @@ require 'ruote/fei'
 
 module Ruote
 
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
   class Worker
 

data/ruote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2009-12-31}
+  s.date = %q{2010-01-03}
   s.description = %q{
 ruote is an open source ruby workflow engine.
     }
@@ -218,6 +218,7 @@ ruote is an open source ruby workflow engine.
      "test/unit/ut_15_util.rb",
      "test/unit/ut_16_parser.rb",
      "test/unit/ut_17_storage.rb",
+     "test/unit/ut_18_engine.rb",
      "test/unit/ut_1_fei.rb",
      "test/unit/ut_2_wfidgen.rb",
      "test/unit/ut_3_wait_logger.rb",
@@ -243,9 +244,9 @@ ruote is an open source ruby workflow engine.
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rufus-cloche>, [">= 0.1.6"])
-      s.add_runtime_dependency(%q<rufus-dollar>, [">= 0"])
       s.add_runtime_dependency(%q<rufus-json>, [">= 0"])
+      s.add_runtime_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+      s.add_runtime_dependency(%q<rufus-dollar>, [">= 0"])
       s.add_runtime_dependency(%q<rufus-lru>, [">= 0"])
       s.add_runtime_dependency(%q<rufus-mnemo>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<rufus-scheduler>, [">= 2.0.3"])
@@ -253,9 +254,9 @@ ruote is an open source ruby workflow engine.
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<rufus-cloche>, [">= 0.1.6"])
-      s.add_dependency(%q<rufus-dollar>, [">= 0"])
       s.add_dependency(%q<rufus-json>, [">= 0"])
+      s.add_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+      s.add_dependency(%q<rufus-dollar>, [">= 0"])
       s.add_dependency(%q<rufus-lru>, [">= 0"])
       s.add_dependency(%q<rufus-mnemo>, [">= 1.1.0"])
       s.add_dependency(%q<rufus-scheduler>, [">= 2.0.3"])
@@ -264,9 +265,9 @@ ruote is an open source ruby workflow engine.
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rufus-cloche>, [">= 0.1.6"])
-    s.add_dependency(%q<rufus-dollar>, [">= 0"])
     s.add_dependency(%q<rufus-json>, [">= 0"])
+    s.add_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+    s.add_dependency(%q<rufus-dollar>, [">= 0"])
     s.add_dependency(%q<rufus-lru>, [">= 0"])
     s.add_dependency(%q<rufus-mnemo>, [">= 1.1.0"])
     s.add_dependency(%q<rufus-scheduler>, [">= 2.0.3"])

data/test/functional/crunner.rb

@@ -1,13 +1,16 @@
 
 pers = ARGV.find { |a| a.match(/^--/) } || ''
+tnumber = ARGV.find { |a| a.match(/^\d+/) } || 2
 
 i = 0
 
 loop do
 
-  #s = `ruby test/functional/ct_0_concurrence.rb #{pers}`
-  #s = `ruby test/functional/ct_1_iterator.rb #{pers}`
-  s = `ruby test/functional/ct_2_cancel.rb #{pers}`
+  t = Dir["test/functional/ct_#{tnumber}_*.rb"].first
+
+  raise "didn't find test..." unless t
+
+  s = `ruby #{t} #{pers}`
 
   if $? != 0
     puts

data/test/functional/ct_0_concurrence.rb

@@ -41,7 +41,7 @@ class CtConcurrenceTest < Test::Unit::TestCase
     msgs = @storage.get_msgs
     msg = msgs.first
 
-    if msgs.size > 1 || (msg['fei'] && msg['fei']['expid'] != '0')
+    if msgs.size > 1 || (msg && msg['fei'] && msg['fei']['expid'] != '0')
 
       msgs.each do |m|
 

data/test/functional/ct_2_cancel.rb

@@ -45,8 +45,8 @@ class CtCancelTest < Test::Unit::TestCase
     #msgs.each { |m| p m }
     #puts
 
-    t1 = Thread.new { @engine0.do_step(msgs[1]) }
-    t0 = Thread.new { @engine1.do_step(msgs[0]) }
+    t1 = Thread.new { @engine1.do_step(msgs[1]) }
+    t0 = Thread.new { @engine0.do_step(msgs[0]) }
     t1.join
     t0.join
 

data/test/functional/eft_16_if.rb

@@ -146,7 +146,11 @@ class EftIfTest < Test::Unit::TestCase
 
   def test_xml_equals
 
-    require 'yajl' rescue require 'json'
+    begin
+      require 'yajl'
+    rescue LoadError
+      require 'json'
+    end
     Rufus::Json.detect_backend
       # making sure JSON dup is available in case of HashStorage
 

data/test/functional/ft_11_recursion.rb

@@ -105,6 +105,8 @@ class FtRecursionTest < Test::Unit::TestCase
 
     6.times { wait_for(:alpha) }
 
+    Thread.pass
+
     assert_equal((1..6).to_a.join("\n"), @tracer.to_s)
   end
 end

data/test/functional/ft_25_receiver.rb

@@ -38,6 +38,14 @@ class FtReceiverTest < Test::Unit::TestCase
 
       # no reply to the engine
     end
+
+    # do not let the dispatch happen in its own thread, this makes
+    # wait_for(:alpha) synchronous.
+    #
+    def do_not_thread
+
+      true
+    end
   end
 
   class MyReceiver < Ruote::Receiver

data/test/functional/ft_32_history.rb

@@ -5,8 +5,11 @@
 # Sun Oct  4 00:14:27 JST 2009
 #
 
-
-require 'yajl' rescue require 'json'
+begin
+  require 'yajl'
+rescue LoadError
+  require 'json'
+end
 Rufus::Json.detect_backend rescue nil
 
 require File.join(File.dirname(__FILE__), 'base')
@@ -35,7 +38,7 @@ class FtHistoryTest < Test::Unit::TestCase
     wfid0 = assert_trace(pdef, "done.")
     wfid1 = assert_trace(pdef, "done.\ndone.")
 
-    sleep 0.010
+    sleep 0.100
 
     lines = File.readlines(Dir['work/log/*'].first)
 
@@ -79,7 +82,7 @@ class FtHistoryTest < Test::Unit::TestCase
 
     wfid0 = assert_trace(pdef, "done.")
 
-    sleep 0.010
+    sleep 0.100
 
     h = @engine.context.history.by_process(wfid0)
     #h.each { |r| p r }
@@ -104,7 +107,7 @@ class FtHistoryTest < Test::Unit::TestCase
     wfid = @engine.launch(pdef)
     wait_for(wfid)
 
-    sleep 0.010
+    sleep 0.100
 
     h = @engine.context.history.by_process(wfid)
     #h.each { |r| p r }
@@ -134,7 +137,7 @@ class FtHistoryTest < Test::Unit::TestCase
     @engine.cancel_expression(fei)
     wait_for(wfid)
 
-    sleep 0.010
+    sleep 0.100
 
     h = @engine.context.history.by_process(wfid)
     #h.each { |r| p r }

data/test/functional/rt_4_cron.rb

@@ -53,9 +53,10 @@ class RtCronTest < Test::Unit::TestCase
 
     @engine.cancel_process(wfid)
 
-    msg = wait_for(wfid)
+    while msg = wait_for(wfid)
+      break if msg['action'] == 'terminated'
+    end
 
-    assert_equal 'terminated', msg['action']
     assert_equal 0, @engine.processes.size
     assert_equal 0, @engine.storage.get_many('schedules').size
   end

data/test/functional/storage_helper.rb

@@ -42,7 +42,11 @@ else uses the in-memory Ruote::Engine (fastest, but no persistence at all)
 
   if ps.include?('--fs')
 
-    require 'yajl' rescue require 'json'
+    begin
+      require 'yajl'
+    rescue LoadError
+      require 'json'
+    end
     Rufus::Json.detect_backend
 
     Ruote::FsStorage.new('work', opts)
@@ -66,7 +70,11 @@ else uses the in-memory Ruote::Engine (fastest, but no persistence at all)
 
   elsif persistent
 
-    require 'yajl' rescue require 'json'
+    begin
+      require 'yajl'
+    rescue LoadError
+      require 'json'
+    end
     Rufus::Json.detect_backend
 
     Ruote::FsStorage.new('work', opts)

data/test/unit/ut_17_storage.rb

@@ -5,7 +5,11 @@
 # Mon Dec 14 15:03:13 JST 2009
 #
 
-require 'yajl' rescue require 'json'
+begin
+  require 'yajl'
+rescue LoadError
+  require 'json'
+end
 require 'patron' rescue nil
 
 require File.join(File.dirname(__FILE__), %w[ .. test_helper.rb ])
@@ -44,7 +48,11 @@ class UtStorage < Test::Unit::TestCase
 
   def test_put
 
-    @s.put('_id' => 'nada', 'type' => 'dogfood', 'message' => 'testing again')
+    doc =  { '_id' => 'nada', 'type' => 'dogfood', 'message' => 'testing (2)' }
+
+    @s.put(doc)
+
+    assert_nil doc['_rev']
 
     h = @s.get('dogfood', 'nada')
 
@@ -93,8 +101,12 @@ class UtStorage < Test::Unit::TestCase
 
   def test_keys_should_be_string
 
-    require 'yajl' rescue require 'json'
-    Rufus::Json.detect_backend
+    #begin
+    #  require 'yajl'
+    #rescue LoadError
+    #  require 'json'
+    #end
+    #Rufus::Json.detect_backend
 
     doc = { '_id' => 'h0', 'type' => 'dogfood', :m0 => :z, :m1 => [ :a, :b ] }
 
@@ -108,7 +120,7 @@ class UtStorage < Test::Unit::TestCase
 
   # Updating a gone document must result in a 'true' reply.
   #
-  def test_put_missing
+  def test_put_gone
 
     h = @s.get('dogfood', 'toto')
 

data/test/unit/ut_18_engine.rb

@@ -0,0 +1,34 @@
+
+#
+# testing ruote
+#
+# Sun Jan  3 12:04:07 JST 2010
+#
+# Matt Nichols (http://github.com/mattnichols)
+#
+
+require File.join(File.dirname(__FILE__), %w[ .. test_helper.rb ])
+require File.join(File.dirname(__FILE__), %w[ .. functional storage_helper.rb ])
+
+require 'ruote'
+
+
+class UtEngineTest < Test::Unit::TestCase
+
+  def test_initialize_with_worker
+
+    storage = determine_storage(
+      's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])
+    worker = Ruote::Worker.new(storage)
+    engine = Ruote::Engine.new(worker, false)
+  end
+
+  def test_initialize_with_storage
+
+    storage = determine_storage(
+      's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])
+
+    engine = Ruote::Engine.new(storage)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruote
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,31 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 +09:00
+date: 2010-01-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rufus-cloche
+  name: rufus-json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.6
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rufus-dollar
+  name: rufus-cloche
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.1.10
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rufus-json
+  name: rufus-dollar
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -313,6 +313,7 @@ files:
 - test/unit/ut_15_util.rb
 - test/unit/ut_16_parser.rb
 - test/unit/ut_17_storage.rb
+- test/unit/ut_18_engine.rb
 - test/unit/ut_1_fei.rb
 - test/unit/ut_2_wfidgen.rb
 - test/unit/ut_3_wait_logger.rb