ruote-kit 2.1.11 → 2.2.0.3

data/spec/resources/workitems_spec.rb

@@ -1,7 +1,5 @@
 
-require 'spec_helper'
-
-undef :context if defined?(context)
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 
 def workitem_count(from, to, of)
@@ -15,7 +13,15 @@ end
 
 describe 'GET /_ruote/workitems' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'without any workitems' do
 
@@ -44,13 +50,16 @@ describe 'GET /_ruote/workitems' do
 
     before(:each) do
 
-      @wfid = launch_test_process do
-        Ruote.process_definition :name => 'test' do
-          sequence do
-            nada :activity => 'Work your magic'
-          end
+      register_participants
+
+      @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+        sequence do
+          nada :activity => 'Work your magic'
         end
-      end
+      end)
+
+      RuoteKit.engine.wait_for(:nada)
+      RuoteKit.engine.wait_for(1)
     end
 
     it 'should have a list of workitems (HTML)' do
@@ -67,7 +76,7 @@ describe 'GET /_ruote/workitems' do
       last_response.should be_ok
       json = last_response.json_body
 
-      json['workitems'].size.should be(1)
+      json['workitems'].size.should == 1
 
       wi = json['workitems'][0]
 
@@ -81,19 +90,31 @@ end
 
 describe 'GET /_ruote/workitems/wfid' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'with workitems' do
 
     before(:each) do
-      @wfid = launch_test_process do
-        Ruote.process_definition :name => 'foo' do
-          concurrence do
-            nada :activity => 'This'
-            nada :activity => 'Or that'
-          end
+
+      register_participants
+
+      @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+        concurrence do
+          nada :activity => 'This'
+          nada :activity => 'Or that'
         end
-      end
+      end)
+
+      RuoteKit.engine.wait_for(:nada)
+      RuoteKit.engine.wait_for(1)
     end
 
     it 'should list the workitems (HTML)' do
@@ -145,55 +166,75 @@ describe 'GET /_ruote/workitems/wfid' do
   end
 end
 
-describe 'GET /_ruote/workitems/expid!!wfid' do
+describe 'GET /_ruote/workitems/expid!subid!wfid' do
+
+  before(:each) do
+
+    prepare_engine_with_participants
+  end
 
-  it_has_an_engine
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'with a workitem' do
 
     before(:each) do
-      @wfid = launch_test_process do
-        Ruote.process_definition :name => 'foo' do
-          sequence do
-            nada :activity => 'Work your magic'
-          end
+
+      @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+        sequence do
+          nada :activity => 'Work your magic'
         end
-      end
+      end)
 
-      process = engine.process(@wfid)
-      @nada_exp_id = '0_0_0' #process.expressions.last.fei.expid
+      RuoteKit.engine.wait_for(:nada)
 
-      @nada_exp_id.should_not be_nil
+      @fei = engine.process(@wfid).expressions.last.fei
     end
 
     it 'should return it (HTML)' do
 
-      get "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}"
+      get "/_ruote/workitems/#{@fei.sid}"
 
       last_response.should be_ok
     end
 
     it 'should return it (JSON)' do
 
-      get "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json"
+      get "/_ruote/workitems/#{@fei.sid}.json"
 
       last_response.should be_ok
     end
 
     it 'should provide a workitem with the correct links (JSON)' do
 
-      get "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json"
+      get "/_ruote/workitems/#{@fei.sid}.json"
 
-      json = last_response.json_body
+      last_response.json_body['workitem']['links'].collect { |li|
+        li['rel']
+      }.should == %w[
+        self
+        http://ruote.rubyforge.org/rels.html#process
+        http://ruote.rubyforge.org/rels.html#process_expressions
+        http://ruote.rubyforge.org/rels.html#process_errors
+      ]
+    end
+
+    it 'should include an etag header (HTML)' do
+
+      get "/_ruote/workitems/#{@fei.sid}"
+
+      last_response.headers.should include('ETag')
+      last_response.headers['ETag'].should == "\"#{find_workitem(@wfid, @nada_exp_id).to_h['_rev'].to_s}\""
+    end
+
+    it 'should include an etag header (JSON)' do
 
-      assert_equal(
-        %w[
-          self
-          http://ruote.rubyforge.org/rels.html#process
-          http://ruote.rubyforge.org/rels.html#process_expressions
-          http://ruote.rubyforge.org/rels.html#process_errors
-        ],
-        json['workitem']['links'].collect { |li| li['rel'] })
+      get "/_ruote/workitems/#{@fei.sid}.json"
+
+      last_response.headers.should include('ETag')
+      last_response.headers['ETag'].should == "\"#{find_workitem(@wfid, @nada_exp_id).to_h['_rev'].to_s}\""
     end
   end
 
@@ -219,39 +260,41 @@ end
 
 describe 'PUT /_ruote/workitems/fei' do
 
-  it_has_an_engine
-
   before(:each) do
 
-    @wfid = launch_test_process do
-      Ruote.process_definition :name => 'foo' do
-        sequence do
-          nada :activity => 'Work your magic'
-          echo '${f:foo}'
-        end
+    prepare_engine_with_participants
+
+    @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+      sequence do
+        nada :activity => 'Work your magic'
+        echo '${f:foo}'
       end
-    end
+    end)
 
-    process = engine.process(@wfid)
-    @nada_exp_id = '0_0_0' #process.expressions.last.fei.expid
+    RuoteKit.engine.wait_for(:nada)
 
-    @nada_exp_id.should_not be_nil
+    @fei = engine.process(@wfid).expressions.last.fei
 
     @fields = {
       'params' => { 'activity' => 'Work your magic' }, 'foo' => 'bar'
     }
   end
 
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
+
   it 'should update the workitem fields (HTML)' do
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
       :fields => Rufus::Json.encode(@fields))
 
     last_response.should be_redirect
 
     last_response['Location'].should ==
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}"
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}"
 
     find_workitem(@wfid, @nada_exp_id).fields.should == @fields
 
@@ -265,7 +308,7 @@ describe 'PUT /_ruote/workitems/fei' do
     params = { 'fields' => @fields }
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
       Rufus::Json.encode(params),
       { 'CONTENT_TYPE' => 'application/json' })
 
@@ -283,7 +326,7 @@ describe 'PUT /_ruote/workitems/fei' do
     params = { 'workitem' => { 'fields' => @fields } }
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
       Rufus::Json.encode(params),
       { 'CONTENT_TYPE' => 'application/json' })
 
@@ -297,7 +340,7 @@ describe 'PUT /_ruote/workitems/fei' do
     fields = Rufus::Json.encode(@fields)
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
       :fields => fields,
       :_proceed => '1')
 
@@ -318,7 +361,7 @@ describe 'PUT /_ruote/workitems/fei' do
     params = { 'fields' => @fields, '_proceed' => '1' }
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
       Rufus::Json.encode(params),
       { 'CONTENT_TYPE' => 'application/json' })
 
@@ -335,7 +378,9 @@ describe 'PUT /_ruote/workitems/fei' do
 
   it 'should 400 when passed bogus JSON fields (HTML)' do
 
-    put "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}", :fields => '{"bogus"}'
+    put(
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
+      :fields => '{"bogus"}')
 
     last_response.status.should be(400)
   end
@@ -343,37 +388,83 @@ describe 'PUT /_ruote/workitems/fei' do
   it 'should 400 when passed bogus JSON fields (JSON)' do
 
     put(
-      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
       "{'bogus'}",
       { 'CONTENT_TYPE' => 'application/json' })
 
     last_response.status.should be(400)
   end
+
+  it 'should 412 if the etags do not match (HTML)' do
+
+    workitem = find_workitem(@wfid, @nada_exp_id)
+    old_rev  = workitem.to_h['_rev']
+
+    workitem.fields = {'baz' => 'bar'}.merge!(@fields)
+    RuoteKit.engine.storage_participant.update(workitem)
+
+    put(
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
+      { :fields => Rufus::Json.encode(@fields) },
+      { 'HTTP_IF_MATCH' => ('"%s"' % old_rev) }
+    )
+
+    last_response.status.should be(412)
+  end
+
+  it 'should 412 if the etags do not match (JSON)' do
+
+    workitem = find_workitem(@wfid, @nada_exp_id)
+
+    old_rev = workitem.to_h['_rev']
+
+    workitem.fields = {'baz' => 'bar'}.merge!(@fields)
+    RuoteKit.engine.storage_participant.update(workitem)
+
+    params = { 'workitem' => { 'fields' => @fields } }
+
+    put(
+      "/_ruote/workitems/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
+      Rufus::Json.encode(params),
+      {
+        'CONTENT_TYPE'  => 'application/json',
+        'HTTP_IF_MATCH' => ('"%s"' % old_rev)
+      }
+    )
+
+    last_response.status.should be(412)
+  end
 end
 
 describe 'Filtering workitems' do
 
-  it_has_an_engine
-
   before(:each) do
 
-    @wfid = launch_test_process do
-      Ruote.process_definition :name => 'test' do
-        set 'foo' => 'bar'
-        concurrence do
-          sequence do
-            set 'wands' => 101
-            set 'hinkypinky' => 'honkytonky'
-            jack :activity => 'Fetch a pale'
-          end
-          sequence do
-            set 'hinkypinky' => 'honkytonky'
-            jill :activity => 'Chase Jack'
-          end
-          well :activity => 'Ready water'
+    prepare_engine_with_participants
+
+    @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+      set 'foo' => 'bar'
+      concurrence do
+        sequence do
+          set 'wands' => 101
+          set 'hinkypinky' => 'honkytonky'
+          jack :activity => 'Fetch a pale'
+        end
+        sequence do
+          set 'hinkypinky' => 'honkytonky'
+          jill :activity => 'Chase Jack'
         end
+        well :activity => 'Ready water'
       end
-    end
+    end)
+
+    RuoteKit.engine.wait_for(:jack)
+    RuoteKit.engine.wait_for(1)
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
   end
 
   describe 'on participants' do
@@ -384,7 +475,7 @@ describe 'Filtering workitems' do
 
       last_response.should be_ok
 
-      last_response.json_body['workitems'].size.should be(1)
+      last_response.json_body['workitems'].size.should == 1
     end
 
     it 'should narrow results down to a single participant (HTML)' do
@@ -406,7 +497,7 @@ describe 'Filtering workitems' do
 
       last_response.should be_ok
 
-      last_response.json_body['workitems'].size.should be(2)
+      last_response.json_body['workitems'].size.should == 2
     end
 
     it 'should find workitems with fields set to a given value (HTML)' do
@@ -422,7 +513,7 @@ describe 'Filtering workitems' do
 
       last_response.should be_ok
 
-      last_response.json_body['workitems'].size.should be(1)
+      last_response.json_body['workitems'].size.should == 1
     end
 
     it 'should respect JSON encoded filter vars (HTML)' do
@@ -438,7 +529,7 @@ describe 'Filtering workitems' do
 
       last_response.should be_ok
 
-      last_response.json_body['workitems'].size.should be(1)
+      last_response.json_body['workitems'].size.should == 1
     end
 
     it "should combine search criteria by 'and' (HMTL)" do

data/spec/spec_helper.rb

@@ -1,15 +1,13 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..'))
+
+HERE = File.dirname(__FILE__) unless defined?(HERE)
 
 ENV['RACK_ENV'] = 'test'
 
-require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :test)
 
-require 'spec'
-require 'spec/interop/test'
+require 'rspec'
 require 'rack/test'
-
 require 'webrat'
 
 begin
@@ -23,21 +21,13 @@ rescue LoadError
   end
 end
 
-Test::Unit::TestCase.send :include, Rack::Test::Methods
-
-begin
-  require File.join(File.dirname(__FILE__), '/../vendor/gems/environment')
-rescue LoadError
-end
-require File.join(File.dirname(__FILE__), '/../lib/ruote-kit')
-
-require 'ruote-kit/spec/ruote_helpers'
-require 'spec/it_has_an_engine'
-
+require File.join(HERE, '../lib/ruote-kit')
 require 'ruote/log/test_logger'
 
+Dir[File.join(HERE, 'support/**/*.rb')].each { |f| require(f) }
+
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
   # == Mock Framework
   #
@@ -48,49 +38,14 @@ Spec::Runner.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
 
-  # Include our helpers
-  config.include Webrat::Matchers, :type => :views
-  config.include RuoteKit::Spec::RuoteHelpers
+  config.include Webrat::Matchers
+  config.include Rack::Test::Methods
 
-  def it_has_an_engine
-    it_should_behave_like 'it has an engine'
-  end
-  def it_has_an_engine_with_no_participants
-    it_should_behave_like 'it has an engine with no participants'
-  end
+  config.include RenderHelper
+  config.include EngineHelper
 
   RuoteKit::Application.included_modules.each do |klass|
     config.include(klass) if klass.name =~ /RuoteKit::Helpers::\w+Helpers/
   end
 end
 
-def app
-  RuoteKit::Application
-end
-
-def render(template, scope=nil, locals={}, &block)
-  template = File.read(File.join(app.views, template.to_s))
-  engine = Haml::Engine.new(template)
-  engine.render(scope, locals, &block)
-end
-
-class Rack::MockResponse
-
-  def json_body
-    Rufus::Json.decode(body)
-  end
-
-  def json?
-    begin
-      json_body
-      return true
-    rescue
-      return false
-    end
-  end
-
-  def html?
-    ! json?
-  end
-end
-

data/spec/support/engine_helper.rb

@@ -0,0 +1,97 @@
+
+class Tracer
+  def initialize
+    @trace = ''
+  end
+  def to_s
+    @trace.to_s.strip
+  end
+  def << s
+    @trace << s
+  end
+  def clear
+    @trace = ''
+  end
+  def puts s
+    @trace << "#{s}\n"
+  end
+end
+
+
+module EngineHelper
+
+  def prepare_engine
+
+    RuoteKit.engine =
+      Ruote::Engine.new(
+        Ruote::Worker.new(
+          Ruote::HashStorage.new))
+
+    @tracer = Tracer.new
+    RuoteKit.engine.add_service('tracer', @tracer)
+  end
+
+  def register_participants
+
+    RuoteKit.engine.register do
+      catchall Ruote::StorageParticipant
+    end
+  end
+
+  def prepare_engine_with_participants
+
+    prepare_engine
+    register_participants
+  end
+
+  def shutdown_and_purge_engine
+
+    return unless RuoteKit.engine
+
+    RuoteKit.engine.shutdown
+    RuoteKit.engine.storage.purge!
+    RuoteKit.engine = nil
+  end
+
+  def launch_nada_process
+
+    pdef = Ruote.process_definition :name => 'test' do
+      nada
+    end
+
+    wfid = RuoteKit.engine.launch(pdef)
+
+    RuoteKit.engine.wait_for(:nada)
+    RuoteKit.engine.wait_for(1)
+
+    wfid
+  end
+
+  def noisy(on = true)
+
+    RuoteKit.engine.noisy = on
+  end
+
+  def engine
+
+    RuoteKit.engine
+  end
+
+  def storage_participant
+
+    RuoteKit.engine.storage_participant
+  end
+
+  def find_workitem(wfid, expid)
+
+    RuoteKit.engine.storage_participant.by_wfid(wfid).first { |wi|
+      wi.fei.expid == expid
+    }
+  end
+
+  def wait_for(wfid)
+
+    RuoteKit.engine.wait_for(wfid)
+  end
+end
+

data/spec/support/rack_helper.rb

@@ -0,0 +1,21 @@
+
+class Rack::MockResponse
+
+  def json_body
+    Rufus::Json.decode(body)
+  end
+
+  def json?
+    begin
+      json_body
+      return true
+    rescue
+      return false
+    end
+  end
+
+  def html?
+    ! json?
+  end
+end
+

data/spec/support/render_helper.rb

@@ -0,0 +1,16 @@
+
+module RenderHelper
+
+  def app
+
+    RuoteKit::Application
+  end
+
+  def render(template, scope=nil, locals={}, &block)
+
+    template = File.read(File.join(app.views, template.to_s))
+    engine = Haml::Engine.new(template)
+    engine.render(scope, locals, &block)
+  end
+end
+

data/spec/webapp_helpers_spec.rb

@@ -92,6 +92,7 @@ describe RuoteKit::Helpers::RenderHelpers do
     before(:each) do
       @resource = Object.new
       class << @resource
+        include RenderHelper
         attr_accessor :count, :skip, :limit, :request
         def to_html
           '<div>' + render('_pagination.html.haml', self) + '</div>'