ruote-kit 2.1.11 → 2.2.0.3

data/ruote-kit.gemspec

@@ -1,140 +1,41 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
-  s.name = %q{ruote-kit}
-  s.version = "2.1.11"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["kenneth.kalmer@gmail.com", "Torsten Schoenebaum", "John Mettraux"]
-  s.date = %q{2010-10-01}
-  s.description = %q{ruote-kit is a RESTful Rack app for the ruote workflow engine}
-  s.email = %q{kenneth.kalmer@gmail.com}
-  s.extra_rdoc_files = [
-    "CHANGELOG.txt",
-     "LICENSE.txt",
-     "README.rdoc",
-     "TODO.txt"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "CHANGELOG.txt",
-     "Gemfile",
-     "LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "TODO.txt",
-     "config.ru",
-     "lib/ruote-kit.rb",
-     "lib/ruote-kit/application.rb",
-     "lib/ruote-kit/helpers/json_helpers.rb",
-     "lib/ruote-kit/helpers/link_helpers.rb",
-     "lib/ruote-kit/helpers/misc_helpers.rb",
-     "lib/ruote-kit/helpers/pagination_helpers.rb",
-     "lib/ruote-kit/helpers/render_helpers.rb",
-     "lib/ruote-kit/public/_ruote/images/favicon.ico",
-     "lib/ruote-kit/public/_ruote/images/ruote.png",
-     "lib/ruote-kit/public/_ruote/images/ruote_buttons.png",
-     "lib/ruote-kit/public/_ruote/javascripts/jquery-1.4.2.min.js",
-     "lib/ruote-kit/public/_ruote/javascripts/rk.js",
-     "lib/ruote-kit/public/_ruote/javascripts/ruote-fluo-editor.js",
-     "lib/ruote-kit/public/_ruote/javascripts/ruote-fluo.js",
-     "lib/ruote-kit/public/_ruote/stylesheets/reset.css",
-     "lib/ruote-kit/public/_ruote/stylesheets/rk.css",
-     "lib/ruote-kit/public/_ruote/stylesheets/ruote-fluo-editor.css",
-     "lib/ruote-kit/resources/errors.rb",
-     "lib/ruote-kit/resources/expressions.rb",
-     "lib/ruote-kit/resources/participants.rb",
-     "lib/ruote-kit/resources/processes.rb",
-     "lib/ruote-kit/resources/schedules.rb",
-     "lib/ruote-kit/resources/workitems.rb",
-     "lib/ruote-kit/spec/ruote_helpers.rb",
-     "lib/ruote-kit/version.rb",
-     "lib/ruote-kit/views/_pagination.html.haml",
-     "lib/ruote-kit/views/_tree_editor.html.haml",
-     "lib/ruote-kit/views/error.html.haml",
-     "lib/ruote-kit/views/errors.html.haml",
-     "lib/ruote-kit/views/expression.html.haml",
-     "lib/ruote-kit/views/expressions.html.haml",
-     "lib/ruote-kit/views/http_error.html.haml",
-     "lib/ruote-kit/views/index.html.haml",
-     "lib/ruote-kit/views/layout.html.haml",
-     "lib/ruote-kit/views/participants.html.haml",
-     "lib/ruote-kit/views/process.html.haml",
-     "lib/ruote-kit/views/process_launched.html.haml",
-     "lib/ruote-kit/views/processes.html.haml",
-     "lib/ruote-kit/views/processes_new.html.haml",
-     "lib/ruote-kit/views/schedules.html.haml",
-     "lib/ruote-kit/views/workitem.html.haml",
-     "lib/ruote-kit/views/workitems.html.haml",
-     "ruote-kit.gemspec",
-     "spec/it_has_an_engine.rb",
-     "spec/resources/errors_spec.rb",
-     "spec/resources/expressions_spec.rb",
-     "spec/resources/index_spec.rb",
-     "spec/resources/participants_spec.rb",
-     "spec/resources/processes_spec.rb",
-     "spec/resources/schedules_spec.rb",
-     "spec/resources/workitems_spec.rb",
-     "spec/ruote-kit_configure_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/webapp_helpers_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/tosch/ruote-kit}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{ruote workflow engine, wrapped in a loving rack embrace}
-  s.test_files = [
-    "spec/webapp_helpers_spec.rb",
-     "spec/resources/participants_spec.rb",
-     "spec/resources/index_spec.rb",
-     "spec/resources/errors_spec.rb",
-     "spec/resources/processes_spec.rb",
-     "spec/resources/workitems_spec.rb",
-     "spec/resources/schedules_spec.rb",
-     "spec/resources/expressions_spec.rb",
-     "spec/it_has_an_engine.rb",
-     "spec/spec_helper.rb",
-     "spec/ruote-kit_configure_spec.rb"
-  ]
+  s.name = 'ruote-kit'
+  #s.version = File.read('lib/ruote-kit/version.rb').match(/VERSION = '([^']+)'/)[1]
+  s.version = '2.2.0.3'
+  s.platform = Gem::Platform::RUBY
+  s.authors = [ 'Kenneth Kalmer', 'Torsten Schoenebaum', 'John Mettraux' ]
+  s.email = [ 'kenneth.kalmer@gmail.com' ]
+  s.homepage = 'http://github.com/tosch/ruote-kit'
+  s.rubyforge_project = 'ruote'
+  s.summary = 'ruote workflow engine, wrapped in a loving rack embrace'
+  s.description = %q{
+ruote workflow engine, wrapped in a loving rack embrace
+}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  #s.files = `git ls-files`.split("\n")
+  s.files = Dir[
+    'Rakefile',
+    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    '*.gemspec', '*.txt', '*.rdoc', '*.md',
+    'lib/ruote-kit/public/**/*', 'lib/ruote-kit/views/**/*'
+  ] - [ 'rails-template.rb' ]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bundler>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra-respond_to>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
-      s.add_runtime_dependency(%q<thin>, [">= 0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<rufus-json>, [">= 0.2.5"])
-      s.add_runtime_dependency(%q<ruote>, ["~> 2.1.11"])
-    else
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<sinatra-respond_to>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<thin>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<rufus-json>, [">= 0.2.5"])
-      s.add_dependency(%q<ruote>, ["~> 2.1.11"])
-    end
-  else
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<sinatra-respond_to>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<thin>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<rufus-json>, [">= 0.2.5"])
-    s.add_dependency(%q<ruote>, ["~> 2.1.11"])
-  end
+  s.add_runtime_dependency 'sinatra', '1.0'
+  s.add_runtime_dependency 'sinatra-respond_to', '0.5.0'
+  s.add_runtime_dependency 'haml', '3.0.25'
+
+  s.add_runtime_dependency 'rufus-json', '>= 0.2.5'
+  #s.add_runtime_dependency('ruote', s.version) unless defined?(Bundler)
+  s.add_runtime_dependency('ruote', '>= 2.2.0') unless defined?(Bundler)
+    # see Gemfile
+
+  s.add_development_dependency 'rspec', '2.4.0'
+  s.add_development_dependency 'rack-test', '0.5.7'
+  s.add_development_dependency 'webrat', '0.7.3'
+
+  s.require_path = 'lib'
 end
 

data/spec/resources/errors_spec.rb

@@ -1,12 +1,18 @@
 
-require 'spec_helper'
-
-undef :context if defined?(context)
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 
 describe 'without any running processes' do
 
-  it_has_an_engine_with_no_participants
+  before(:each) do
+
+    prepare_engine
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'GET /_ruote/errors' do
 
@@ -33,10 +39,10 @@ end
 
 describe 'with a running process that has an error' do
 
-  it_has_an_engine_with_no_participants
-
   before(:each) do
 
+    prepare_engine
+
     RuoteKit.engine.register_participant :alice, Ruote::StorageParticipant
 
     @wfid = RuoteKit.engine.launch(
@@ -51,6 +57,12 @@ describe 'with a running process that has an error' do
     RuoteKit.engine.wait_for(@wfid)
 
     @error = RuoteKit.engine.process(@wfid).errors.first
+    @fei = @error.fei
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
   end
 
   describe 'GET /_ruote/errors' do
@@ -109,7 +121,7 @@ describe 'with a running process that has an error' do
       # the links for the error itself
 
       json['errors'].first['links'].should == [
-        { 'href' => "/_ruote/errors/0_0_0!!#{@wfid}",
+        { 'href' => "/_ruote/errors/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
           'rel' => 'self' },
         { 'href' => "/_ruote/errors/#{@wfid}",
           'rel' => 'http://ruote.rubyforge.org/rels.html#process_errors' },
@@ -143,7 +155,7 @@ describe 'with a running process that has an error' do
       json['errors'].first['message'].should == "#<RuntimeError: unknown participant or subprocess 'nemo'>"
 
       json['errors'].first['links'].should == [
-        { 'href' => "/_ruote/errors/0_0_0!!#{@wfid}",
+        { 'href' => "/_ruote/errors/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
           'rel' => 'self' },
         { 'href' => "/_ruote/errors/#{@wfid}",
           'rel' => 'http://ruote.rubyforge.org/rels.html#process_errors' },

data/spec/resources/expressions_spec.rb

@@ -1,12 +1,18 @@
 
-require 'spec_helper'
-
-undef :context if defined?(context)
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 
 describe 'GET /_ruote/expressions' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   it 'should 404 (HTML)' do
 
@@ -18,12 +24,20 @@ end
 
 describe 'GET /_ruote/expressions/wfid' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine_with_participants
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'with running processes' do
 
     before(:each) do
-      @wfid = launch_test_process
+      @wfid = launch_nada_process
     end
 
     it 'should render the expressions (HTML)' do
@@ -67,39 +81,67 @@ end
 
 describe 'GET /_ruote/expressions/fei' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine_with_participants
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'with running processes' do
 
     before(:each) do
 
-      @wfid = launch_test_process
-      process = engine.process(@wfid)
-      @nada_exp_id = process.expressions.last.fei.expid
+      @wfid = launch_nada_process
+      @nada_fexp = RuoteKit.engine.process(@wfid).expressions.last
+      @nada_fei = @nada_fexp.fei
     end
 
     it 'should render the expression (HTML)' do
 
-      get "/_ruote/expressions/#{@nada_exp_id}!!#{@wfid}"
+      get "/_ruote/expressions/#{@nada_fei.sid}"
 
       last_response.should be_ok
     end
 
     it 'should render the expression (JSON)' do
 
-      get "/_ruote/expressions/#{@nada_exp_id}!!#{@wfid}.json"
+      get "/_ruote/expressions/#{@nada_fei.sid}.json"
 
       last_response.should be_ok
 
       #puts Rufus::Json.pretty_encode(last_response.json_body)
 
-      last_response.json_body['expression']['links'].size.should be(4)
+      last_response.json_body['expression']['links'].size.should == 4
 
       last_response.json_body['expression'].keys.sort.should == %w[
         applied_workitem class fei links name original_tree parent
         timeout_schedule_id tree variables
       ]
     end
+
+    it 'should include an etag header (HTML)' do
+
+      get "/_ruote/expressions/#{@nada_fei.sid}"
+
+      last_response.headers.should include('ETag')
+
+      last_response.headers['ETag'].should ==
+        "\"#{@nada_fexp.to_h['_rev'].to_s}\""
+    end
+
+    it 'should include an etag header (JSON)' do
+
+      get "/_ruote/expressions/#{@nada_fei.sid}.json"
+
+      last_response.headers.should include('ETag')
+
+      last_response.headers['ETag'].should ==
+        "\"#{@nada_fexp.to_h['_rev'].to_s}\""
+    end
   end
 
   describe 'without running processes' do
@@ -125,16 +167,20 @@ describe 'GET /_ruote/expressions/fei' do
 
     before(:each) do
 
+      register_participants
+
       @wfid = RuoteKit.engine.launch(Ruote.define do
         alpha :timeout => '2y'
       end)
 
       RuoteKit.engine.wait_for(:alpha)
+
+      @fei = RuoteKit.engine.process(@wfid).expressions.last.fei
     end
 
     it 'should render the expression (HTML)' do
 
-      get "/_ruote/expressions/0_0!!#{@wfid}"
+      get "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}"
 
       last_response.status.should be(200)
 
@@ -144,7 +190,7 @@ describe 'GET /_ruote/expressions/fei' do
 
     it 'should render the expression (JSON)' do
 
-      get "/_ruote/expressions/0_0!!#{@wfid}.json"
+      get "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json"
 
       last_response.status.should be(200)
 
@@ -158,39 +204,43 @@ end
 
 describe 'DELETE /_ruote/expressions/fei' do
 
-  it_has_an_engine
+  before(:each) do
+
+    prepare_engine_with_participants
+  end
+
+  after(:each) do
+
+    shutdown_and_purge_engine
+  end
 
   describe 'with running processes' do
 
     before(:each) do
 
-      @wfid = launch_test_process do
-        Ruote.process_definition :name => 'delete' do
-          sequence do
-            wait '1d', :on_cancel => 'bail_out'
-            echo 'done'
-          end
-
-          define 'bail_out' do
-            sequence do
-              echo 'bailed'
-            end
-          end
+      @wfid = RuoteKit.engine.launch(Ruote.process_definition do
+        sequence do
+          alfred :on_cancel => 'bail_out'
+          echo 'done'
         end
-      end
 
-      wait_exp = engine.process(@wfid).expressions.last
-      @expid = "0_1_0" #wait_exp.fei.expid
+        define 'bail_out' do
+          echo 'bailed'
+        end
+      end)
+
+      RuoteKit.engine.wait_for(:alfred)
+
+      @fei = engine.process(@wfid).expressions.last.fei
     end
 
     it 'should cancel the expressions (HTML)' do
 
-      delete "/_ruote/expressions/#{@expid}!!#{@wfid}"
+      delete "/_ruote/expressions/#{@fei.sid}"
 
       last_response.should be_redirect
       last_response['Location'].should == "/_ruote/expressions/#{@wfid}"
 
-      #sleep 0.4
       wait_for(@wfid)
 
       @tracer.to_s.should == "bailed\ndone"
@@ -198,12 +248,11 @@ describe 'DELETE /_ruote/expressions/fei' do
 
     it 'should cancel the expressions (JSON)' do
 
-      delete "/_ruote/expressions/#{@expid}!!#{@wfid}.json"
+      delete "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json"
 
       last_response.should be_ok
       last_response.json_body['status'].should == 'ok'
 
-      #sleep 0.4
       wait_for(@wfid)
 
       @tracer.to_s.should == "bailed\ndone"
@@ -211,7 +260,7 @@ describe 'DELETE /_ruote/expressions/fei' do
 
     it 'should kill the expression (HTML)' do
 
-      delete "/_ruote/expressions/#{@expid}!!#{@wfid}?_kill=1"
+      delete "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}?_kill=1"
 
       last_response.should be_redirect
       last_response['Location'].should == "/_ruote/expressions/#{@wfid}"
@@ -224,7 +273,7 @@ describe 'DELETE /_ruote/expressions/fei' do
 
     it 'should kill the expression (JSON)' do
 
-      delete "/_ruote/expressions/#{@expid}!!#{@wfid}.json?_kill=1"
+      delete "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json?_kill=1"
 
       last_response.should be_ok
       last_response.json_body['status'].should == 'ok'
@@ -234,6 +283,62 @@ describe 'DELETE /_ruote/expressions/fei' do
 
       @tracer.to_s.should == 'done'
     end
+
+    it 'should 412 when the etags do not match (HTML)' do
+
+      delete(
+        "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
+        nil,
+        { 'HTTP_IF_MATCH' => '"foo"' }
+      )
+
+      last_response.status.should == 412
+    end
+
+    it 'should 412 when the etags do not match (JSON)' do
+
+      delete(
+        "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
+        nil,
+        {
+          'HTTP_IF_MATCH' => '"foo"',
+          'CONTENT_TYPE'  => 'application/json',
+        }
+      )
+
+      last_response.status.should == 412
+    end
+
+    it 'should not 412 when the etags do match (HTML)' do
+      exp = RuoteKit.engine.process(@wfid).expressions.find { |e|
+        e.fei.expid == @fei.expid
+      }
+
+      delete(
+        "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}",
+        nil,
+        { 'HTTP_IF_MATCH' => ('"%s"' % exp.to_h['_rev'] ) }
+      )
+
+      last_response.status.should_not == 412
+    end
+
+    it 'should not 412 when the etags do match (JSON)' do
+      exp = RuoteKit.engine.process(@wfid).expressions.find { |e|
+        e.fei.expid == @fei.expid
+      }
+
+      delete(
+        "/_ruote/expressions/#{@fei.expid}!#{@fei.subid}!#{@wfid}.json",
+        nil,
+        {
+          'HTTP_IF_MATCH' => ('"%s"' % exp.to_h['_rev'] ),
+          'CONTENT_TYPE'  => 'application/json',
+        }
+      )
+
+      last_response.status.should_not == 412
+    end
   end
 
   describe 'without running processes' do
@@ -258,19 +363,26 @@ end
 
 describe 'PUT /_ruote/expressions/fei' do
 
-  it_has_an_engine
-
   before(:each) do
 
-    @wfid = launch_test_process do
+    prepare_engine_with_participants
+
+    @wfid = RuoteKit.engine.launch(
+
       Ruote.process_definition do
         alpha
       end
-    end
+    )
+
+    RuoteKit.engine.wait_for(:alpha)
+    RuoteKit.engine.wait_for(1)
+
+    @exp = RuoteKit.engine.process(@wfid).expressions.last
+  end
+
+  after(:each) do
 
-    @exp = RuoteKit.engine.process(@wfid).expressions.find { |e|
-      e.fei.expid == '0_0'
-    }
+    shutdown_and_purge_engine
   end
 
   it 'should re-apply (HTML)' do
@@ -421,7 +533,7 @@ describe 'PUT /_ruote/expressions/fei' do
       "/_ruote/expressions/#{@exp.fei.sid}",
       :fields => "{bogus}")
 
-    last_response.status.should be(400)
+    last_response.status.should == 400
   end
 
   it 'should 400 when passed bogus JSON (JSON)' do
@@ -435,5 +547,59 @@ describe 'PUT /_ruote/expressions/fei' do
     last_response.json_body['http_error']['code'].should == 400
     last_response.json_body['http_error']['message'].should == 'bad request'
   end
+
+  it 'should 412 when the etags do not match (HTML)' do
+
+    put(
+      "/_ruote/expressions/#{@exp.fei.sid}",
+      { :fields => '{}' },
+      { 'HTTP_IF_MATCH' => '"foo"' }
+    )
+
+    last_response.status.should == 412
+  end
+
+  it 'should 412 when the etags do not match (JSON)' do
+
+    put(
+      "/_ruote/expressions/#{@exp.fei.sid}",
+      Rufus::Json.encode({}),
+      {
+        'CONTENT_TYPE' => 'application/json',
+        'HTTP_IF_MATCH' => '"foo"'
+      }
+    )
+
+    last_response.status.should == 412
+  end
+
+  it 'should not 412 when the etags match (HTML)' do
+
+    rev = @exp.to_h['_rev']
+
+    put(
+      "/_ruote/expressions/#{@exp.fei.sid}",
+      { :fields => '{}' },
+      { 'HTTP_IF_MATCH' => ('"%s"' % rev) }
+    )
+
+    last_response.status.should_not == 412
+  end
+
+  it 'should not 412 when the etags match (JSON)' do
+
+    rev = @exp.to_h['_rev']
+
+    put(
+      "/_ruote/expressions/#{@exp.fei.sid}",
+      Rufus::Json.encode({}),
+      {
+        'CONTENT_TYPE' => 'application/json',
+        'HTTP_IF_MATCH' => ('"%s"' % rev )
+      }
+    )
+
+    last_response.status.should_not == 412
+  end
 end
 

data/spec/resources/index_spec.rb

@@ -1,11 +1,9 @@
 
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), '..', 'spec_helper.rb')
 
 
 describe 'GET /' do
 
-  it_has_an_engine
-
   it 'should return a welcome message in HTML be default' do
 
     get '/_ruote'
@@ -34,8 +32,6 @@ end
 
 describe 'Generic error handling' do
 
-  it_has_an_engine
-
   it 'should give our own 404 page (HTML)' do
 
     get '/kenneth'