ruote 2.3.0 → 2.3.0.1

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = ruote - CHANGELOG.txt
 
 
+== ruote - 2.3.0.1    released 2012/09/08
+
+- pin ruote.gemspec to blankslate 2.1.2.4
+  (since blankslate 3.1 is out and Parslet wants ~> 2.1...)
+- FlowExpression#root(stubborn=false)
+
+
 == ruote - 2.3.0    released 2012/09/04
 
 - Dashboard#wait_for('action' => 'apply', 'name' => 'wait')

data/lib/ruote/exp/flow_expression.rb

@@ -184,29 +184,47 @@ module Ruote::Exp
         nil
     end
 
-    # Returns the root expression of this expression.
+    # An expensive method, looks up all the expressions with the same wfid
+    # in the storage (for some storages this is not expensive at all),
+    # and determine the root of this expression.
+    # It does this by recursively going from an expression to its parent,
+    # starting with this expression. The root is when the parent can't be
+    # reached.
     #
-    # The result is an instance of Ruote::FlowExpression or nil if the
-    # parent cannot be found.
+    # By default, this method will always return an expression, but if
+    # stubborn is set to true and the top expression points to a gone parent
+    # then nil will be returned.
+    # The default (stubborn=true) is probably what you want anyway.
     #
-    def root
+    def root(stubborn=false)
 
+      previous = nil
       current = @h
-      exps = @context.storage.find_expressions(h.fei['wfid'])
+
+      exps = @context.storage.find_expressions(
+        @h['fei']['wfid']
+      ).each_with_object({}) { |exp, h|
+        h[exp['fei']] = exp
+      }
 
       while current && current['parent_id']
-        current = exps.find { |e| e['fei'] == current['parent_id'] }
+        previous = current
+        current = exps[current['parent_id']]
       end
 
+      current ||= previous unless stubborn
+
       current ? Ruote::Exp::FlowExpression.from_h(@context, current) : nil
     end
 
     # Returns the fei of the root expression of this expression.
     # The result is an instance of Ruote::FlowExpressionId.
     #
-    def root_id
+    # Uses #root behind the scenes, hence the stubborn option.
+    #
+    def root_id(stubborn=false)
 
-      root.fei
+      root(stubborn).fei
     end
 
     # Turns this FlowExpression instance into a Hash (well, just hands back

data/lib/ruote/version.rb

@@ -24,6 +24,6 @@
 
 module Ruote
 
-  VERSION = '2.3.0'
+  VERSION = '2.3.0.1'
 end
 

data/ruote.gemspec

@@ -24,7 +24,7 @@ ruote is an open source Ruby workflow engine
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  s.add_runtime_dependency 'blankslate', '>= 2.1.2.4'
+  s.add_runtime_dependency 'blankslate', '2.1.2.4'
   s.add_runtime_dependency 'parslet', '>= 1.4.0'
     # blankslate 2.1.2.3 is to avoid...
 

data/test/functional/eft_0_flow_expression.rb

@@ -31,5 +31,40 @@ class EftFlowExpressionTest < Test::Unit::TestCase
 
     assert_equal '0', fexp.root_id.expid
   end
+
+  class MyParticipant < Ruote::Participant
+    def on_workitem
+      workitem.fields['roots'] = [
+        fexp.root.class.to_s, fexp.root(true).class.to_s
+      ]
+      reply
+    end
+  end
+
+  def test_root_stubborn
+
+    @dashboard.register :toto, MyParticipant
+
+    pdef = Ruote.define do
+      concurrence :remaining => 'forget', :wait_for => 1 do
+        sequence do
+          # exit immediately
+        end
+        sequence do
+          wait '1s'
+          toto
+        end
+      end
+    end
+
+    wfid = @dashboard.launch(pdef)
+
+    @dashboard.wait_for('terminated')
+    r = @dashboard.wait_for('ceased')
+
+    assert_equal(
+      %w[ Ruote::Exp::ConcurrenceExpression NilClass ],
+      r['workitem']['fields']['roots'])
+  end
 end
 

metadata

@@ -1,222 +1,217 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruote
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 2.3.0.1
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 0
-  version: 2.3.0
 platform: ruby
-authors: 
+authors:
 - John Mettraux
 - Kenneth Kalmer
 - Torsten Schoenebaum
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: blankslate
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 103
-        segments: 
-        - 2
-        - 1
-        - 2
-        - 4
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.1.2.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: parslet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.2.4
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sourcify
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: sourcify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rufus-json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rufus-json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rufus-cloche
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rufus-cloche
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rufus-dollar
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: rufus-dollar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rufus-mnemo
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: rufus-mnemo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rufus-scheduler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 0
-        - 16
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.16
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rufus-treechecker
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 0
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.16
+- !ruby/object:Gem::Dependency
+  name: rufus-treechecker
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.8
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mailtrap
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mailtrap
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-description: "\n\
-  ruote is an open source Ruby workflow engine\n  "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "\nruote is an open source Ruby workflow engine\n  "
+email:
 - jmettraux@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/ruote/context.rb
 - lib/ruote/dashboard.rb
@@ -517,36 +512,26 @@ files:
 - README.rdoc
 homepage: http://ruote.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ruote
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: an open source Ruby workflow engine
 test_files: []
-