From 23b6def0eb76ac0719e420fce91ba862f880a37b Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 16 Mar 2010 14:55:42 -0700
Subject: Do not always include the named URL helpers into AC::Base and
 AV::Base.

---
 actionpack/lib/action_view/base.rb               | 4 ++++
 actionpack/lib/action_view/helpers/url_helper.rb | 7 +++++++
 actionpack/lib/action_view/test_case.rb          | 3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 3920d8593f..daabe6d196 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -235,6 +235,10 @@ module ActionView #:nodoc:
             include controller._helpers
             self.helpers = controller._helpers
           end
+
+          if controller.respond_to?(:_router)
+            include controller._router.url_helpers
+          end
         end
       else
         klass = self
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 94f1cecade..f877378ebe 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -9,6 +9,9 @@ module ActionView
     # This allows you to use the same format for links in views
     # and controllers.
     module UrlHelper
+      extend ActiveSupport::Concern
+
+      include ActionDispatch::Routing::UrlFor
       include JavaScriptHelper
 
       # Need to map default url options to controller one.
@@ -16,6 +19,10 @@ module ActionView
         controller.send(:default_url_options, *args)
       end
 
+      def url_options
+        controller.url_options
+      end
+
       # Returns the URL for the set of +options+ provided. This takes the
       # same options as +url_for+ in Action Controller (see the
       # documentation for <tt>ActionController::Base#url_for</tt>). Note that by default
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 1578ac9479..7e609eb640 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -124,7 +124,8 @@ module ActionView
 
       def _view
         view = ActionView::Base.new(ActionController::Base.view_paths, _assigns, @controller)
-        view.class.send :include, _helpers
+        view.singleton_class.send :include, _helpers
+        view.singleton_class.send :include, @controller._router.url_helpers
         view.output_buffer = self.output_buffer
         view
       end
-- 
cgit v1.2.3