ruote-kit 2.1.8.2 → 2.1.10

data/spec/resources/processes_spec.rb

@@ -79,6 +79,7 @@ describe "GET /_ruote/processes/X-Y", :type => :with_engine do
     end
 
     it "should 404 correctly (JSON)" do
+
       get "/_ruote/processes/foo.json"
 
       last_response.should_not be_ok
@@ -112,7 +113,7 @@ describe "POST /_ruote/processes", :type => :with_engine do
       end}
     }
 
-    post '/_ruote/processes.json', params.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    post '/_ruote/processes.json', Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
 
     last_response.should be_ok
 
@@ -131,7 +132,7 @@ describe "POST /_ruote/processes", :type => :with_engine do
       :fields => { :foo => 'bar' }
     }
 
-    post '/_ruote/processes.json', params.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    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\-]+/)
@@ -195,7 +196,7 @@ describe "POST /_ruote/processes", :type => :with_engine do
   it "should return a 422 unprocessable entity error when launching a process fails (JSON)" do
     params = { :definition => 'http://invalid.invalid' }
 
-    post '/_ruote/processes.json', params.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    post '/_ruote/processes.json', Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
 
     last_response.should_not be_ok
     last_response.status.should be(422)

data/spec/resources/workitems_spec.rb

@@ -210,7 +210,7 @@ describe "PUT /_ruote/workitems/X-Y", :type => :with_engine do
       "fields" => fields
     }
 
-    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}.json", params.to_json, { 'CONTENT_TYPE' => 'application/json' }
+    put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}.json", Rufus::Json.encode(params), { 'CONTENT_TYPE' => 'application/json' }
 
     last_response.should be_ok
 
@@ -222,12 +222,12 @@ describe "PUT /_ruote/workitems/X-Y", :type => :with_engine do
   end
 
   it "should reply to the engine (HTML)" do
-    fields = {
+    fields = Rufus::Json.encode({
       "params" => {
         "activity" => "Work your magic",
       },
       "foo" => "bar"
-    }.to_json
+    })
 
     put "/_ruote/workitems/#{@wfid}/#{@nada_exp_id}", :fields => fields, :_proceed => '1'
 
@@ -271,18 +271,27 @@ end
 
 describe "Filtering workitems", :type => :with_engine do
 
-  describe "on participants" do
-    before(:each) do
-      @wfid = launch_test_process do
-        Ruote.process_definition :name => 'test' do
-          concurrence do
+  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'
-            well :activity => 'Ready water'
           end
+          well :activity => 'Ready water'
         end
       end
     end
+  end
+
+  describe "on participants" do
 
     it "should narrow results down to a single participant (JSON)" do
       get '/_ruote/workitems.json', :participant => 'jack'
@@ -298,18 +307,51 @@ describe "Filtering workitems", :type => :with_engine do
       last_response.should be_ok
     end
 
-    it "should narrow results down to multiple participants (JSON)" do
-      get "/_ruote/workitems.json", :participant => 'jack,jill'
+  end
+
+  describe "on field values" 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
 
       last_response.json_body['workitems'].size.should be(2)
     end
 
-    it "should narrow results down to multiple participants (HTML)" do
-      get "/_ruote/workitems", :participant => 'jack,jill'
+    it "should find worktitems 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
+      get '/_ruote/workitems.json', :wands => 101
+
+      last_response.should be_ok
+
+      last_response.json_body['workitems'].size.should be(1)
+    end
+
+    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
+
+      last_response.json_body['workitems'].size.should be(1)
+    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/spec_helper.rb

@@ -1,18 +1,17 @@
 ENV['RACK_ENV'] = 'test'
 
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
 
+require 'spec'
 require 'spec/interop/test'
 require 'rack/test'
 
 require 'webrat'
 
+require 'json'
+
 Test::Unit::TestCase.send :include, Rack::Test::Methods
 
 require File.dirname(__FILE__) + '/../vendor/gems/environment' if File.exists?( File.dirname(__FILE__) + '/../vendor/gems/environment.rb' )

metadata

@@ -1,141 +1,206 @@
 --- !ruby/object:Gem::Specification 
 name: ruote-kit
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 1
-  - 8
-  - 2
-  version: 2.1.8.2
+  - 10
+  version: 2.1.10
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
+- John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +01:00
+date: 2010-07-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 9
         - 5
         version: 0.9.5
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sinatra-respond_to
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 4
         - 0
         version: 0.4.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 2
         - 2
         - 5
         version: 2.2.5
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
+  name: rufus-json
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
-        version: "0"
+        - 2
+        - 3
+        version: 0.2.3
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruote
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 1
-        - 8
-        version: 2.1.8
+        - 10
+        version: 2.1.10
   type: :runtime
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id012
 description: ruote-kit is a RESTful Rack app for the ruote workflow engine
 email: kenneth.kalmer@gmail.com
 executables: []
@@ -172,11 +237,13 @@ files:
 - 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
@@ -191,6 +258,7 @@ files:
 - 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
@@ -215,23 +283,27 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ruote workflow engine, wrapped in a loving rack embrace
@@ -239,6 +311,7 @@ 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