ruote 2.1.2 → 2.1.3

data/.gitignore

@@ -1,3 +1,4 @@
 .yardoc
 ruote_rdoc/
 work/
+*.swp

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = ruote - CHANGELOG.txt
 
 
+== ruote - 2.1.3          released 2010/01/04
+
+- fixed issue with Rufus.is_cron_string (thanks Torsten)
+- fixed issue with FlowExpression#cancel (Kenneth)
+
+
 == ruote - 2.1.2          released 2010/01/03
 
 - fixed issue when initializing engine without worker. Thanks Matt Nichols.

data/Rakefile

@@ -33,6 +33,8 @@ ruote is an open source ruby workflow engine.
 
     gem.add_development_dependency 'json'
     gem.add_development_dependency 'yard'
+    gem.add_development_dependency 'builder'
+    gem.add_development_dependency 'mailtrap'
 
     # Gem::Specification http://www.rubygems.org/read/chapter/20
   end

data/TODO.txt

@@ -156,6 +156,19 @@
 [o] undo exp : alias to 'cancel'
 [o] Andrew's at for timeouts (Chronic maybe)
 [x] timeout :at and :after (timeout expression vanished)
+[x] listen : should it forget its triggered children ? yes
+[o] limit the number of msgs returned
+[o] should redo/undo follow the example of command and add_branches ?
+    everything through reply (receive)
+    should re_apply not touch the state of its expression ?
+[o] test undo when cancelling parent expression
+[o] issue with :unless => '${f:index} == 2000'
+[o] implement Engine#reply (Engine simply has to include ReceiverMixin
+[o] listeners X receivers
+[o] add_service(name, path, klass, opts={}) opts local to services (really?)
+[o] add_branches : pass message to concurrent_iterator like a command expression
+[o] clean up persists present in #apply
+[o] maybe cancel should have a safely / redo_reply thing
 
 [ ] exp : exp (restricted form of eval ?)
 [ ] exp : case (is it necessary ?)
@@ -246,7 +259,6 @@
 [ ] repeat : have a counter in a variable (:to => x maybe) (subprocessid ?)
 
 [ ] when : add test for cancelling when child has been triggered / is running
-[x] listen : should it forget its triggered children ? yes
 
 [ ] engine.cancel_forgotten_children(wfid) ?
 
@@ -254,25 +266,12 @@
 
 [ ] double-check on_cancel rewrite (ft_1_process_status)
 
-[o] limit the number of msgs returned
-[o] should redo/undo follow the example of command and add_branches ?
-    everything through reply (receive)
-    should re_apply not touch the state of its expression ?
-[o] test undo when cancelling parent expression
-[o] issue with :unless => '${f:index} == 2000'
-[o] implement Engine#reply (Engine simply has to include ReceiverMixin
-[o] listeners X receivers
-[o] add_service(name, path, klass, opts={}) opts local to services (really?)
-[o] add_branches : pass message to concurrent_iterator like a command expression
-
 [ ] verify get_last/get_raw logic, no + 0.0001...
-[ ] clean up persists present in #apply
 [ ] case exp : smarter one ?
 [ ] spare 1 get_msg by caching msg (but keep 'deleting')
 [ ] [un]set_var : via message ? should be ok like that... Not much traffic there
 
 [ ] empty iterator or concurrent-iterator, log ? crash ? empty while...
-[ ] maybe cancel should have a safely / redo_reply thing
 [ ] at expression ?
 [ ] listen to participants/errors/tags {in|out}
 

data/lib/ruote/exp/flowexpression.rb

@@ -320,7 +320,7 @@ module Ruote::Exp
     def cancel (flavour)
 
       return reply_to_parent(h.applied_workitem) \
-        unless h.children.find { |cfei| Ruote::FlowExpression.fetch(cfei) }
+        unless h.children.find { |cfei| Ruote::Exp::FlowExpression.fetch(@context, cfei) }
 
       do_persist || return
         # before firing the cancel message to the children

data/lib/ruote/log/wait_logger.rb

@@ -40,7 +40,7 @@ module Ruote
       @waiting = nil
       @color = 33
 
-      @context.worker.subscribe(:all, self) if @context.respond_to?(:worker)
+      @context.worker.subscribe(:all, self) if @context.worker
 
       @noisy = false
     end

data/lib/ruote/part/storage_participant.rb

@@ -118,6 +118,12 @@ module Ruote
       hwi ? Ruote::Workitem.new(hwi) : nil
     end
 
+    # Clean this participant out completely
+    def purge!
+
+      fetch_all.each { |hwi| @context.storage.delete( hwi ) }
+    end
+
     protected
 
     def fetch_all

data/lib/ruote/storage/base.rb

@@ -139,7 +139,7 @@ module Ruote
 
       at = if s.is_a?(Time) # at or every
         at
-      elsif Rufus::Scheduler.is_cron_string(s) # cron
+      elsif is_cron_string(s) # cron
         Rufus::CronLine.new(s).next_time(Time.now + 1)
       else # at or every
         Ruote.s_to_at(s)
@@ -205,6 +205,18 @@ module Ruote
 
       scheds.select { |sched| sched['at'] <= now }
     end
+
+    # Waiting for a better implementation of it in rufus-scheduler 2.0.4
+    #
+    def is_cron_string (s)
+
+      ss = s.split(' ')
+
+      return false if ss.size < 5 || ss.size > 6
+      return false if s.match(/\d{4}/)
+
+      true
+    end
   end
 end
 

data/lib/ruote/worker.rb

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

data/ruote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote}
-  s.version = "2.1.2"
+  s.version = "2.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux", "Kenneth Kalmer"]
-  s.date = %q{2010-01-03}
+  s.date = %q{2010-01-04}
   s.description = %q{
 ruote is an open source ruby workflow engine.
     }
@@ -253,6 +253,8 @@ ruote is an open source ruby workflow engine.
       s.add_runtime_dependency(%q<rufus-treechecker>, [">= 1.0.3"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<builder>, [">= 0"])
+      s.add_development_dependency(%q<mailtrap>, [">= 0"])
     else
       s.add_dependency(%q<rufus-json>, [">= 0"])
       s.add_dependency(%q<rufus-cloche>, [">= 0.1.10"])
@@ -263,6 +265,8 @@ ruote is an open source ruby workflow engine.
       s.add_dependency(%q<rufus-treechecker>, [">= 1.0.3"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<mailtrap>, [">= 0"])
     end
   else
     s.add_dependency(%q<rufus-json>, [">= 0"])
@@ -274,6 +278,8 @@ ruote is an open source ruby workflow engine.
     s.add_dependency(%q<rufus-treechecker>, [">= 1.0.3"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<mailtrap>, [">= 0"])
   end
 end
 

data/test/functional/ft_20_storage_participant.rb

@@ -42,5 +42,31 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_nil @engine.process(wfid)
   end
+
+  def test_purge
+
+    pdef = Ruote.process_definition :name => 'def0' do
+      alpha
+    end
+
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+
+    #noisy
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(:alpha)
+
+    assert_equal 1, @engine.storage.get_many('workitems').size
+
+    alpha = Ruote::StorageParticipant.new
+    alpha.context = @engine.context
+
+    assert !alpha.first.nil?
+
+    alpha.purge!
+
+    assert alpha.first.nil?
+  end
 end
 

data/test/unit/ut_18_engine.rb

@@ -23,6 +23,13 @@ class UtEngineTest < Test::Unit::TestCase
     engine = Ruote::Engine.new(worker, false)
   end
 
+  def test_initialize_with_worker_and_without_logger
+
+    storage = determine_storage({})
+    worker = Ruote::Worker.new(storage)
+    engine = Ruote::Engine.new(worker, false)
+  end
+
   def test_initialize_with_storage
 
     storage = determine_storage(
@@ -30,5 +37,11 @@ class UtEngineTest < Test::Unit::TestCase
 
     engine = Ruote::Engine.new(storage)
   end
+
+  def test_initialize_storage_without_logger
+
+    storage = determine_storage({})
+    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.2
+  version: 2.1.3
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 +09:00
+date: 2010-01-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mailtrap
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: "\n\
   ruote is an open source ruby workflow engine.\n    "
 email: jmettraux@gmail.com