@@ -143,11 +143,19 @@ class NiftyScaffoldGenerator < Rails::Generator::Base end end + def items_path(suffix = 'path') + if action? :index + "#{plural_name}_#{suffix}" + else + "root_#{suffix}" + end + end + def item_path(suffix = 'path') if action? :show "@#{singular_name}" else - "#{plural_name}_#{suffix}" + items_path(suffix) end end @@ -155,7 +163,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base if action? :show "#{singular_name}_#{suffix}(assigns[:#{singular_name}])" else - "#{plural_name}_#{suffix}" + items_path(suffix) end end @@ -163,7 +171,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base if action? :show "#{singular_name}_#{suffix}(assigns(:#{singular_name}))" else - "#{plural_name}_#{suffix}" + items_path(suffix) end end rails_generators/nifty_scaffold/nifty_scaffold_generator.rb @@ -2,5 +2,5 @@ @<%= singular_name %> = <%= class_name %>.find(params[:id]) @<%= singular_name %>.destroy flash[:notice] = "Successfully destroyed <%= name.humanize.downcase %>." - redirect_to <%= plural_name %>_url + redirect_to <%= items_path('url') %> end rails_generators/nifty_scaffold/templates/actions/destroy.rb @@ -1,6 +1,6 @@ it "destroy action should destroy model and redirect to index action" do <%= singular_name %> = <%= class_name %>.first delete :destroy, :id => <%= singular_name %> - response.should redirect_to(<%= plural_name %>_url) + response.should redirect_to(<%= items_path('url') %>) <%= class_name %>.exists?(<%= singular_name %>.id).should be_false end rails_generators/nifty_scaffold/templates/tests/rspec/actions/destroy.rb @@ -2,7 +2,7 @@ should "destroy model and redirect to index action" do <%= singular_name %> = <%= class_name %>.first delete :destroy, :id => <%= singular_name %> - assert_redirected_to <%= plural_name %>_url + assert_redirected_to <%= items_path('url') %> assert !<%= class_name %>.exists?(<%= singular_name %>.id) end end rails_generators/nifty_scaffold/templates/tests/shoulda/actions/destroy.rb @@ -1,6 +1,6 @@ def test_destroy <%= singular_name %> = <%= class_name %>.first delete :destroy, :id => <%= singular_name %> - assert_redirected_to <%= plural_name %>_url + assert_redirected_to <%= items_path('url') %> assert !<%= class_name %>.exists?(<%= singular_name %>.id) end rails_generators/nifty_scaffold/templates/tests/testunit/actions/destroy.rb @@ -139,7 +139,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase assert_match "@line_item = LineItem.new(params[:line_item])", body assert_match "if @line_item.save", body assert_match "flash[:notice] = \"Successfully created line item.\"", body - assert_match "redirect_to line_items_url", body + assert_match "redirect_to root_url", body assert_match "render :action => 'new'", body end end @@ -164,7 +164,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase assert_match "def update", body assert_match "if @line_item.update_attributes(params[:line_item])", body assert_match "flash[:notice] = \"Successfully updated line item.\"", body - assert_match "redirect_to line_items_url", body + assert_match "redirect_to root_url", body assert_match "render :action => 'edit'", body end end @@ -181,7 +181,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase assert_match "@line_item = LineItem.find(params[:id])", body assert_match "@line_item.destroy", body assert_match "flash[:notice] = \"Successfully destroyed line item.\"", body - assert_match "redirect_to line_items_url", body + assert_match "redirect_to root_url", body end end end @@ -256,6 +256,7 @@ class TestNiftyScaffoldGenerator < Test::Unit::TestCase assert_generated_file "app/controllers/line_items_controller.rb" do |body| assert_match "def create", body assert_match "def update", body + assert_match "root_url", body end end end test/test_nifty_scaffold_generator.rb 7b5f755e640c72ae766cda2b403f7c269d8fe868 Ryan Bates ryan@railscasts.com http://github.com/ryanb/nifty-generators/commit/9860f10b7683015aa902dd31cfbe85882860c934 9860f10b7683015aa902dd31cfbe85882860c934 2009-05-05T10:45:47-07:00 2009-05-05T10:45:47-07:00 redirecting to root_url if index action doesn't exist for nifty_scaffold - closes #4 6db6b7b487ac16bd473d36ba7970e47779a5a2bc Ryan Bates ryan@railscasts.com