Remove ActionController::Base.resources_path_names

3 files changed, 18 insertions, 18 deletions

diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 136b024d9e..2b1ada1426 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -20,8 +20,6 @@ module ActionController
 
       class << self
         delegate :default_charset=, :to => "ActionDispatch::Response"
-        delegate :resources_path_names, :to => "ActionDispatch::Routing::Routes"
-        delegate :resources_path_names=, :to => "ActionDispatch::Routing::Routes"
       end
 
       # cattr_reader :protected_instance_variables
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index 8ce6b2f6d5..1417a9d8c0 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -244,14 +244,15 @@ module ActionDispatch
         attr_reader :collection_methods, :member_methods, :new_methods
         attr_reader :path_prefix, :name_prefix, :path_segment
         attr_reader :plural, :singular
-        attr_reader :options
+        attr_reader :options, :defaults
 
-        def initialize(entities, options)
+        def initialize(entities, options, defaults)
           @plural   ||= entities
           @singular ||= options[:singular] || plural.to_s.singularize
           @path_segment = options.delete(:as) || @plural
 
           @options = options
+          @defaults = defaults
 
           arrange_actions
           add_default_actions
@@ -280,7 +281,7 @@ module ActionDispatch
 
         def new_path
           new_action   = self.options[:path_names][:new] if self.options[:path_names]
-          new_action ||= ActionController::Base.resources_path_names[:new]
+          new_action ||= self.defaults[:path_names][:new]
           @new_path  ||= "#{path}/#{new_action}"
         end
 
@@ -370,7 +371,7 @@ module ActionDispatch
       end
 
       class SingletonResource < Resource #:nodoc:
-        def initialize(entity, options)
+        def initialize(entity, options, defaults)
           @singular = @plural = entity
           options[:controller] ||= @singular.to_s.pluralize
           super
@@ -717,7 +718,7 @@ module ActionDispatch
 
       private
         def map_resource(entities, options = {}, &block)
-          resource = Resource.new(entities, options)
+          resource = Resource.new(entities, options, :path_names => @set.resources_path_names)
 
           with_options :controller => resource.controller do |map|
             map_associations(resource, options)
@@ -734,7 +735,7 @@ module ActionDispatch
         end
 
         def map_singleton_resource(entities, options = {}, &block)
-          resource = SingletonResource.new(entities, options)
+          resource = SingletonResource.new(entities, options, :path_names => @set.resources_path_names)
 
           with_options :controller => resource.controller do |map|
             map_associations(resource, options)
@@ -826,7 +827,7 @@ module ActionDispatch
             actions.each do |action|
               [method].flatten.each do |m|
                 action_path = resource.options[:path_names][action] if resource.options[:path_names].is_a?(Hash)
-                action_path ||= ActionController::Base.resources_path_names[action] || action
+                action_path ||= @set.resources_path_names[action] || action
 
                 map_resource_routes(map, resource, action, "#{resource.member_path}#{resource.action_separator}#{action_path}", "#{action}_#{resource.shallow_name_prefix}#{resource.singular}", m, { :force_id => true })
               end
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 9b3f466e44..cce98ac482 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -31,10 +31,10 @@ end
 
 class ResourcesTest < ActionController::TestCase
   def test_should_arrange_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages,
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
       :collection => { :rss => :get, :reorder => :post, :csv => :post },
       :member     => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
-      :new        => { :preview => :get, :draft => :get })
+      :new        => { :preview => :get, :draft => :get }}, {})
 
     assert_resource_methods [:rss],                   resource, :collection, :get
     assert_resource_methods [:csv, :reorder],         resource, :collection, :post
@@ -44,18 +44,18 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_should_resource_controller_name_equal_resource_name_by_default
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {})
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {}, {})
     assert_equal 'messages', resource.controller
   end
 
   def test_should_resource_controller_name_equal_controller_option
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, :controller => 'posts')
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {:controller => 'posts'}, {})
     assert_equal 'posts', resource.controller
   end
 
   def test_should_all_singleton_paths_be_the_same
     [ :path, :nesting_path_prefix, :member_path ].each do |method|
-      resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, :path_prefix => 'admin')
+      resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, {:path_prefix => 'admin'}, {})
       assert_equal 'admin/messages', resource.send(method)
     end
   end
@@ -111,8 +111,8 @@ class ResourcesTest < ActionController::TestCase
   end
 
   def test_override_paths_for_default_restful_actions
-    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages,
-      :path_names => {:new => 'nuevo', :edit => 'editar'})
+    resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
+      :path_names => {:new => 'nuevo', :edit => 'editar'}}, {})
     assert_equal resource.new_path, "#{resource.path}/nuevo"
   end
 
@@ -1162,8 +1162,9 @@ class ResourcesTest < ActionController::TestCase
         options[:shallow_options] = options[:options]
       end
 
-      new_action    = ActionController::Base.resources_path_names[:new] || "new"
-      edit_action   = ActionController::Base.resources_path_names[:edit] || "edit"
+      new_action    = ActionDispatch::Routing::Routes.resources_path_names[:new] || "new"
+      edit_action   = ActionDispatch::Routing::Routes.resources_path_names[:edit] || "edit"
+
       if options[:path_names]
         new_action  = options[:path_names][:new] if options[:path_names][:new]
         edit_action = options[:path_names][:edit] if options[:path_names][:edit]