kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

raise an error if the old router draw method is used, along with a message advising them to either upgrade their routes or add rails_legacy_mapper to their Gemfile

Browse source
This commit is contained in:
Josh Kalderimis 2011-05-03 16:07:25 +02:00
parent ed3e667415
commit 275529446e
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -240,6 +240,11 @@ module ActionDispatch
end end
def eval_block(block) def eval_block(block)
if block.arity == 1
raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
"Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/ " <<
"or add the rails_legacy_mapper gem to your Gemfile"
end
mapper = Mapper.new(self) mapper = Mapper.new(self)
if default_scope if default_scope
mapper.with_default_scope(default_scope, &block) mapper.with_default_scope(default_scope, &block)

6
actionpack/test/controller/routing_test.rb
View file

@ -92,6 +92,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
@rs.clear! @rs.clear!
end end
def test_draw_with_block_arity_one_raises
assert_raise(RuntimeError) do
@rs.draw { |map| map.match '/:controller(/:action(/:id))' }
end
end
def test_default_setup def test_default_setup
@rs.draw { match '/:controller(/:action(/:id))' } @rs.draw { match '/:controller(/:action(/:id))' }
assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content")) assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))