diff options
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 11 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 5b7f1c989c..9ca3566663 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/hash/except' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/inclusion' require 'active_support/inflector' +require 'active_support/deprecation' require 'action_dispatch/routing/redirection' module ActionDispatch @@ -499,6 +500,16 @@ module ActionDispatch private 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 = {}) + +Calling with multiple paths is deprecated. + eowarn + end + options = args.extract_options! options[:via] = method match(*args, options, &block) diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index c6e6ed4d6b..8f843eb960 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -156,7 +156,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end resources :posts do - get :archive, :toggle_view, :on => :collection + get :archive, :on => :collection + get :toggle_view, :on => :collection post :preview, :on => :member resource :subscription |