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

Revert "Deprecated multi args to http route methods"

Browse source 
Too painful to lose the compact shorthand form!

This reverts commit e848c52535.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb
This commit is contained in:
Jeremy Kemper 2012-02-05 23:22:49 -07:00
parent 33514a173c
commit b8f2a43ce2
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
actionpack/lib/action_dispatch/routing/mapper.rb
View file

@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/object/inclusion' require 'active_support/core_ext/object/inclusion'
require 'active_support/inflector' require 'active_support/inflector'
require 'active_support/deprecation'
require 'action_dispatch/routing/redirection' require 'action_dispatch/routing/redirection'
module ActionDispatch module ActionDispatch
@ -503,16 +502,6 @@ module ActionDispatch
private private
def map_method(method, args, &block) def map_method(method, args, &block)
if args.length > 2
ActiveSupport::Deprecation.warn <<-eowarn
The method signature of #{method}() is changing to:
#{method}(path, options = {}, &block)
Calling with multiple paths is deprecated.
eowarn
end
options = args.extract_options! options = args.extract_options!
options[:via] = method options[:via] = method
match(*args, options, &block) match(*args, options, &block)

3
actionpack/test/dispatch/routing_test.rb
View file

@ -157,8 +157,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end end
resources :posts do resources :posts do
get :archive, :on => :collection get :archive, :toggle_view, :on => :collection
get :toggle_view, :on => :collection
post :preview, :on => :member post :preview, :on => :member
resource :subscription resource :subscription