.gitignore @@ -176,7 +176,7 @@ class ProcessesController < ApplicationController return OpenWFE::Xml::launchitem_from_xml(request.body.read) \ if ct.match(/xml$/) - return OpenWFE::Json.launchitem_from_json(request.body.read) \ + return OpenWFE::Json.launchitem_from_h(request.body.read) \ if ct.match(/json$/) # @@ -196,6 +196,7 @@ class ProcessesController < ApplicationController rescue Exception => e logger.warn "failed to parse launchitem : #{e}" + #p e nil end app/controllers/processes_controller.rb @@ -40,19 +40,24 @@ class WorkitemsController < ApplicationController # GET /workitems # or - # GET /workitems?wfid=:wfid + # GET /workitems?q=:q || GET /workitems?query=:q # or - # GET /workitems?q=:q || GET /workitems?query=:query + # GET /workitems?p=:p || GET /workitems?participant=:p + # + # handles as well index_wfid() # def index @wfid = params[:wfid] @query = params[:q] || params[:query] + @participant = params[:p] || params[:participant] - @workitems = if @wfid - OpenWFE::Extras::Workitem.find_all_by_wfid(@wfid) + @workitems = if @participant + OpenWFE::Extras::Workitem.find_all_by_participant_name(@participant) elsif @query OpenWFE::Extras::Workitem.search(@query) + elsif @wfid + OpenWFE::Extras::Workitem.find_all_by_wfid(@wfdi) else OpenWFE::Extras::Workitem.find(:all) end @@ -74,20 +79,27 @@ class WorkitemsController < ApplicationController end end - # GET /workitems/:id/edit + # GET /workitems/:wfid + # + def index_wfid + + index + end + + # GET /workitems/:wfid/:expid/edit # def edit - @workitem = OpenWFE::Extras::Workitem.find(params[:id]) + @workitem = find_workitem # only responds in HTML... end - # GET /workitems/:id + # GET /workitems/:wfid/:expid # def show - @workitem = OpenWFE::Extras::Workitem.find(params[:id]) + @workitem = find_workitem respond_to do |format| format.html # => app/views/show.html.erb @@ -98,11 +110,11 @@ class WorkitemsController < ApplicationController end end - # PUT /workitems/:id + # PUT /workitems/:wfid/:expid # def update - wi = OpenWFE::Extras::Workitem.find(params[:id]) + wi = find_workitem owi = wi.to_owfe_workitem wi1 = parse_workitem @@ -141,6 +153,17 @@ class WorkitemsController < ApplicationController end # + # assumes params :wfid and :expid are set and returns the corresponding + # workitem + # + def find_workitem + + wfid = params[:wfid] + expid = params[:expid] + OpenWFE::Extras::Workitem.find_by_wfid_and_expid(wfid, expid) + end + + # # parsing incoming workitems # def parse_workitem @@ -177,7 +200,7 @@ class WorkitemsController < ApplicationController rescue Exception => e - logger.warn "failed to parse workitem : #{e}" + logger.warn("failed to parse workitem : #{e}") nil end app/controllers/workitems_controller.rb @@ -46,6 +46,7 @@ module ApplicationHelper end def comma_list (objects, accessor=:name) + objects.collect { |o| name = o.send(accessor) path = send "#{o.class.to_s.downcase}_path", o @@ -53,13 +54,24 @@ module ApplicationHelper }.join(', ') end + # + # given a view, returns the link to the same view in another content type + # (xml / json) + # def as_x_href (format) + href = [ :protocol, :host, ':', :port, #:script_name :path_info, ".#{format}?plain=true" ].inject('') do |s, elt| - s << (elt.is_a?(String) ? elt : request.send(elt).to_s) + s << if elt.is_a?(String) + elt + elsif request.respond_to?(elt) + request.send(elt).to_s + else # shouldn't happen, so let's be verbose + elt.inspect + end end href << "&#{request.query_string}" if request.query_string.length > 0 href app/helpers/application_helper.rb @@ -53,8 +53,7 @@ ActionController::Routing::Routes.draw do |map| # Note: These default routes make all actions in every controller accessible via GET requests. You should # consider removing the them or commenting them out if you're using named routes and resources. - map.resources :workitems - + map.wfid_resources :workitems map.wfid_resources :expressions map.resources :definitions config/routes.rb @@ -31,7 +31,6 @@ ActiveRecord::Schema.define(:version => 20080926082146) do add_index "fields", ["fkey"], :name => "index_fields_on_fkey" add_index "fields", ["svalue"], :name => "index_fields_on_svalue" add_index "fields", ["vclass"], :name => "index_fields_on_vclass" - add_index "fields", ["workitem_id", "fkey"], :name => "index_fields_on_workitem_id_and_fkey", :unique => true create_table "group_definitions", :force => true do |t| t.integer "group_id" db/schema.rb @@ -3,6 +3,7 @@ one: id: 1 fei: (fei 0.9.20 s_engine /Users/mettraux/ruote-web2/public/defs/truck_sell_0.rb TruckSell 0 20081003-gajoyususo participant 0.6.0) wfid: 20081003-gajoyususo + expid: 0.0.1 wf_name: test wf_revision: 0 participant_name: alpha test/fixtures/workitems.yml @@ -31,8 +31,18 @@ class ProcessesControllerTest < ActionController::TestCase @request.env['HTTP_ACCEPT'] = 'application/xml' get :index assert_response :success + #puts @response.body assert_match(/href="http:\/\/test.host:80\/processes"/, @response.body) assert_match(/count="0"/, @response.body) + assert_equal( + %{ +<?xml version="1.0" encoding="UTF-8"?> +<processes count="0"> + <link href="http://test.host:80/" rel="via"/> + <link href="http://test.host:80/processes" rel="self"/> +</processes> + }.strip, + @response.body.strip) end def test_empty_process_list_json @@ -40,7 +50,7 @@ class ProcessesControllerTest < ActionController::TestCase @request.env['HTTP_ACCEPT'] = 'application/json' get :index assert_response :success - assert_equal '[]', @response.body + assert_equal '{"elements": []}', @response.body end def test_launch_process_form test/functional/processes_controller_test.rb @@ -14,7 +14,7 @@ end class WorkitemsControllerTest < ActionController::TestCase fixtures :users, :groups - fixtures :workitems + #fixtures :workitems def test_should_not_get_index get :index @@ -29,13 +29,17 @@ class WorkitemsControllerTest < ActionController::TestCase def test_should_show_workitem login_as :admin - get :show, :id => 1 + get :show, :wfid => '20081003-gajoyususo', :expid => '0.0.1' assert_response :success end def test_should_save_workitem login_as :admin - put :update, { 'id' => 1, 'fields' => '{ "type": "petit bateau" }' } + put( + :update, + { :wfid => '20081003-gajoyususo', + :expid => '0.0.1', + :fields => '{ "type": "petit bateau" }' }) assert_response 302 assert_equal 'http://test.host/workitems', @response.headers['Location'] wi = OpenWFE::Extras::Workitem.find(1).as_owfe_workitem @@ -58,18 +62,38 @@ class WorkitemsControllerTest < ActionController::TestCase workitems = ActiveSupport::JSON.decode(@response.body) - wi = workitems.find { |wi| + wi = workitems['elements'].find { |wi| wi['flow_expression_id']['workflow_instance_id'] == fei.wfid } - assert_not_nil wi['href'] + assert_not_nil wi['links'] assert_equal 'alice', wi['participant_name'] atts = wi['attributes'] atts['girl'] = 'Ukifune' - put :update, { 'state' => 'proceeded', 'fields' => atts } + p wi['flow_expression_id']['expression_id'] + + wfei = wi['flow_expression_id'] + + # timeout occurs during this put : + put( + :update, + { :wfid => wfei['workflow_instance_id'], :expid => wfei['expression_id'], + 'state' => 'proceeded', 'fields' => atts }) + sleep 0.350 + + @request.env['HTTP_ACCEPT'] = 'application/json' + get :index + assert_response :success + + workitems = ActiveSupport::JSON.decode(@response.body) + + wi = workitems['elements'].find { |wi| + wi['flow_expression_id']['workflow_instance_id'] == fei.wfid } + + assert_not_nil wi end end test/functional/workitems_controller_test.rb @@ -35,7 +35,7 @@ class Test::Unit::TestCase # # Note: You'll currently still have to declare fixtures explicitly in integration tests # -- they do not yet inherit this setting - fixtures :all + #fixtures :all # Add more helper methods to be used by all tests here... test/test_helper.rb d6907568e6e4195045e33515a595dcf4f7e61373 John Mettraux jmettraux@gmail.com http://github.com/jmettraux/ruote-web2/commit/54e22ba395efa3498da35df7fb6c790b41633ffe 54e22ba395efa3498da35df7fb6c790b41633ffe 2008-12-22T05:14:37-08:00 2008-12-22T05:14:37-08:00 tst/func/workitems broken; good progress anyway 34b2544956cae7624a5ed396119f73222db7a7fd John Mettraux jmettraux@gmail.com