ruote 2.1.3 → 2.1.4

data/CHANGELOG.txt

@@ -1,6 +1,13 @@
 
 = ruote - CHANGELOG.txt
 
+== ruote - 2.1.4          released 2010/01/11
+
+- implemented StorageHistory
+- using yyyy-mm-dd instead of yyyy/mm/dd for Ruote.time_to_utc_s(t)
+- implemented Storage#purge_type!(t)
+- Engine#add_service now returning just bound service
+
 
 == ruote - 2.1.3          released 2010/01/04
 

data/Rakefile

@@ -24,7 +24,7 @@ ruote is an open source ruby workflow engine.
     gem.test_file = 'test/test.rb'
 
     gem.add_dependency 'rufus-json'
-    gem.add_dependency 'rufus-cloche', '>= 0.1.10'
+    gem.add_dependency 'rufus-cloche', '>= 0.1.13'
     gem.add_dependency 'rufus-dollar'
     gem.add_dependency 'rufus-lru'
     gem.add_dependency 'rufus-mnemo', '>= 1.1.0'

data/TODO.txt

@@ -169,6 +169,8 @@
 [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
+[o] implement Storage#clear!(type)
+[o] ruote/util/time.rb utc_to_s 'YYYY/MM/DD' --> 'YYYY-MM-DD' (regex friendly)
 
 [ ] exp : exp (restricted form of eval ?)
 [ ] exp : case (is it necessary ?)

data/lib/ruote/context.rb

@@ -73,7 +73,7 @@ module Ruote
 
       key = "s_#{key}" unless key.match(/^s\_/)
 
-      if klass
+      service = if klass
 
         require(path)
 
@@ -87,6 +87,8 @@ module Ruote
       end
 
       self.class.class_eval %{ def #{key[2..-1]}; @conf['#{key}']; end }
+
+      service
     end
 
     def shutdown

data/lib/ruote/engine.rb

@@ -40,7 +40,7 @@ module Ruote
 
     def initialize (worker_or_storage, run=true)
 
-      if worker_or_storage.respond_to?(:context)
+      if worker_or_storage.respond_to?(:storage)
 
         @worker = worker_or_storage
         @storage = @worker.storage
@@ -306,6 +306,8 @@ module Ruote
     #
     #   @engine.add_service('tracer', 'ruote/exp/tracer', 'Ruote::Exp::Tracer')
     #
+    # This method returns the service instance it just bound.
+    #
     def add_service (name, path_or_instance, classname=nil, opts=nil)
 
       @context.add_service(name, path_or_instance, classname, opts)

data/lib/ruote/exp/fe_participant.rb

@@ -162,9 +162,12 @@ module Ruote::Exp
 
     def cancel (flavour)
 
+      # TODO : if flavour is 'kill', why not not trigger participant.cancel ?
+
       participant = @context.plist.lookup(h.participant_name)
       participant.cancel(fei, flavour)
-        # should this be threaded ?
+        # TODO should this be threaded ?
+        # TODO should errors be intercepted here ?
 
       reply_to_parent(h.applied_workitem)
     end

data/lib/ruote/exp/flowexpression.rb

@@ -145,7 +145,15 @@ module Ruote::Exp
 
     def self.do_action (context, msg)
 
-      fexp = fetch(context, msg['fei'])
+      fexp = nil
+
+      3.times do
+        fexp = fetch(context, msg['fei'])
+        break if fexp
+        sleep 0.028
+      end
+        # this retry system is only useful with ruote-couch
+
       fexp.send("do_#{msg['action']}", msg) if fexp
     end
 

data/lib/ruote/log/fs_history.rb

@@ -67,9 +67,8 @@ module Ruote
       @file.close rescue nil
     end
 
-    # Returns an array of Ruote::Record instances, each record represents
-    # a ruote engine [history] event.
-    # Returns an empty array if no history was found for the given wfid.
+    # Returns the messages concerning the process given by its wfid,
+    # or an empty array if there were no such process seen.
     #
     def by_process (wfid)
 
@@ -118,8 +117,8 @@ module Ruote
       end
     end
 
-    # Returns an array of Record instances for a given date, and any process
-    # instance.
+    # Returns an array of messages for a given day or an empty array if nothing
+    # happened at that date.
     #
     def by_date (date)
 

data/lib/ruote/log/storage_history.rb

@@ -0,0 +1,116 @@
+#--
+# Copyright (c) 2005-2010, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
+#++
+
+
+module Ruote
+
+  #
+  # Logs the ruote engine history to the storage underlying the worker.
+  #
+  # Warning : don't use this history implementation when the storage is
+  # HashStorage. It will fill up your memory... Keeping history for a
+  # transient ruote is a bit overkill (IMHO).
+  #
+  class StorageHistory
+
+    def initialize (context, options={})
+
+      @context = context
+      @options = options
+
+      if @context.worker
+
+        # only care about logging if there is a worker present
+
+        @context.storage.add_type('history')
+        @context.worker.subscribe(:all, self)
+      end
+    end
+
+    def by_process (wfid)
+
+      @context.storage.get_many('history', /!#{wfid}$/)
+    end
+    alias :by_wfid :by_process
+
+    # Returns an array [ most recent date, oldest date ] (Time instances).
+    #
+    def range
+
+      ids = @context.storage.ids('history')
+
+      first = Time.parse("#{ids.first.split('!')[0]} 00:00:00 UTC")
+      last = Time.parse("#{ids.last.split('!')[0]} 00:00:00 UTC") + 24 * 3600
+
+      [ first, last ]
+    end
+
+    def by_date (date)
+
+      date = Time.parse(date.to_s).strftime('%F')
+
+      @context.storage.get_many('history', /^#{date}!/)
+    end
+
+    #def history_to_tree (wfid)
+    #  # (NOTE why not ?)
+    #end
+
+    # The history system doesn't implement purge! so that when purge! is called
+    # on the engine, the history is not cleared.
+    #
+    # Call this *dangerous* clear! method to clean out any history file.
+    #
+    def clear!
+
+      @context.storage.purge_type!('history')
+    end
+
+    # This is the method called by the workqueue. Incoming engine events
+    # are 'processed' here.
+    #
+    def notify (msg)
+
+      msg = msg.dup
+        # a shallow copy is sufficient
+
+      si = if fei = msg['fei']
+        Ruote::FlowExpressionId.to_storage_id(fei)
+      else
+        msg['wfid'] || 'no_wfid'
+      end
+
+      t = Time.parse(msg['put_at'])
+
+      msg['original_id'] = msg['_id']
+      msg['_id'] = "#{t.strftime('%F')}!#{t.to_i}_#{"%06d" % t.usec}!#{si}"
+      msg['type'] = 'history'
+      msg['original_put_at'] = msg['put_at']
+      msg.delete('_rev')
+
+      @context.storage.put(msg)
+    end
+  end
+end
+

data/lib/ruote/part/storage_participant.rb

@@ -57,6 +57,7 @@ module Ruote
 
       @context.storage.put(doc)
     end
+    alias :update :consume
 
     # Makes sure to remove the workitem from the in-memory hash.
     #
@@ -105,7 +106,14 @@ module Ruote
     #
     def each (&block)
 
-      fetch_all.each { |hwi| block.call(Ruote::Workitem.new(hwi)) }
+      all.each { |wi| block.call(wi) }
+    end
+
+    # Returns all the workitems stored in here.
+    #
+    def all
+
+      fetch_all.map { |hwi| Ruote::Workitem.new(hwi) }
     end
 
     # A convenience method (especially when testing), returns the first
@@ -118,7 +126,22 @@ module Ruote
       hwi ? Ruote::Workitem.new(hwi) : nil
     end
 
+    # Return all workitems for the specified wfid
+    #
+    def by_wfid( wfid )
+
+      @context.storage.get_many('workitems', /!#{wfid}$/).map { |hwi| Ruote::Workitem.new(hwi) }
+    end
+
+    # Return all workitems for the specified participant
+    #
+    def by_participant( part )
+
+      all.select { |wi| wi.participant_name == part }
+    end
+
     # Clean this participant out completely
+    #
     def purge!
 
       fetch_all.each { |hwi| @context.storage.delete( hwi ) }

data/lib/ruote/storage/base.rb

@@ -55,17 +55,19 @@ module Ruote
 
       # merge! is way faster than merge (no object creation probably)
 
+      t = Time.now
+      t = "#{t.to_i}.#{"%06d" % t.usec}"
+
       msg = options.merge!(
         'type' => 'msgs',
-        '_id' => "#{$$}-#{Thread.current.object_id}-#{Time.now.to_f.to_s}",
+        '_id' => "#{$$}-#{Thread.current.object_id}-#{t}",
         'action' => action)
 
       msg.delete('_rev')
         # in case of message replay
 
       put(msg)
-        #, :update_rev => true)
-
+      #put(msg, :update_rev => true)
       #(@local_msgs ||= []) << options
     end
 

data/lib/ruote/storage/fs_storage.rb

@@ -72,11 +72,26 @@ module Ruote
       @cloche.get_many(type, key, opts)
     end
 
+    def ids (type)
+
+      @cloche.ids(type)
+    end
+
     def purge!
 
       FileUtils.rm_rf(@cloche.dir)
     end
 
+    # No need for that here (FsStorage adds type on the fly).
+    #
+    def add_type (type)
+    end
+
+    def purge_type! (type)
+
+      @cloche.purge_type!(type)
+    end
+
     def dump (type)
 
       s = "=== #{type} ===\n"

data/lib/ruote/storage/hash_storage.rb

@@ -70,7 +70,7 @@ module Ruote
         doc['put_at'] = Ruote.now_to_utc_s
         doc['_rev'] = doc['_rev'] + 1
 
-        (@h[doc['type']] ||= {})[doc['_id']] = Rufus::Json.dup(doc)
+        @h[doc['type']][doc['_id']] = Rufus::Json.dup(doc)
 
         nil
       end
@@ -128,6 +128,13 @@ module Ruote
       end
     end
 
+    # Returns a sorted list of all the ids for a given type.
+    #
+    def ids (type)
+
+      @h[type].keys.sort
+    end
+
     def purge!
 
       @h = %w[
@@ -149,6 +156,16 @@ module Ruote
       @h['configurations']['engine'] = @options
     end
 
+    def add_type (type)
+
+      @h[type] = {}
+    end
+
+    def purge_type! (type)
+
+      @h[type] = {}
+    end
+
     def dump (type)
 
       s = "=== #{type} ===\n"
@@ -161,11 +178,6 @@ module Ruote
         end
       end
     end
-
-    def add_test_type (type)
-
-      @h[type] = {}
-    end
   end
 end
 

data/lib/ruote/util/time.rb

@@ -47,7 +47,7 @@ module Ruote
   #
   def self.time_to_utc_s (t)
 
-    "#{t.utc.strftime('%Y/%m/%d %H:%M:%S')}.#{sprintf('%06d', t.usec)} UTC"
+    "#{t.utc.strftime('%Y-%m-%d %H:%M:%S')}.#{sprintf('%06d', t.usec)} UTC"
   end
 
   # Returns a parsable representation of the UTC time now.

data/lib/ruote/worker.rb

@@ -27,7 +27,7 @@ require 'ruote/fei'
 
 module Ruote
 
-  VERSION = '2.1.3'
+  VERSION = '2.1.4'
 
   class Worker
 
@@ -215,8 +215,6 @@ module Ruote
 
       return false unless @storage.reserve(msg)
 
-      fexp = nil
-
       begin
 
         action = msg['action']
@@ -248,7 +246,7 @@ module Ruote
 
       rescue Exception => ex
 
-        handle_exception(msg, fexp, ex)
+        handle_exception(msg, nil, ex)
       end
 
       true

data/lib/ruote/workitem.rb

@@ -64,6 +64,11 @@ module Ruote
       @h['fields']
     end
 
+    def fields=( fields )
+
+      @h['fields'] = fields
+    end
+
     # A shortcut to the value in the field named __result__
     #
     # This field is used by the if expression for instance to determine

data/ruote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote}
-  s.version = "2.1.3"
+  s.version = "2.1.4"
 
   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-04}
+  s.date = %q{2010-01-11}
   s.description = %q{
 ruote is an open source ruby workflow engine.
     }
@@ -79,6 +79,7 @@ ruote is an open source ruby workflow engine.
      "lib/ruote/id/mnemo_wfid_generator.rb",
      "lib/ruote/id/wfid_generator.rb",
      "lib/ruote/log/fs_history.rb",
+     "lib/ruote/log/storage_history.rb",
      "lib/ruote/log/test_logger.rb",
      "lib/ruote/log/wait_logger.rb",
      "lib/ruote/parser.rb",
@@ -183,10 +184,11 @@ ruote is an open source ruby workflow engine.
      "test/functional/ft_2_errors.rb",
      "test/functional/ft_30_smtp_participant.rb",
      "test/functional/ft_31_part_blocking.rb",
-     "test/functional/ft_32_history.rb",
+     "test/functional/ft_32_fs_history.rb",
      "test/functional/ft_33_participant_subprocess_priority.rb",
      "test/functional/ft_34_cursor_rewind.rb",
      "test/functional/ft_35_add_service.rb",
+     "test/functional/ft_36_storage_history.rb",
      "test/functional/ft_3_participant_registration.rb",
      "test/functional/ft_4_cancel.rb",
      "test/functional/ft_5_on_error.rb",
@@ -245,7 +247,7 @@ ruote is an open source ruby workflow engine.
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rufus-json>, [">= 0"])
-      s.add_runtime_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+      s.add_runtime_dependency(%q<rufus-cloche>, [">= 0.1.13"])
       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"])
@@ -257,7 +259,7 @@ ruote is an open source ruby workflow engine.
       s.add_development_dependency(%q<mailtrap>, [">= 0"])
     else
       s.add_dependency(%q<rufus-json>, [">= 0"])
-      s.add_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+      s.add_dependency(%q<rufus-cloche>, [">= 0.1.13"])
       s.add_dependency(%q<rufus-dollar>, [">= 0"])
       s.add_dependency(%q<rufus-lru>, [">= 0"])
       s.add_dependency(%q<rufus-mnemo>, [">= 1.1.0"])
@@ -270,7 +272,7 @@ ruote is an open source ruby workflow engine.
     end
   else
     s.add_dependency(%q<rufus-json>, [">= 0"])
-    s.add_dependency(%q<rufus-cloche>, [">= 0.1.10"])
+    s.add_dependency(%q<rufus-cloche>, [">= 0.1.13"])
     s.add_dependency(%q<rufus-dollar>, [">= 0"])
     s.add_dependency(%q<rufus-lru>, [">= 0"])
     s.add_dependency(%q<rufus-mnemo>, [">= 1.1.0"])

data/test/functional/ct_0_concurrence.rb

@@ -27,7 +27,11 @@ class CtConcurrenceTest < Test::Unit::TestCase
     wfid = @engine0.launch(pdef)
     @engine0.step 4
 
-    $stderr.puts "*cough*" if @storage.get_msgs.size != 2
+    msgs = @storage.get_msgs
+    $stderr.puts "*cough*" if msgs.size != 2
+    #msgs.each do |m|
+    #  p [ m['action'], m['fei']['expid'], m['workitem'] ]
+    #end
 
     t0 = Thread.new { @engine1.step! }
     t1 = Thread.new { @engine0.step! }

data/test/functional/ct_1_iterator.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Dec  7 13:54:18 JST 2009
 #

data/test/functional/eft_0_process_definition.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sat Jan 24 22:40:35 JST 2009
 #

data/test/functional/eft_10_cancel_process.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jun 15 21:18:06 JST 2009
 #

data/test/functional/eft_13_iterator.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jun 29 09:35:48 JST 2009
 #

data/test/functional/eft_14_cursor.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jun 29 18:34:02 JST 2009
 #

data/test/functional/eft_15_loop.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jun 29 22:29:15 JST 2009
 #

data/test/functional/eft_17_equals.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Thu Jul  9 13:31:59 JST 2009
 #

data/test/functional/eft_19_reserve.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Fri Jul 31 21:44:04 JST 2009
 #

data/test/functional/eft_1_echo.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sat Sep 20 23:40:10 JST 2008
 #

data/test/functional/eft_20_save.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Aug  3 12:13:11 JST 2009
 #

data/test/functional/eft_21_restore.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Tue Aug  4 08:53:33 JST 2009
 #

data/test/functional/eft_24_add_branches.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Fri Sep 11 16:09:32 JST 2009
 #

data/test/functional/eft_27_inc.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sat Sep 19 12:56:16 JST 2009
 #

data/test/functional/eft_3_participant.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed May 13 11:14:08 JST 2009
 #

data/test/functional/eft_4_set.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed May 20 09:23:01 JST 2009
 #

data/test/functional/eft_5_subprocess.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed May 20 17:08:17 JST 2009
 #

data/test/functional/eft_6_concurrence.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Thu Jun 11 15:24:47 JST 2009
 #

data/test/functional/eft_7_forget.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sun Jun 14 13:33:17 JST 2009
 #

data/test/functional/eft_8_undo.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sun Jun 14 14:48:03 JST 2009
 #

data/test/functional/eft_9_redo.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jun 15 12:58:12 JST 2009
 #

data/test/functional/ft_0_worker.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Fri May 15 09:51:28 JST 2009
 #

data/test/functional/ft_10_dollar.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun 10 22:57:18 JST 2009
 #

data/test/functional/ft_13_variables.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Tue Jun 23 11:16:39 JST 2009
 #

data/test/functional/ft_14_re_apply.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Thu Jun 25 13:31:26 JST 2009
 #

data/test/functional/ft_15_timeout.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sun Jun 28 16:45:57 JST 2009
 #

data/test/functional/ft_16_participant_params.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jul  1 09:51:30 JST 2009
 #

data/test/functional/ft_18_kill.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Sun Jul  5 22:56:06 JST 2009
 #

data/test/functional/ft_19_alias.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Thu Jul 16 16:11:57 JST 2009
 #

data/test/functional/ft_1_process_status.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Fri May 15 09:51:28 JST 2009
 #

data/test/functional/ft_20_storage_participant.rb

@@ -68,5 +68,53 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert alpha.first.nil?
   end
+
+  def test_find_by_wfid
+
+    pdef = Ruote.process_definition :name => 'def0' do
+      concurrence do
+        alpha
+        alpha
+      end
+    end
+
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(:alpha)
+    wait_for(:alpha)
+      # wait for the two workitems
+
+    alpha = Ruote::StorageParticipant.new
+    alpha.context = @engine.context
+
+    assert_equal 2, alpha.size
+    assert_equal 2, alpha.by_wfid(wfid).size
+  end
+
+  def test_find_by_participant
+
+    pdef = Ruote.process_definition :name => 'def0' do
+      concurrence do
+        alpha
+        bravo
+      end
+    end
+
+    @engine.register_participant :alpha, Ruote::StorageParticipant
+    @engine.register_participant :bravo, Ruote::StorageParticipant
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(:bravo)
+
+    part = Ruote::StorageParticipant.new
+    part.context = @engine.context
+
+    assert_equal 2, part.size
+    assert_equal 1, part.by_participant('alpha').size
+    assert_equal 1, part.by_participant('bravo').size
+  end
 end
 

data/test/functional/ft_21_forget.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon Jul 27 09:17:51 JST 2009
 #

data/test/functional/ft_22_process_definitions.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Fri Jul 31 10:21:51 JST 2009
 #

data/test/functional/ft_23_load_defs.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Aug  5 08:35:38 JST 2009
 #

data/test/functional/ft_24_block_participants.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Tue Aug 11 13:56:28 JST 2009
 #

data/test/functional/ft_2_errors.rb

@@ -202,6 +202,46 @@ class FtErrorsTest < Test::Unit::TestCase
     assert_equal %w[ alpha alpha done. ].join("\n"), @tracer.to_s
   end
 
+  class WeakCancelParticipant
+    include Ruote::LocalParticipant
+
+    def initialize (opts)
+    end
+    def consume (workitem)
+      # losing it
+    end
+    def do_not_thread
+      true
+    end
+    def cancel (fei, flavour)
+      raise "failure in #cancel"
+    end
+  end
+
+  def test_error_in_participant_cancel
+
+    pdef = Ruote.process_definition do
+      alpha
+    end
+
+    @engine.register_participant 'alpha', WeakCancelParticipant
+
+    noisy
+
+    wfid = @engine.launch(pdef)
+
+    wait_for(:alpha)
+
+    @engine.cancel_process(wfid)
+
+    wait_for(wfid)
+
+    ps = @engine.process(wfid)
+
+    puts ps.errors.first.trace
+    puts ps.expressions.size
+  end
+
   def test_errors_and_subprocesses
 
     pdef = Ruote.process_definition do

data/test/functional/{ft_32_history.rb → ft_32_fs_history.rb}

@@ -18,7 +18,7 @@ require 'ruote/log/fs_history'
 require 'ruote/part/no_op_participant'
 
 
-class FtHistoryTest < Test::Unit::TestCase
+class FtFsHistoryTest < Test::Unit::TestCase
   include FunctionalBase
 
   def test_launch

data/test/functional/ft_35_add_service.rb

@@ -44,5 +44,13 @@ class FtAddServiceTest < Test::Unit::TestCase
     assert_equal MyService, @engine.context.toto.class
     assert_equal 'blue', @engine.context.toto.options['colour']
   end
+
+  def test_add_service_returns_service
+
+    toto = @engine.add_service(
+      'toto', 'ruote', 'FtAddServiceTest::MyService', 'colour' => 'blue')
+
+    assert_equal MyService, toto.class
+  end
 end
 

data/test/functional/ft_36_storage_history.rb

@@ -0,0 +1,91 @@
+
+#
+# testing ruote
+#
+# Tue Jan  5 17:51:10 JST 2010
+#
+
+require File.join(File.dirname(__FILE__), 'base')
+
+require 'ruote/log/fs_history'
+require 'ruote/part/no_op_participant'
+
+
+class FtStorageHistoryTest < Test::Unit::TestCase
+  include FunctionalBase
+
+  def test_by_wfid
+
+    pdef = Ruote.process_definition do
+      alpha
+      echo 'done.'
+    end
+
+    history = @engine.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    @engine.register_participant :alpha, Ruote::NoOpParticipant
+
+    #noisy
+
+    wfid0 = assert_trace(pdef, "done.")
+    wfid1 = assert_trace(pdef, "done.\ndone.")
+
+    sleep 0.100
+
+    assert_equal 17, @engine.storage.get_many('history').size
+
+    h = @engine.context.history.by_process(wfid0)
+    #h.each { |r| p r }
+    assert_equal 8, h.size
+
+    # testing record.to_h
+
+    h = @engine.context.history.by_process(wfid1)
+    #h.each { |r| p r }
+    assert_equal 8, h.size
+
+    history.clear!
+
+    assert_equal 0, @engine.storage.get_many('history').size
+  end
+
+  def test_by_date
+
+    @engine.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    6.times do |i|
+      @engine.storage.put(
+        '_id' => "2010-01-06!11414#{i}!0!!20100106-bichisosupo",
+        'type' => 'history')
+    end
+    7.times do |i|
+      @engine.storage.put(
+        '_id' => "2010-01-07!11414#{i}!0!!20100107-bichitehoni",
+        'type' => 'history')
+    end
+
+    assert_equal 6, @engine.context.history.by_date('2010-01-06').size
+    assert_equal 7, @engine.context.history.by_date('2010-01-07').size
+  end
+
+  def test_range
+
+    @engine.add_service(
+      'history', 'ruote/log/storage_history', 'Ruote::StorageHistory')
+
+    7.times do |i|
+      i = i + 1
+      @engine.storage.put(
+        '_id' => "2010-01-0#{i}!114147!0!!2010010#{i}-bichisosupo",
+        'type' => 'history')
+    end
+
+    assert_equal(
+      [ Time.parse('2010-01-01 00:00:00 UTC'),
+        Time.parse('2010-01-08 00:00:00 UTC') ],
+      @engine.context.history.range)
+  end
+end
+

data/test/functional/ft_3_participant_registration.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Mon May 18 22:25:57 JST 2009
 #

data/test/functional/ft_4_cancel.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun  3 08:42:07 JST 2009
 #

data/test/functional/ft_5_on_error.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Tue Jun  2 18:48:02 JST 2009
 #

data/test/functional/ft_6_on_cancel.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun  3 21:52:09 JST 2009
 #

data/test/functional/ft_7_tags.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun 10 11:03:26 JST 2009
 #

data/test/functional/ft_8_participant_consumption.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun 10 11:03:26 JST 2009
 #

data/test/functional/ft_9_subprocesses.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jun 10 17:41:23 JST 2009
 #

data/test/functional/rt_0_wait.rb

@@ -1,6 +1,6 @@
 
 #
-# Testing Ruote (OpenWFEru)
+# testing ruote
 #
 # Wed Jul  1 23:22:26 JST 2009
 #

data/test/unit/test.rb

@@ -1,6 +1,6 @@
 
 #
-# testing Ruote
+# testing ruote
 #
 # since Mon Oct  9 22:19:44 JST 2006
 #

data/test/unit/ut_17_storage.rb

@@ -10,7 +10,11 @@ begin
 rescue LoadError
   require 'json'
 end
-require 'patron' rescue nil
+begin
+  require 'patron'
+rescue LoadError
+  # stick with net/http
+end
 
 require File.join(File.dirname(__FILE__), %w[ .. test_helper.rb ])
 require File.join(File.dirname(__FILE__), %w[ .. functional storage_helper.rb ])
@@ -20,7 +24,7 @@ class UtStorage < Test::Unit::TestCase
 
   def setup
     @s = determine_storage({})
-    @s.add_test_type('dogfood') if @s.respond_to?(:add_test_type)
+    @s.add_type('dogfood')
     @s.put(
       '_id' => 'toto',
       'type' => 'dogfood',
@@ -130,5 +134,21 @@ class UtStorage < Test::Unit::TestCase
 
     assert_equal true, @s.put(h)
   end
+
+  def test_purge_type
+
+    @s.purge_type!('dogfood')
+
+    assert_equal 0, @s.get_many('dogfood').size
+  end
+
+  def test_ids
+
+    @s.put('_id' => 'ouinouin', 'type' => 'dogfood', 'message' => 'testing')
+    @s.put('_id' => 'nada', 'type' => 'dogfood', 'message' => 'testing')
+    @s.put('_id' => 'estereo', 'type' => 'dogfood', 'message' => 'testing')
+
+    assert_equal %w[ estereo nada ouinouin toto ], @s.ids('dogfood')
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruote
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +09:00
+date: 2010-01-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.10
+        version: 0.1.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: rufus-dollar
@@ -194,6 +194,7 @@ files:
 - lib/ruote/id/mnemo_wfid_generator.rb
 - lib/ruote/id/wfid_generator.rb
 - lib/ruote/log/fs_history.rb
+- lib/ruote/log/storage_history.rb
 - lib/ruote/log/test_logger.rb
 - lib/ruote/log/wait_logger.rb
 - lib/ruote/parser.rb
@@ -298,10 +299,11 @@ files:
 - test/functional/ft_2_errors.rb
 - test/functional/ft_30_smtp_participant.rb
 - test/functional/ft_31_part_blocking.rb
-- test/functional/ft_32_history.rb
+- test/functional/ft_32_fs_history.rb
 - test/functional/ft_33_participant_subprocess_priority.rb
 - test/functional/ft_34_cursor_rewind.rb
 - test/functional/ft_35_add_service.rb
+- test/functional/ft_36_storage_history.rb
 - test/functional/ft_3_participant_registration.rb
 - test/functional/ft_4_cancel.rb
 - test/functional/ft_5_on_error.rb