@@ -192,6 +192,7 @@ module RestfulWorkflow def forward_url if @forward url = @forward.respond_to?(:call) ? controller.instance_eval(&@forward) : @forward + url = { :id => url } if url.kind_of?(Symbol) end url || { :id => (next_step || self).name } end @@ -213,6 +214,7 @@ module RestfulWorkflow def back_url if @back url = @back.respond_to?(:call) ? controller.instance_eval(&@back) : @back + url = { :id => url } if url.kind_of?(Symbol) end url || { :id => (previous_step || self).name } end lib/restful_workflow.rb @@ -42,4 +42,10 @@ describe "RestfulWorkflow::Filters" do @controller.load_current_object @controller.send(:instance_variable_get, "@current_object").should == @data end + + it "should add a before filter to load the current object" do + @kontroller.filter_chain.should_not be_empty + @kontroller.find_filter(:load_current_object).should_not be_nil + @kontroller.find_filter(:load_current_object).should be_before + end end \ No newline at end of file spec/filters_spec.rb @@ -175,11 +175,10 @@ describe "RestfulWorkflow::Step" do @one.forward_url.should == "/" end - it "to a block that evals to nil should determine the next step's URL to be the default" do - @one.forward do - end - @one.forward_url.should == {:id => "two"} - end + it "to a block which evals to a symbol results in a URL to the step by that name" do + @one.forward { :two } + @one.forward_url.should == {:id => :two} + end end describe "when the previous step is assigned manually" do @@ -200,12 +199,11 @@ describe "RestfulWorkflow::Step" do @one.back "/" @one.back_url.should == "/" end - - it "to a block that evals to nil should determine the previous step's URL to be the default" do - @one.back do - end - @one.back_url.should == {:id => "one"} - end + + it "to a block which evals to a symbol results in a URL to the step by that name" do + @one.back { :two } + @one.back_url.should == {:id => :two} + end end end spec/step_spec.rb 1ce7b9e42f3927cf11f125f5afd936abe6bd1265 Loren Johnson lorenj@lorens-laptop.local http://github.com/seancribbs/restful_workflow/commit/649c73694fed4218b0a183e31c2a08b3018abe85 649c73694fed4218b0a183e31c2a08b3018abe85 2008-05-03T16:57:13-07:00 2008-05-03T16:57:13-07:00 Added symbol only return value option to forward / back methods in the step DSL (will assume an id value). Specs included. 902d36474679bc3594f9836f828f7c402118f0af Loren Johnson lorenj@lorens-laptop.local