ruote-kit 2.1.10 → 2.1.11

data/spec/resources/workitems_spec.rb

@@ -1,19 +1,36 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'spec_helper'
 
 undef :context if defined?(context)
 
-describe "GET /_ruote/workitems", :type => :with_engine do
 
-  describe "without any workitems" do
-    it "should report no workitems (HTML)" do
-      get "/_ruote/workitems"
+def workitem_count(from, to, of)
+  [
+    from, 'to', to, 'of', of, 'workitems'
+  ].collect { |e|
+    e.to_s
+  }.join("\n          ")
+end
+
+
+describe 'GET /_ruote/workitems' do
+
+  it_has_an_engine
+
+  describe 'without any workitems' do
+
+    it 'should report no workitems (HTML)' do
+
+      get '/_ruote/workitems'
 
       last_response.should be_ok
-      last_response.should match(/No workitems are currently available/)
+
+      last_response.should match(workitem_count(0, 0, 0))
     end
 
-    it "should report no workitems (JSON)" do
-      get "/_ruote/workitems.json"
+    it 'should report no workitems (JSON)' do
+
+      get '/_ruote/workitems.json'
 
       last_response.should be_ok
       json = last_response.json_body
@@ -23,8 +40,10 @@ describe "GET /_ruote/workitems", :type => :with_engine do
     end
   end
 
-  describe "with workitems" do
+  describe 'with workitems' do
+
     before(:each) do
+
       @wfid = launch_test_process do
         Ruote.process_definition :name => 'test' do
           sequence do
@@ -34,15 +53,16 @@ describe "GET /_ruote/workitems", :type => :with_engine do
       end
     end
 
-    it "should have a list of workitems (HTML)" do
-      get "/_ruote/workitems"
+    it 'should have a list of workitems (HTML)' do
 
-      last_response.should be_ok
-      last_response.should match(/1 workitem available/)
+      get '/_ruote/workitems'
+
+      last_response.should match(workitem_count(1, 1, 1))
     end
 
-    it "should have a list of workitems (JSON)" do
-      get "/_ruote/workitems.json"
+    it 'should have a list of workitems (JSON)' do
+
+      get '/_ruote/workitems.json'
 
       last_response.should be_ok
       json = last_response.json_body
@@ -52,16 +72,19 @@ describe "GET /_ruote/workitems", :type => :with_engine do
       wi = json['workitems'][0]
 
       wi.keys.should include('fei', 'participant_name', 'fields')
-      wi['fei']['wfid'].should == @wfid
+      wi['wfid'].should == @wfid
       wi['participant_name'].should == 'nada'
       wi['fields']['params']['activity'].should == 'Work your magic'
     end
   end
 end
 
-describe "GET /_ruote/workitems/wfid", :type => :with_engine do
+describe 'GET /_ruote/workitems/wfid' do
+
+  it_has_an_engine
+
+  describe 'with workitems' do
 
-  describe "with workitems" do
     before(:each) do
       @wfid = launch_test_process do
         Ruote.process_definition :name => 'foo' do
@@ -73,14 +96,18 @@ describe "GET /_ruote/workitems/wfid", :type => :with_engine do
       end
     end
 
-    it "should list the workitems (HTML)" do
+    it 'should list the workitems (HTML)' do
+
       get "/_ruote/workitems/#{@wfid}"
 
       last_response.should be_ok
-      last_response.should match(/2 workitems available for #{@wfid}/)
+
+      last_response.should have_selector(
+        'div#pagination', :content => '2 workitems')
     end
 
-    it "should list the workitems (JSON)" do
+    it 'should list the workitems (JSON)' do
+
       get "/_ruote/workitems/#{@wfid}.json"
 
       last_response.should be_ok
@@ -92,16 +119,21 @@ describe "GET /_ruote/workitems/wfid", :type => :with_engine do
     end
   end
 
-  describe "without workitems" do
-    it "should report no workitems (HTML)" do
-      get "/_ruote/workitems/foo"
+  describe 'without workitems' do
+
+    it 'should report no workitems (HTML)' do
+
+      get '/_ruote/workitems/foo'
 
       last_response.should be_ok
-      last_response.should match(/No workitems are currently available for foo/)
+
+      last_response.should have_selector(
+        'div#pagination', :content => '0 workitems')
     end
 
-    it "should report an empty list (JSON)" do
-      get "/_ruote/workitems/foo.json"
+    it 'should report an empty list (JSON)' do
+
+      get '/_ruote/workitems/foo.json'
 
       last_response.should be_ok
 
@@ -113,9 +145,12 @@ describe "GET /_ruote/workitems/wfid", :type => :with_engine do
   end
 end
 
-describe "GET /_ruote/workitems/wfid/expid", :type => :with_engine do
+describe 'GET /_ruote/workitems/expid!!wfid' do
+
+  it_has_an_engine
+
+  describe 'with a workitem' do
 
-  describe "with a workitem" do
     before(:each) do
       @wfid = launch_test_process do
         Ruote.process_definition :name => 'foo' do
@@ -125,35 +160,56 @@ describe "GET /_ruote/workitems/wfid/expid", :type => :with_engine do
         end
       end
 
-      process = engine.process( @wfid )
-      @nada_exp_id = "0_0_0" #process.expressions.last.fei.expid
+      process = engine.process(@wfid)
+      @nada_exp_id = '0_0_0' #process.expressions.last.fei.expid
 
       @nada_exp_id.should_not be_nil
     end
 
-    it "should return it (HTML)" do
-      get "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}"
+    it 'should return it (HTML)' do
+
+      get "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}"
 
       last_response.should be_ok
     end
 
-    it "should return it (JSON)" do
-      get "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}.json"
+    it 'should return it (JSON)' do
+
+      get "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.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"
+
+      json = last_response.json_body
+
+      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'] })
+    end
   end
 
-  describe "without a workitem" do
-    it "should return a 404 (HTML)" do
-      get "/_ruote/workitems/foo/bar"
+  describe 'without a workitem' do
+
+    it 'should return a 404 (HTML)' do
+
+      get '/_ruote/workitems/foo/bar'
 
       last_response.should_not be_ok
       last_response.status.should be(404)
     end
 
-    it "should return a 404 (JSON)" do
-      get "/_ruote/workitems/foo/bar.json"
+    it 'should return a 404 (JSON)' do
+
+      get '/_ruote/workitems/foo/bar.json'
 
       last_response.should_not be_ok
       last_response.status.should be(404)
@@ -161,75 +217,89 @@ describe "GET /_ruote/workitems/wfid/expid", :type => :with_engine do
   end
 end
 
-describe "PUT /_ruote/workitems/X-Y", :type => :with_engine do
+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}"
+          echo '${f:foo}'
         end
       end
     end
 
-    process = engine.process( @wfid )
-    @nada_exp_id = "0_0_0" #process.expressions.last.fei.expid
+    process = engine.process(@wfid)
+    @nada_exp_id = '0_0_0' #process.expressions.last.fei.expid
 
     @nada_exp_id.should_not be_nil
-  end
 
-  it "should update the workitem fields (HTML)" do
-    fields = {
-      "params" => {
-        "activity" => "Work your magic",
-      },
-      "foo" => "bar"
+    @fields = {
+      'params' => { 'activity' => 'Work your magic' }, 'foo' => 'bar'
     }
+  end
+
+  it 'should update the workitem fields (HTML)' do
 
-    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}", :fields => fields.to_json
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}",
+      :fields => Rufus::Json.encode(@fields))
 
     last_response.should be_redirect
-    last_response['Location'].should == "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}"
 
-    find_workitem( @wfid, @nada_exp_id ).fields.should == fields
+    last_response['Location'].should ==
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}"
+
+    find_workitem(@wfid, @nada_exp_id).fields.should == @fields
 
     sleep 0.4
 
-    @tracer.to_s.should == ""
+    @tracer.to_s.should == ''
   end
 
-  it "should update the workitem fields (JSON)" do
-    fields = {
-      "params" => {
-        "activity" => "Work your magic",
-      },
-      "foo" => "bar"
-    }
-    params = {
-      "fields" => fields
-    }
+  it 'should update the workitem fields (JSON)' do
+
+    params = { 'fields' => @fields }
 
-    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}.json", Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      Rufus::Json.encode(params),
+      { 'CONTENT_TYPE' => 'application/json' })
 
     last_response.should be_ok
 
-    find_workitem( @wfid, @nada_exp_id ).fields.should == fields
+    find_workitem(@wfid, @nada_exp_id).fields.should == @fields
 
     sleep 0.4
 
-    @tracer.to_s.should == ""
+    @tracer.to_s.should == ''
+  end
+
+  it 'should update the fields when passed {"workitem":...} (JSON)' do
+
+    params = { 'workitem' => { 'fields' => @fields } }
+
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      Rufus::Json.encode(params),
+      { 'CONTENT_TYPE' => 'application/json' })
+
+    last_response.should be_ok
+
+    find_workitem(@wfid, @nada_exp_id).fields.should == @fields
   end
 
-  it "should reply to the engine (HTML)" do
-    fields = Rufus::Json.encode({
-      "params" => {
-        "activity" => "Work your magic",
-      },
-      "foo" => "bar"
-    })
+  it 'should reply to the engine (HTML)' do
+
+    fields = Rufus::Json.encode(@fields)
 
-    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}", :fields => fields, :_proceed => '1'
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}",
+      :fields => fields,
+      :_proceed => '1')
 
     last_response.should be_redirect
     last_response['Location'].should == "/_ruote/workitems/#{@wfid}"
@@ -240,22 +310,17 @@ describe "PUT /_ruote/workitems/X-Y", :type => :with_engine do
     #])
     sleep 0.5
 
-    @tracer.to_s.should == "bar"
+    @tracer.to_s.should == 'bar'
   end
 
-  it "should reply to the engine (JSON)" do
-    fields = {
-      "params" => {
-        "activity" => "Work your magic",
-      },
-      "foo" => "bar"
-    }
-    params = {
-      "fields" => fields,
-      "_proceed" => "1"
-    }
+  it 'should reply to the engine (JSON)' do
+
+    params = { 'fields' => @fields, '_proceed' => '1' }
 
-    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}.json", params.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      Rufus::Json.encode(params),
+      { 'CONTENT_TYPE' => 'application/json' })
 
     last_response.should be_ok
 
@@ -265,13 +330,33 @@ describe "PUT /_ruote/workitems/X-Y", :type => :with_engine do
     #])
     sleep 0.5
 
-    @tracer.to_s.should == "bar"
+    @tracer.to_s.should == 'bar'
+  end
+
+  it 'should 400 when passed bogus JSON fields (HTML)' do
+
+    put "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}", :fields => '{"bogus"}'
+
+    last_response.status.should be(400)
+  end
+
+  it 'should 400 when passed bogus JSON fields (JSON)' do
+
+    put(
+      "/_ruote/workitems/#{@nada_exp_id}!!#{@wfid}.json",
+      "{'bogus'}",
+      { 'CONTENT_TYPE' => 'application/json' })
+
+    last_response.status.should be(400)
   end
 end
 
-describe "Filtering workitems", :type => :with_engine do
+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'
@@ -291,9 +376,10 @@ describe "Filtering workitems", :type => :with_engine do
     end
   end
 
-  describe "on participants" do
+  describe 'on participants' do
+
+    it 'should narrow results down to a single participant (JSON)' do
 
-    it "should narrow results down to a single participant (JSON)" do
       get '/_ruote/workitems.json', :participant => 'jack'
 
       last_response.should be_ok
@@ -301,17 +387,21 @@ describe "Filtering workitems", :type => :with_engine do
       last_response.json_body['workitems'].size.should be(1)
     end
 
-    it "should narrow results down to a single participant (HTML)" do
+    it 'should narrow results down to a single participant (HTML)' do
+
       get '/_ruote/workitems', :participant => 'jack'
 
       last_response.should be_ok
+
+      last_response.should match(workitem_count(1, 3, 3))
     end
 
   end
 
-  describe "on field values" do
+  describe 'on field values' do
+
+    it 'should find workitems with fields set to a given value (JSON)' do
 
-    it "should find worktitems with fields set to a given value (JSON)" do
       get '/_ruote/workitems.json', :hinkypinky => 'honkytonky'
 
       last_response.should be_ok
@@ -319,13 +409,15 @@ describe "Filtering workitems", :type => :with_engine do
       last_response.json_body['workitems'].size.should be(2)
     end
 
-    it "should find worktitems with fields set to a given value (HTML)" do
+    it 'should find workitems with fields set to a given value (HTML)' do
+
       get '/_ruote/workitems', :hinkypinky => 'honkytonky'
 
       last_response.should be_ok
     end
 
-    it "should respect JSON encoded filter vars (JSON)" do
+    it 'should respect JSON encoded filter vars (JSON)' do
+
       get '/_ruote/workitems.json', :wands => 101
 
       last_response.should be_ok
@@ -333,13 +425,15 @@ describe "Filtering workitems", :type => :with_engine do
       last_response.json_body['workitems'].size.should be(1)
     end
 
-    it "should respect JSON encoded filter vars (HTML)" do
+    it 'should respect JSON encoded filter vars (HTML)' do
+
       get '/_ruote/workitems', :wands => 101
 
       last_response.should be_ok
     end
 
     it "should combine search criteria by 'and' (JSON)" do
+
       get '/_ruote/workitems.json', :hinkypinky => 'honkytonky', :wands => 101
 
       last_response.should be_ok
@@ -348,10 +442,11 @@ describe "Filtering workitems", :type => :with_engine do
     end
 
     it "should combine search criteria by 'and' (HMTL)" do
+
       get '/_ruote/workitems', :hinkypinky => 'honkytonky', :wands => 101
 
       last_response.should be_ok
     end
-
   end
 end
+

data/spec/ruote-kit_configure_spec.rb

@@ -3,97 +3,54 @@ require File.join(File.dirname(__FILE__), 'spec_helper.rb')
 
 undef :context if defined?(context)
 
-class MyCustomStorage
-  attr_reader :opts
-  def initialize (opts)
-    @opts = opts
-  end
-end
-
-class MyParticipant
-end
 
 describe RuoteKit do
 
-  describe 'configure' do
+#  describe 'run_worker' do
+#
+#    before(:each) do
+#      RuoteKit.run_worker(Ruote::HashStorage.new)
+#    end
+#
+#    it 'should instantiate an engine' do
+#      RuoteKit.engine.should_not == nil
+#    end
+#
+#    it 'should instantiate an engine with a worker' do
+#      RuoteKit.engine.worker.should_not == nil
+#    end
+#
+#    it 'should instantiate an engine bound to a storage' do
+#      RuoteKit.engine.storage.class.should == Ruote::HashStorage
+#    end
+#  end
+
+  describe 'bind_engine' do
 
     before(:each) do
-      # nothing
-    end
-
-    it 'should default to :transient' do
-
-      RuoteKit.configuration.mode.should == :transient
-    end
-  end
-
-  describe 'configure with a custom storage' do
-
-    before(:each) do
-
-      RuoteKit.configure do |conf|
-        #require 'path/to/my_custom_storage'
-        conf.set_storage( MyCustomStorage, :a => 'A', :b => 'B' )
-        conf.run_engine = false
-      end
+      RuoteKit.bind_engine(Ruote::HashStorage.new)
     end
 
-    after(:each) do
-      RuoteKit.reset_configuration!
+    it 'should instantiate an engine' do
+      RuoteKit.engine.should_not == nil
     end
 
-    it 'should advertise mode as :custom' do
-
-      RuoteKit.configuration.mode.should == :custom
+    it 'should instantiate an engine without a worker' do
+      RuoteKit.engine.worker.should == nil
     end
 
-    it 'should return an instance of the customer storage' do
-
-      si = RuoteKit.configuration.storage_instance
-
-      si.class.should == MyCustomStorage
-      si.opts.should == { :a => 'A', :b => 'B' }
+    it 'should instantiate an engine bound to a storage' do
+      RuoteKit.engine.storage.class.should == Ruote::HashStorage
     end
   end
 
-  describe 'register participants' do
-
-    require 'ruote/participant'
-
-    describe 'custom participant' do
-      RuoteKit.configure do |conf|
-        conf.register do
-          participant 'al', MyParticipant
-        end
-      end
-
-      RuoteKit.engine.context.plist.names.should == ['^al$']
-    end
+  describe 'direct engine setting' do
 
-    describe 'catchall participant' do
-      RuoteKit.configure do |conf|
-        conf.register do
-          catchall MyParticipant
-        end
-      end
-
-      RuoteKit.engine.context.plist.names.should == [ '^.+$' ]
-    end
-
-    describe 'catchall participant without any options' do
-      require 'ruote/part/storage_participant'
-
-      RuoteKit.configure do |conf|
-        conf.register do
-          catchall
-        end
-      end
-
-      RuoteKit.engine.context.plist.lookup('.+').instance_of?(Ruote::StorageParticipant).should == true
-    end
+    # stupid illustrative spec
 
-    after do
-      RuoteKit.reset_configuration!
+    it 'should comply' do
+      RuoteKit.engine = Ruote::Engine.new(Ruote::HashStorage.new)
+      RuoteKit.engine.should_not == nil
     end
   end
 end

data/spec/spec.opts

@@ -1,2 +1 @@
 --colour
---debugger