ruote 2.1.5 → 2.1.6

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = ruote - CHANGELOG.txt
 
 
+== ruote - 2.1.6    released 2010/02/08
+
+- welcoming ruote-dm (datamapper persistency)
+- Engine#re_apply(fei, opts) where opts in [ :tree, :fields, :merge_in_fields ]
+- fixed issue about StorageParticipant#update, thanks Torsten
+
+
 == ruote - 2.1.5    released 2010/01/28
 
 - fixed StorageParticipant a to b flow, fix by Torsten

data/Rakefile

@@ -1,9 +1,9 @@
 
+require 'lib/ruote/version.rb'
+
 require 'rubygems'
 require 'rake'
 
-$:.unshift( File.join(File.dirname(__FILE__), 'lib') )
-require File.join(File.dirname(__FILE__), %w[ lib ruote worker.rb ])
 
 begin
 
@@ -60,7 +60,7 @@ CLEAN.include('pkg', 'rdoc', 'work', 'logs')
 task :default => [ :clean ]
 
 desc 'Upload the documentation to rubyforge'
-task :upload_rdoc => :rdoc do
+task :upload_rdoc => :yard do
   sh %{
     rsync -azv -e ssh \
       ruote_rdoc \

data/TODO.txt

@@ -300,3 +300,7 @@
 
 [ ] engine.on_error = 'participant_name'
 
+[ ] "open days" plugin / service / lambda ? is_open_day?(d)
+
+[ ] engine.re_apply(fei, wi) (thanks Torsten)... :wi => x, :tree => y...
+

data/examples/barley.rb

@@ -0,0 +1,390 @@
+
+#--
+# Copyright (c) 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.
+#++
+
+# featured in
+#   http://jmettraux.wordpress.com/2010/01/29/barley/
+
+
+require 'rubygems'
+
+#
+# the users
+#
+
+USERS = {
+  '_none_' => 'http://s.twimg.com/a/1264550348/images/default_profile_0_normal.png',
+  'john' => 'http://www.gravatar.com/avatar/8d96626e52beb1ff90f57a8e189e1e6f',
+  'kenneth' => 'http://www.gravatar.com/avatar/8e033d0007374b14f6c213ede64d470b',
+  'torsten' => 'http://www.gravatar.com/avatar/3fa5d7edd1f21da184964146e062c8da',
+  'postmodern' => 'http://a3.twimg.com/profile_images/261097869/postmodern_bigger.jpg',
+  'amedeo' => 'http://a1.twimg.com/profile_images/99817242/me_bigger.png',
+  'radlepunktde' => 'http://a1.twimg.com/profile_images/303265014/radlepunktde_bigger.jpg'
+}
+
+
+#
+# the workflow engine
+#
+
+require 'ruote'
+require 'ruote/part/storage_participant'
+require 'ruote/storage/fs_storage'
+
+ENGINE = Ruote::Engine.new(
+  Ruote::Worker.new(Ruote::FsStorage.new('ruote_data')))
+
+
+#
+# the workflow participants
+#
+
+ENGINE.register_participant('trace') do |workitem|
+  (workitem.fields['trace'] ||= []) << [
+    Time.now.strftime('%Y-%m-%d %H:%M:%S'),
+    workitem.fields['next'],
+    workitem.fields['task'] ]
+end
+
+ENGINE.register_participant('.+', Ruote::StorageParticipant)
+
+PART = Ruote::StorageParticipant.new(ENGINE)
+  # a handy pointer into the workitems
+
+
+#
+# the (only) process definition
+#
+
+PDEF = Ruote.process_definition :name => 'barely' do
+  cursor do
+    trace
+    participant '${f:next}'
+    rewind :if => '${f:next}'
+  end
+end
+
+#
+# web resources (thanks to Sinatra)
+#
+
+require 'cgi'
+require 'sinatra'
+require 'haml'
+
+use_in_file_templates!
+
+def h (s)
+  Rack::Utils.escape_html(s)
+end
+
+def sort (workitems)
+  workitems.sort! do |wi0, wi1|
+    (wi0.fields['last'] || '') <=> (wi1.fields['last'] || '')
+  end
+end
+
+set :haml, { :format => :html5 }
+
+get '/' do
+  redirect '/work'
+end
+
+get '/work' do
+
+  @workitems = PART.all
+  sort(@workitems)
+
+  haml :work
+end
+
+get '/work/:thing' do
+
+  t = params[:thing]
+
+  @workitems = if USERS[t]
+    PART.by_participant(t)
+  else
+    PART.by_field('subject', t)
+  end
+  sort(@workitems)
+
+  haml :work
+end
+
+post '/new' do
+
+  if n = params['next']
+    wfid = ENGINE.launch(
+      PDEF,
+      'next' => n,
+      'subject' => params['subject'],
+      'task' => params['task'],
+      'last' => Ruote.now_to_utc_s)
+  end
+
+  sleep 0.5
+
+  redirect '/work'
+end
+
+post '/work' do
+
+  fei = params['fei']
+  fei = Ruote::FlowExpressionId.from_id(fei, ENGINE.context.engine_id)
+
+  workitem = PART[fei]
+    # fetch workitem from storage
+
+  if params['action'] == 'resume'
+    workitem.fields['next'] = params['next']
+    workitem.fields['task'] = params['task']
+    workitem.fields['last'] = Ruote.now_to_utc_s
+    PART.reply(workitem)
+  else # params['action'] == 'terminate'
+    workitem.fields.delete('next')
+    PART.reply(workitem)
+  end
+
+  sleep 0.5
+
+  redirect '/work'
+end
+
+__END__
+
+@@work
+
+%html
+  %head
+    %title barley
+
+    %script( src='http://code.jquery.com/jquery-1.4.1.min.js' )
+
+    %link( href='http://barley.s3.amazonaws.com/reset.css' type='text/css' rel='stylesheet' )
+    %link( href='http://ruote.rubyforge.org/images/ruote.png' type='image/png' rel='icon' )
+
+    %style
+      :sass
+        body
+          font-family: "helvetica neue", helvetica
+          font-size: 14pt
+          margin-left: 20%
+          margin-right: 20%
+          margin-top: 20pt
+
+          background: #C0DEED url('http://a3.twimg.com/a/1264550348/images/bg-clouds.png') repeat-x
+        p
+          margin-bottom: 5pt
+        input[type='text']
+          width: 100%
+        img
+          width: 38px
+        a
+          color: black
+          text-decoration: none
+        a:visited
+          color: black
+          text-decoration: none
+        a:active
+          color: black
+          text-decoration: none
+        #barley
+          font-size: 350%
+          font-weight: lighter
+          color: white
+          padding-left: 2pt
+          padding-bottom: 7pt
+        #buttons
+          font-size: 90%
+          color: white
+          margin-bottom: 14pt
+        #buttons a
+          color: white
+        #buttons a:visited
+          color: white
+        .workitem
+          margin-bottom: 7pt
+        .workitem > *
+          float: left
+        .workitem:after
+          display: block
+          clear: both
+          visibility: hidden
+          content: ''
+        .wi_info
+          margin-left: 3pt
+        .wi_user
+          font-weight: bold
+        .wi_task
+          opacity: 0.37
+          cursor: pointer
+        .wi_wfid
+          font-size: 70%
+          vertical-align: middle
+          font-weight: lighter
+        table
+          width: 100%
+        tr.buttons > td
+          text-align: center
+          padding-top: 4pt
+        td
+          vertical-align: middle
+        td.constrained
+          width: 1%
+          padding-right: 1em
+        td.label
+          font-weight: lighter
+        .trace
+          opacity: 0.37
+          margin-bottom: 4pt
+          cursor: pointer
+        .trace_detail
+          padding-left: 2pt
+          border-left: 2.5pt solid #8EC1DA
+        .trace_step
+          width: 100%
+        .trace_step_time
+          font-size: 70%
+        .trace_step_user
+          font-weight: bold
+          opacity: 0.6
+        .trace_step_task
+          opacity: 0.37
+
+  %body
+
+    #barley
+      %span{ :onclick => "document.location.href = '/work';", :style => 'cursor: pointer;' } barley
+
+    #message
+      #{@message}
+
+    #buttons
+
+      %a{ :href => '', :onclick => "$('#new_form').slideToggle(); $('#new_next').focus(); return false;" } new
+      |
+      %a{ :href => '/work' } all
+
+    #new_form{ :style => 'display: none;' }
+      %form{ :action => '/new', :method => 'POST' }
+        %table
+          %tr
+            %td.constrained{ :rowspan => 2 }
+              %select#new_next{ :name => 'next', :onchange => "this.options[selectedIndex].select();" }
+                - USERS.keys.sort.each do |uname|
+                  - uavatar = USERS[uname]
+                  %option{ :id => "new_#{uname}" } #{uname}
+                  :javascript
+                    document.getElementById('new_#{uname}').select = function () {
+                      $('#new_avatar').get(0).src = '#{uavatar}';
+                      $('#new_subject').focus();
+                    }
+              :javascript
+                $('#new_next').get(0).value = '_none_';
+            %td.constrained{ :rowspan => 2 }
+              %img#new_avatar{ :src => USERS['_none_'] }
+            %td.constrained.label
+              subject
+            %td
+              %input{ :id => 'new_subject', :type => 'text', :name => 'subject', :value => '' }
+          %tr
+            %td.constrained.label
+              task
+            %td
+              %input{ :type => 'text', :name => 'task', :value => '' }
+          %tr.buttons
+            %td{ :colspan => 4 }
+              %input{ :type => 'submit', :value => 'launch' }
+
+    #work
+      - @workitems.each do |workitem|
+
+        - wid = "workitem#{workitem.fei.hash.to_s}"
+
+        .workitem
+          .wi_user_image
+            %img{ :src => USERS[workitem.participant_name], :class => 'wi_user' }
+          .wi_info
+            .wi_first_line
+              %span.wi_user
+                %a{ :href => "/work/#{h workitem.participant_name}" } #{h workitem.participant_name}
+              %span.wi_subject
+                %a{ :href => "/work/#{CGI.escape(workitem.fields['subject'])}" } #{h workitem.fields['subject']}
+              %span.wi_task{ :onclick => "$('##{wid}').slideToggle(); $('#next_#{wid}').focus();" }
+                #{h workitem.fields['task']}
+            .wi_second_line
+              %span.wi_wfid
+                #{workitem.fei.wfid}
+                - t = Rufus.to_ruby_time(workitem.fields['last'])
+                - ago = Rufus.to_duration_string(Time.now - t.to_time, :drop_seconds => true)
+                - ago = (ago.strip == '') ? 'a few seconds' : ago
+                (#{ago} ago)
+
+        .workitem_form{ :style => 'display: none;', :id => wid }
+
+          .trace{ :onclick => "$('#trace#{wid}').slideToggle();" }
+            - names = workitem.fields['trace'].collect { |e| e[1] }
+            #{names.join(' &#187; ')}
+
+          .trace_detail{ :id => "trace#{wid}", :style => 'display: none;' }
+            - workitem.fields['trace'].each do |time, user, task|
+              - t = Rufus.to_ruby_time(time)
+              - ago = Rufus.to_duration_string(Time.now - t.to_time, :drop_seconds => true)
+              %p.trace_step
+                %span.trace_step_time #{h time} (#{ago} ago)
+                %span.trace_step_user #{h user}
+                %span.trace_step_task #{h task}
+
+          %form{ :action => '/work', :method => 'POST' }
+            %input{ :type => 'hidden', :name => 'fei', :value => workitem.fei.to_storage_id }
+            %table
+              %tr
+                %td.constrained{ :rowspan => 2 }
+                  %select{ :id => "next_#{wid}", :name => 'next', :onchange => "this.options[selectedIndex].select();" }
+                    - USERS.keys.sort.each do |uname|
+                      - uavatar = USERS[uname]
+                      %option{ :id => "#{uname}_#{wid}" } #{uname}
+                      :javascript
+                        document.getElementById('#{uname}_#{wid}').select = function () {
+                          $('#avatar_#{wid}').get(0).src = '#{uavatar}';
+                          $('#task_#{wid}').focus();
+                        }
+                  :javascript
+                    $('#next_#{wid}').get(0).value = '#{workitem.participant_name}';
+                %td.constrained{ :rowspan => 2 }
+                  %img{ :src => USERS[workitem.participant_name], :id => "avatar_#{wid}" }
+                %td.constrained.label
+                  subject
+                %td
+                  #{h workitem.fields['subject']}
+              %tr
+                %td.constrained.label
+                  task
+                %td
+                  %input{ :id => "task_#{wid}", :type => 'text', :name => 'task', :value => workitem.fields['task'] }
+              %tr.buttons
+                %td{ :colspan => 4 }
+                  %input{ :type => 'submit', :name => 'action', :value => 'resume' }
+                  or
+                  %input{ :type => 'submit', :name => 'action', :value => 'terminate' }
+

data/lib/ruote/engine.rb

@@ -124,9 +124,23 @@ module Ruote
     # (all the children have been cancelled), the expression will get
     # re-applied.
     #
-    def re_apply (fei)
+    # == options
+    #
+    # :tree is used to completely change the tree of the expression at re_apply
+    #
+    #   engine.re_apply(fei, :tree => [ 'participant', { 'ref' => 'bob' }, [] ])
+    #
+    # :fields is used to replace the fields of the workitem at re_apply
+    #
+    #   engine.re_apply(fei, :fields => { 'customer' => 'bob' })
+    #
+    # :merge_in_fields is used to add / override fields
+    #
+    #   engine.re_apply(fei, :merge_in_fields => { 'customer' => 'bob' })
+    #
+    def re_apply (fei, opts={})
 
-      @context.storage.put_msg('cancel', 'fei' => fei.to_h, 're_apply' => true)
+      @context.storage.put_msg('cancel', 'fei' => fei.to_h, 're_apply' => opts)
     end
 
     # Returns a ProcessStatus instance describing the current status of

data/lib/ruote/exp/flowexpression.rb

@@ -318,10 +318,21 @@ module Ruote::Exp
       ] if h.state == 'timing_out'
 
       if h.state == 'cancelling'
+
         if t = msg['on_cancel']
+
           h.on_cancel = t
-        elsif msg['re_apply']
-          h.on_cancel = tree
+
+        elsif hra = msg['re_apply']
+
+          hra = {} if hra == true
+          h.on_cancel = hra['tree'] || tree
+          if fs = hra['fields']
+            h.applied_workitem['fields'] = fs
+          end
+          if mfs = hra['merge_in_fields']
+            h.applied_workitem['fields'].merge!(mfs)
+          end
         end
       end
 

data/lib/ruote/fei.rb

@@ -22,7 +22,7 @@
 # Made in Japan.
 #++
 
-
+require 'ruote/version'
 require 'ruote/util/misc'
 require 'ruote/util/hashdot'
 

data/lib/ruote/part/block_participant.rb

@@ -87,7 +87,10 @@ module Ruote
           workitem, Ruote::Exp::FlowExpression.fetch(@context, workitem.h.fei))
       end
 
-      workitem.result = r if r != nil && r != workitem
+      if r != nil && r != workitem
+        #workitem.result = r
+        workitem.result = (Rufus::Json.dup(r) rescue nil)
+      end
 
       reply_to_engine(workitem)
     end

data/lib/ruote/part/engine_participant.rb

@@ -37,25 +37,25 @@ module Ruote
   #
   # For instance :
   #
-  #  engine0 =
-  #    Ruote::Engine.new(
-  #      Ruote::Worker.new(
-  #        Ruote::FsStorage.new('work0', 'engine_id' => 'engine0')))
-  #  engine1 =
-  #    Ruote::Engine.new(
-  #      Ruote::Worker.new(
-  #        Ruote::FsStorage.new('work1', 'engine_id' => 'engine1')))
-  #
-  #  engine0.register_participant('engine1',
-  #    Ruote::EngineParticipant,
-  #    'storage_class' => Ruote::FsStorage,
-  #    'storage_path' => 'ruote/storage/fs_storage',
-  #    'storage_args' => 'work1')
-  #  engine1.register_participant('engine0',
-  #    Ruote::EngineParticipant,
-  #    'storage_class' => Ruote::FsStorage,
-  #    'storage_path' => 'ruote/storage/fs_storage',
-  #    'storage_args' => 'work0')
+  #   engine0 =
+  #     Ruote::Engine.new(
+  #       Ruote::Worker.new(
+  #         Ruote::FsStorage.new('work0', 'engine_id' => 'engine0')))
+  #   engine1 =
+  #     Ruote::Engine.new(
+  #       Ruote::Worker.new(
+  #         Ruote::FsStorage.new('work1', 'engine_id' => 'engine1')))
+  #
+  #   engine0.register_participant('engine1',
+  #     Ruote::EngineParticipant,
+  #     'storage_class' => Ruote::FsStorage,
+  #     'storage_path' => 'ruote/storage/fs_storage',
+  #     'storage_args' => 'work1')
+  #   engine1.register_participant('engine0',
+  #     Ruote::EngineParticipant,
+  #     'storage_class' => Ruote::FsStorage,
+  #     'storage_path' => 'ruote/storage/fs_storage',
+  #     'storage_args' => 'work0')
   #
   # In this example, two engines are created (note that their 'engine_id' is
   # explicitely set (else it would default to 'engine')). Each engine is then

data/lib/ruote/part/storage_participant.rb

@@ -61,8 +61,6 @@ module Ruote
 
       doc = workitem.to_h
 
-      doc.delete('_rev')
-
       doc.merge!(
         'type' => 'workitems',
         '_id' => to_id(doc['fei']),
@@ -110,6 +108,8 @@ module Ruote
 
       return reply(workitem) if r != nil
 
+      workitem.h.delete('_rev')
+
       reply_to_engine(workitem)
     end
 

data/lib/ruote/version.rb

@@ -0,0 +1,28 @@
+#--
+# 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
+  VERSION = '2.1.6'
+end
+

data/lib/ruote/worker.rb

@@ -27,8 +27,6 @@ require 'ruote/fei'
 
 module Ruote
 
-  VERSION = '2.1.5'
-
   class Worker
 
     EXP_ACTIONS = %w[ reply cancel fail receive ]

data/ruote.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote}
-  s.version = "2.1.5"
+  s.version = "2.1.6"
 
   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-28}
+  s.date = %q{2010-02-08}
   s.description = %q{
 ruote is an open source ruby workflow engine.
     }
@@ -26,6 +26,7 @@ ruote is an open source ruby workflow engine.
      "README.rdoc",
      "Rakefile",
      "TODO.txt",
+     "examples/barley.rb",
      "examples/flickr_report.rb",
      "examples/ruote_quickstart.rb",
      "examples/web_first_page.rb",
@@ -113,6 +114,7 @@ ruote is an open source ruby workflow engine.
      "lib/ruote/util/time.rb",
      "lib/ruote/util/tree.rb",
      "lib/ruote/util/treechecker.rb",
+     "lib/ruote/version.rb",
      "lib/ruote/worker.rb",
      "lib/ruote/workitem.rb",
      "phil.txt",
@@ -214,6 +216,7 @@ ruote is an open source ruby workflow engine.
      "test/pdef.xml",
      "test/test.rb",
      "test/test_helper.rb",
+     "test/unit/storage.rb",
      "test/unit/storages.rb",
      "test/unit/test.rb",
      "test/unit/ut_0_ruby_parser.rb",
@@ -222,7 +225,6 @@ ruote is an open source ruby workflow engine.
      "test/unit/ut_14_is_uri.rb",
      "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",

data/test/functional/base.rb

@@ -29,6 +29,8 @@ module FunctionalBase
           determine_storage(
             's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])))
 
+    #p @engine.storage.class
+
     @tracer = Tracer.new
 
     @engine.add_service('tracer', @tracer)

data/test/functional/ct_0_concurrence.rb

@@ -50,9 +50,9 @@ class CtConcurrenceTest < Test::Unit::TestCase
       msgs.each do |m|
 
         fei = m['fei'] ?
-          Ruote::FlowExpressionId.to_s_id(m['fei']) : ''
+          Ruote::FlowExpressionId.to_storage_id(m['fei']) : ''
         wi_fei = m['workitem'] ?
-          Ruote::FlowExpressionId.to_s_id(m['workitem']['fei']) : ''
+          Ruote::FlowExpressionId.to_storage_id(m['workitem']['fei']) : ''
 
         p [ m['action'], fei, wi_fei ]
       end

data/test/functional/ft_14_re_apply.rb

@@ -13,20 +13,21 @@ require 'ruote/part/hash_participant'
 class FtReApplyTest < Test::Unit::TestCase
   include FunctionalBase
 
+  PDEF = Ruote.process_definition do
+    sequence do
+      alpha
+      echo 'done.'
+    end
+  end
+
   def test_re_apply
 
-    pdef = Ruote.process_definition do
-      sequence do
-        alpha
-        echo 'done.'
-      end
-    end
 
     alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @engine.launch(PDEF)
     wait_for(:alpha)
 
     id0 = alpha.first.object_id
@@ -53,10 +54,75 @@ class FtReApplyTest < Test::Unit::TestCase
 
   def test_cancel_and_re_apply
 
+    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+
+    #noisy
+
+    wfid = @engine.launch(PDEF)
+    wait_for(:alpha)
+
+    id0 = alpha.first.object_id
+
+    # ... flow stalled ...
+
+    ps = @engine.process(wfid)
+
+    stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
+
+    @engine.re_apply(stalled_exp.fei)
+
+    wait_for(:alpha)
+
+    assert_equal 1, alpha.size
+    assert_not_equal id0, alpha.first.object_id
+
+    alpha.reply(alpha.first)
+
+    wait_for(wfid)
+
+    assert_equal 'done.', @tracer.to_s
+  end
+
+  def test_update_expression_and_re_apply
+
+    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+
+    #noisy
+
+    wfid = @engine.launch(PDEF)
+    wait_for(:alpha)
+
+    id0 = alpha.first.object_id
+
+    # ... flow stalled ...
+
+    ps = @engine.process(wfid)
+
+    stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
+
+    stalled_exp.update_tree([
+      'participant', { 'ref' => 'alpha', 'activity' => 'mow lawn' }, [] ])
+    stalled_exp.persist
+
+    @engine.re_apply(stalled_exp.fei)
+
+    wait_for(:alpha)
+
+    assert_equal 'mow lawn', alpha.first.fields['params']['activity']
+
+    alpha.reply(alpha.first)
+
+    wait_for(wfid)
+
+    assert_equal 'done.', @tracer.to_s
+  end
+
+  def test_re_apply_with_new_workitem_fields
+
     pdef = Ruote.process_definition do
       sequence do
         alpha
-        echo 'done.'
+        echo 'done for ${f:x}.'
       end
     end
 
@@ -75,7 +141,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
 
-    @engine.re_apply(stalled_exp.fei)
+    @engine.re_apply(stalled_exp.fei, :fields => { 'x' => 'nada' })
 
     wait_for(:alpha)
 
@@ -86,15 +152,15 @@ class FtReApplyTest < Test::Unit::TestCase
 
     wait_for(wfid)
 
-    assert_equal 'done.', @tracer.to_s
+    assert_equal 'done for nada.', @tracer.to_s
   end
 
-  def test_update_expression_and_re_apply
+  def test_re_apply_with_merged_workitem_fields
 
     pdef = Ruote.process_definition do
       sequence do
         alpha
-        echo 'done.'
+        echo 'done for ${f:x} and ${f:y}.'
       end
     end
 
@@ -102,7 +168,7 @@ class FtReApplyTest < Test::Unit::TestCase
 
     #noisy
 
-    wfid = @engine.launch(pdef)
+    wfid = @engine.launch(pdef, { 'y' => 'nemo' })
     wait_for(:alpha)
 
     id0 = alpha.first.object_id
@@ -113,21 +179,43 @@ class FtReApplyTest < Test::Unit::TestCase
 
     stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
 
-    stalled_exp.update_tree([
-      'participant', { 'ref' => 'alpha', 'activity' => 'mow lawn' }, [] ])
-    stalled_exp.persist
-
-    @engine.re_apply(stalled_exp.fei)
+    @engine.re_apply(stalled_exp.fei, :merge_in_fields => { 'x' => 'nada' })
 
     wait_for(:alpha)
 
-    assert_equal 'mow lawn', alpha.first.fields['params']['activity']
+    assert_equal 1, alpha.size
+    assert_not_equal id0, alpha.first.object_id
 
     alpha.reply(alpha.first)
 
     wait_for(wfid)
 
-    assert_equal 'done.', @tracer.to_s
+    assert_equal 'done for nada and nemo.', @tracer.to_s
+  end
+
+  def test_re_apply_with_new_tree
+
+    alpha = @engine.register_participant :alpha, Ruote::HashParticipant.new
+
+    #noisy
+
+    wfid = @engine.launch(PDEF)
+    wait_for(:alpha)
+
+    id0 = alpha.first.object_id
+
+    # ... flow stalled ...
+
+    ps = @engine.process(wfid)
+
+    stalled_exp = ps.expressions.find { |fexp| fexp.fei.expid == '0_0_0' }
+
+    @engine.re_apply(
+      stalled_exp.fei, :tree => [ 'echo', { 're_applied' => nil }, [] ])
+
+    wait_for(wfid)
+
+    assert_equal "re_applied\ndone.", @tracer.to_s
   end
 end
 

data/test/functional/ft_20_storage_participant.rb

@@ -112,7 +112,7 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     end
   end
 
-  def test_find_by_participant
+  def test_by_participant
 
     @engine.register_participant :alpha, Ruote::StorageParticipant
     @engine.register_participant :bravo, Ruote::StorageParticipant
@@ -125,6 +125,7 @@ class FtStorageParticipantTest < Test::Unit::TestCase
     part.context = @engine.context
 
     assert_equal 2, part.size
+    #part.by_participant('alpha').each { |wi| p wi }
     assert_equal 1, part.by_participant('alpha').size
     assert_equal 1, part.by_participant('bravo').size
   end
@@ -235,5 +236,24 @@ class FtStorageParticipantTest < Test::Unit::TestCase
 
     assert_nil @engine.process(wfid)
   end
+
+  def test_update_workitem
+
+    @engine.register_participant 'alpha', Ruote::StorageParticipant
+
+    wfid = @engine.launch(Ruote.process_definition { alpha })
+
+    alpha = Ruote::StorageParticipant.new(@engine)
+
+    wait_for(:alpha)
+
+    wi = alpha.first
+
+    wi.fields['jidai'] = 'heian'
+
+    alpha.update(wi)
+
+    assert_equal 'heian', alpha.first.fields['jidai']
+  end
 end
 

data/test/functional/ft_24_block_participants.rb

@@ -38,22 +38,36 @@ class FtBlockParticipantTest < Test::Unit::TestCase
     assert_trace pdef, "a\nb:f0:f0val\nc:f0:f0val:v0val"
   end
 
+  TEST_BLOCK = Ruote.process_definition do
+    sequence do
+      alpha
+      echo '${f:__result__}'
+    end
+  end
+
   def test_block_result
 
-    pdef = Ruote.process_definition do
-      sequence do
-        alpha
-        echo '${f:__result__}'
-      end
+    @engine.register_participant :alpha do |workitem|
+      'seen'
     end
 
+    #noisy
+
+    assert_trace TEST_BLOCK, 'seen'
+  end
+
+  def test_non_jsonfiable_result
+
+    t = Time.now
+
     @engine.register_participant :alpha do |workitem|
-      'seen'
+      t
     end
 
     #noisy
 
-    assert_trace pdef, 'seen'
+    #assert_trace TEST_BLOCK, Ruote.time_to_utc_s(t)
+    assert_trace TEST_BLOCK, defined?(DataMapper) ? '' : t.to_s
   end
 end
 

data/test/functional/test.rb

@@ -13,7 +13,7 @@ def l (t)
 
     puts
     puts "=== #{t} :"
-    puts `ruby#{_v} #{t}`
+    puts `ruby#{_v} #{t} #{ARGV.join(' ')}`
 
     exit $?.exitstatus if $?.exitstatus != 0
   else

data/test/unit/{ut_17_storage.rb → storage.rb}

@@ -61,6 +61,7 @@ class UtStorage < Test::Unit::TestCase
     h = @s.get('dogfood', 'nada')
 
     assert_not_nil h['_rev']
+    assert_not_nil h['put_at']
   end
 
   def test_put_fail
@@ -80,6 +81,24 @@ class UtStorage < Test::Unit::TestCase
     assert_not_nil doc['_rev']
   end
 
+  def test_put_put_and_put
+
+    doc = { '_id' => 'whiskas', 'type' => 'dogfood', 'message' => 'miam' }
+
+    r = @s.put(doc)
+    doc = @s.get('dogfood', 'whiskas')
+
+    r = @s.put(doc)
+    assert_nil r
+
+    doc = @s.get('dogfood', 'whiskas')
+
+    assert_not_nil doc['put_at']
+
+    r = @s.put(doc)
+    assert_nil r
+  end
+
   def test_delete_fail
 
     assert_raise(ArgumentError) do
@@ -150,5 +169,16 @@ class UtStorage < Test::Unit::TestCase
 
     assert_equal %w[ estereo nada ouinouin toto ], @s.ids('dogfood')
   end
+
+  def test_get_many
+
+    30.times do |i|
+      @s.put('_id' => "xx!#{i}", 'type' => 'dogfood', 'msg' => "whatever #{i}")
+    end
+
+    assert_equal 31, @s.get_many('dogfood').size
+    assert_equal 10, @s.get_many('dogfood', nil, :limit => 10).size
+    assert_equal 1, @s.get_many('dogfood', /!7$/).size
+  end
 end
 

data/test/unit/storages.rb

@@ -1,13 +1,17 @@
 
 puts "\n\n\n== in memory"
 puts
-puts `ruby test/unit/ut_17_storage.rb`
+puts `ruby test/unit/storage.rb`
 
 puts "\n\n\n== fs_storage"
 puts
-puts `ruby test/unit/ut_17_storage.rb --fs`
+puts `ruby test/unit/storage.rb --fs`
 
 puts "\n\n\n== couch_storage"
 puts
-puts `ruby -r patron -r yajl test/unit/ut_17_storage.rb --couch`
+puts `ruby -r patron -r yajl test/unit/storage.rb --couch`
+
+puts "\n\n\n== dm_storage"
+puts
+puts `ruby -r yajl test/unit/storage.rb --dm`
 

data/test/unit/test.rb

@@ -5,6 +5,8 @@
 # since Mon Oct  9 22:19:44 JST 2006
 #
 
+load File.join(File.dirname(__FILE__), 'storage.rb')
+
 Dir.glob(File.join(File.dirname(__FILE__), 'ut_*.rb')).sort.each { |t| load(t) }
 Dir.glob(File.join(File.dirname(__FILE__), 'hut_*.rb')).sort.each { |t| load(t) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruote
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - John Mettraux
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 +09:00
+date: 2010-02-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO.txt
+- examples/barley.rb
 - examples/flickr_report.rb
 - examples/ruote_quickstart.rb
 - examples/web_first_page.rb
@@ -228,6 +229,7 @@ files:
 - lib/ruote/util/time.rb
 - lib/ruote/util/tree.rb
 - lib/ruote/util/treechecker.rb
+- lib/ruote/version.rb
 - lib/ruote/worker.rb
 - lib/ruote/workitem.rb
 - phil.txt
@@ -329,6 +331,7 @@ files:
 - test/pdef.xml
 - test/test.rb
 - test/test_helper.rb
+- test/unit/storage.rb
 - test/unit/storages.rb
 - test/unit/test.rb
 - test/unit/ut_0_ruby_parser.rb
@@ -337,7 +340,6 @@ files:
 - test/unit/ut_14_is_uri.rb
 - 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