ruote-kit 2.1.8.2 → 2.1.10

data/lib/ruote-kit/resources/expressions.rb

@@ -1,6 +1,6 @@
 class RuoteKit::Application
 
-  get "/_ruote/expressions" do
+  get "/_ruote/expressions/?" do
     respond_to do |format|
       format.html { haml :expressions }
       format.json { json( :status, :ok ) }

data/lib/ruote-kit/resources/processes.rb

@@ -1,6 +1,6 @@
 class RuoteKit::Application
 
-  get "/_ruote/processes" do
+  get "/_ruote/processes/?" do
     @processes = engine.processes
 
     respond_to do |format|
@@ -14,6 +14,7 @@ class RuoteKit::Application
   end
 
   get "/_ruote/processes/:wfid" do
+
     @process = engine.process( params[:wfid] )
 
     if @process

data/lib/ruote-kit/resources/workitems.rb

@@ -1,14 +1,13 @@
 class RuoteKit::Application
 
-  get "/_ruote/workitems" do
-    if params[:participant]
-      @participants = params[:participant].split(',')
-      @workitems = @participants.inject([]) do |memo, part|
-        memo.concat storage_participant.by_participant( part )
-      end
-    else
-      @workitems = storage_participant.all
-    end
+  get "/_ruote/workitems/?" do
+
+    query = params.inject({}) { |h, (k, v)|
+      h[k] = (Rufus::Json.decode(v) rescue v)
+      h
+    }
+
+    @workitems = storage_participant.query(query)
 
     respond_to do |format|
       format.html { haml :workitems }

data/lib/ruote-kit/spec/ruote_helpers.rb

@@ -39,7 +39,7 @@ module RuoteKit
       end
 
       def wait_for( wfid )
-        @_spec_worker.context.logger.wait_for( wfid )
+        @_spec_worker.context.logger.wait_for( [  wfid ] )
       end
 
     end

data/lib/ruote-kit/version.rb

@@ -6,6 +6,6 @@
 
 module RuoteKit
 
-  VERSION = '2.1.8.2'
+  VERSION = '2.1.10'
 end
 

data/lib/ruote-kit/views/errors.html.haml

@@ -0,0 +1,18 @@
+
+- @_uses_fluo = true
+
+%h2 Errors
+
+%ul
+  - @errors.each do |error|
+    %li #{error.fei.to_storage_id}
+
+%p  
+
+%canvas#fluo
+
+:javascript
+  //var proc_rep = #{process_tree( @process )};
+  //Fluo.renderFlow( 'fluo', proc_rep );
+  //Fluo.crop('fluo');
+

data/lib/ruote-kit/views/workitem.html.haml

@@ -5,8 +5,8 @@
 %ul.nolist
   %li fei: #{@workitem.fei.to_s}
   %li participant: #{@workitem.participant_name}
-  %li dispatched:
-  %li last modified:
+  %li dispatched: #{@workitem.dispatch_at}
+  %li last modified: #{@workitem.h.put_at}
   %li process: #{link_to engine.process( @workitem.fei.wfid) }
   %li expressions:
   %li workitems of this process: #{link_to "GET /_ruote/workitems/#{@workitem.fei.wfid}", "/_ruote/workitems/#{@workitem.fei.wfid}" }
@@ -19,7 +19,7 @@
   .group
     %label.label{ :for => "fields" } Fields
     %textarea.text_area{ :name => "fields", :cols => 80, :rows => 10 }
-      = @workitem.fields.to_json
+      = Rufus::Json.encode(@workitem.fields)
     %span.description The current workitem fields in JSON format
   .group
     %input{ :type => 'checkbox', :name => '_proceed', :value => '1' }

data/ruote-kit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote-kit}
-  s.version = "2.1.8.2"
+  s.version = "2.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["kenneth.kalmer@gmail.com"]
-  s.date = %q{2010-03-15}
+  s.authors = ["kenneth.kalmer@gmail.com", "John Mettraux"]
+  s.date = %q{2010-07-07}
   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 = [
@@ -43,11 +43,13 @@ Gem::Specification.new do |s|
      "lib/ruote-kit/public/_ruote/stylesheets/base.css",
      "lib/ruote-kit/public/_ruote/stylesheets/rk.css",
      "lib/ruote-kit/public/_ruote/stylesheets/style.css",
+     "lib/ruote-kit/resources/errors.rb",
      "lib/ruote-kit/resources/expressions.rb",
      "lib/ruote-kit/resources/processes.rb",
      "lib/ruote-kit/resources/workitems.rb",
      "lib/ruote-kit/spec/ruote_helpers.rb",
      "lib/ruote-kit/version.rb",
+     "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/index.html.haml",
@@ -62,6 +64,7 @@ Gem::Specification.new do |s|
      "lib/ruote-kit/views/workitems.html.haml",
      "ruote-kit.gemspec",
      "spec/helpers/render_helpers_spec.rb",
+     "spec/resources/errors_spec.rb",
      "spec/resources/expressions_spec.rb",
      "spec/resources/index_spec.rb",
      "spec/resources/processes_spec.rb",
@@ -80,12 +83,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kennethkalmer/ruote-kit}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ruote workflow engine, wrapped in a loving rack embrace}
   s.test_files = [
     "spec/resources/expressions_spec.rb",
      "spec/resources/workitems_spec.rb",
      "spec/resources/index_spec.rb",
+     "spec/resources/errors_spec.rb",
      "spec/resources/processes_spec.rb",
      "spec/ruote-kit_configure_spec.rb",
      "spec/ruote-kit_spec.rb",
@@ -103,37 +107,46 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bundler>, [">= 0.9.5"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<sinatra-respond_to>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<haml>, [">= 2.2.5"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<ruote>, [">= 2.1.8"])
+      s.add_runtime_dependency(%q<rufus-json>, [">= 0.2.3"])
+      s.add_runtime_dependency(%q<ruote>, [">= 2.1.10"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<webrat>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, ["~> 1.2.3"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, [">= 0.9.5"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
       s.add_dependency(%q<sinatra-respond_to>, [">= 0.4.0"])
       s.add_dependency(%q<haml>, [">= 2.2.5"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<ruote>, [">= 2.1.8"])
+      s.add_dependency(%q<rufus-json>, [">= 0.2.3"])
+      s.add_dependency(%q<ruote>, [">= 2.1.10"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<webrat>, [">= 0"])
+      s.add_dependency(%q<test-unit>, ["~> 1.2.3"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, [">= 0.9.5"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     s.add_dependency(%q<sinatra-respond_to>, [">= 0.4.0"])
     s.add_dependency(%q<haml>, [">= 2.2.5"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<ruote>, [">= 2.1.8"])
+    s.add_dependency(%q<rufus-json>, [">= 0.2.3"])
+    s.add_dependency(%q<ruote>, [">= 2.1.10"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<webrat>, [">= 0"])
+    s.add_dependency(%q<test-unit>, ["~> 1.2.3"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end
 

data/spec/resources/errors_spec.rb

@@ -0,0 +1,292 @@
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "GET /_ruote/errors", :type => :with_engine do
+
+  describe "without any running processes" do
+
+    it "should give no processes back (HTML)" do
+
+      get "/_ruote/errors"
+
+      last_response.status.should be(200)
+    end
+
+    it "should give an empty array (JSON)" do
+
+      get "/_ruote/errors.json"
+
+      last_response.status.should be(200)
+
+      body = last_response.json_body
+      body.should have_key('errors')
+
+      body['errors'].should be_empty
+    end
+  end
+
+#  describe "with running processes" do
+#
+#    before(:each) do
+#      @wfid = launch_test_process
+#    end
+#
+#    it "should give process information back (HTML)" do
+#
+#      get "/_ruote/errors"
+#
+#      last_response.should be_ok
+#    end
+#
+#    it "should give process information back (JSON)" do
+#
+#      get "/_ruote/processes.json"
+#
+#      last_response.should be_ok
+#
+#      body = last_response.json_body
+#
+#      body['errors'].should_not be_empty
+#    end
+#  end
+end
+
+#describe "GET /_ruote/processes/X-Y", :type => :with_engine do
+#
+#  describe "with a running process" do
+#    before(:each) do
+#      @wfid = launch_test_process
+#    end
+#
+#    it "should give process information back (HTML)" do
+#      get "/_ruote/processes/#{@wfid}"
+#
+#      last_response.should be_ok
+#    end
+#
+#    it "should give process information back (JSON)" do
+#      get "/_ruote/processes/#{@wfid}.json"
+#
+#      last_response.should be_ok
+#
+#      body = last_response.json_body
+#
+#      body.should have_key('process')
+#    end
+#  end
+#
+#  describe "without a running process" do
+#    it "should 404 correctly (HTML)" do
+#      get "/_ruote/processes/foo"
+#
+#      last_response.should_not be_ok
+#      last_response.status.should be(404)
+#
+#      last_response.should match(/Resource not found/)
+#    end
+#
+#    it "should 404 correctly (JSON)" do
+#      get "/_ruote/processes/foo.json"
+#
+#      last_response.should_not be_ok
+#      last_response.status.should be(404)
+#
+#      last_response.json_body.keys.should include("error")
+#      last_response.json_body['error'].should == { "code" => 404, "message" => "Resource not found" }
+#    end
+#  end
+#end
+#
+#describe "GET /_ruote/processes/new", :type => :with_engine do
+#
+#  it "should return a launch form" do
+#    get "/_ruote/processes/new"
+#
+#    last_response.should be_ok
+#  end
+#end
+#
+#describe "POST /_ruote/processes", :type => :with_engine do
+#
+#  before(:each) do
+#    engine.processes.should be_empty
+#  end
+#
+#  it "should launch a valid process definition (JSON)" do
+#    params = {
+#      :definition => %q{Ruote.process_definition :name => 'test' do
+#        _sleep '1m'
+#      end}
+#    }
+#
+#    post '/_ruote/processes.json', Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
+#
+#    last_response.should be_ok
+#
+#    last_response.json_body['launched'].should match(/[0-9a-z\-]+/)
+#
+#    sleep 0.4
+#
+#    engine.processes.should_not be_empty
+#  end
+#
+#  it "should launch a valid process definition with fields (JSON)" do
+#    params = {
+#      :definition => %q{Ruote.process_definition :name => 'test' do
+#        echo '${f:foo}'
+#      end},
+#      :fields => { :foo => 'bar' }
+#    }
+#
+#    post '/_ruote/processes.json', Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
+#
+#    last_response.should be_ok
+#    last_response.json_body['launched'].should match(/[0-9a-z\-]+/)
+#
+#    sleep 0.5
+#
+#    @tracer.to_s.should == "bar"
+#  end
+#
+#  it "should launch a valid process definition (HTML)" do
+#    params = {
+#      :process_definition => %q{Ruote.process_definition :name => "test" do
+#        _sleep '1m'
+#      end
+#      }
+#    }
+#
+#    post "/_ruote/processes", params
+#
+#    last_response.should be_ok
+#
+#    sleep 0.4
+#
+#    engine.processes.should_not be_empty
+#  end
+#
+#  it "should launch a process definition with fields (HTML)" do
+#    params = {
+#      :process_definition => %q{Ruote.process_definition :name => 'test' do
+#        echo '${f:foo}'
+#      end},
+#      :process_fields => %q{ { "foo": "bar" } }
+#    }
+#
+#    post '/_ruote/processes', params
+#
+#    last_response.should be_ok
+#
+#    sleep 0.5
+#
+#    @tracer.to_s.should == "bar"
+#  end
+#
+#  it "should correct for empty fields sent by browsers" do
+#    params = {
+#      :process_definition => %q{Ruote.process_definition :name => 'test' do
+#        wait '5m'
+#      end},
+#      :process_fields => ''
+#    }
+#
+#    post '/_ruote/processes', params
+#
+#    last_response.should be_ok
+#
+#    sleep 0.4
+#
+#    engine.processes.should_not be_empty
+#  end
+#
+#  it "should return a 422 unprocessable entity error when launching a process fails (JSON)" do
+#    params = { :definition => 'http://invalid.invalid' }
+#
+#    post '/_ruote/processes.json', Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
+#
+#    last_response.should_not be_ok
+#    last_response.status.should be(422)
+#
+#    last_response.json_body.keys.should include("error")
+#  end
+#
+#  it "should return a nice error page when launching a process fails (HTML)" do
+#    params = { :process_definition => %q{http://invalid.invalid} }
+#
+#    post '/_ruote/processes', params
+#
+#    last_response.should_not be_ok
+#    last_response.status.should be(422)
+#
+#    last_response.should match(/Process failed to launch/)
+#  end
+#
+#end
+#
+#describe "DELETE /_ruote/processes/X-Y", :type => :with_engine do
+#
+#  before(:each) do
+#    @wfid = launch_test_process do
+#      Ruote.process_definition :name => 'test' do
+#        sequence :on_cancel => 'bail_out' do
+#          echo "done."
+#          wait '1d'
+#        end
+#
+#        define :name => 'bail_out' do
+#          echo "bailout."
+#        end
+#      end
+#    end
+#  end
+#
+#  it "should cancel processes (JSON)" do
+#    delete "/_ruote/processes/#{@wfid}.json"
+#
+#    last_response.should be_ok
+#
+#    wait_for( @wfid )
+#
+#    engine.process( @wfid ).should be_nil
+#
+#    @tracer.to_s.should == "done.\nbailout."
+#  end
+#
+#  it "should cancel processes (HMTL)" do
+#    delete "/_ruote/processes/#{@wfid}"
+#
+#    last_response.should be_redirect
+#    last_response['Location'].should == "/_ruote/processes"
+#
+#    wait_for( @wfid )
+#
+#    engine.process( @wfid ).should be_nil
+#
+#    @tracer.to_s.should == "done.\nbailout."
+#  end
+#
+#  it "should kill processes (JSON)" do
+#    delete "/_ruote/processes/#{@wfid}.json?_kill=1"
+#
+#    last_response.should be_ok
+#
+#    wait_for( @wfid )
+#
+#    engine.process( @wfid ).should be_nil
+#
+#    @tracer.to_s.should == "done."
+#  end
+#
+#  it "should kill processes (HTML)" do
+#    delete "/_ruote/processes/#{@wfid}?_kill=1"
+#
+#    last_response.should be_redirect
+#    last_response['Location'].should == '/_ruote/processes'
+#
+#    wait_for( @wfid )
+#
+#    engine.process( @wfid ).should be_nil
+#
+#    @tracer.to_s.should == "done."
+#  end
+#end