Refactored url_for in AV to have its own instances of the helpers instead of proxying back to the controller. This potentially allows for more standalone usage of AV. It also kicked up a lot of dust in the tests, which were mocking out controllers to get this behavior. By moving it to the view, it made a lot of the tests more standalone (a win)

1 files changed, 37 insertions, 15 deletions

diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index b23d5fcb68..1415966869 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -13,14 +13,15 @@ module ActionView
       extend ActiveSupport::Concern
 
       include ActionDispatch::Routing::UrlFor
-      include JavaScriptHelper
+      include TagHelper
 
       # Need to map default url options to controller one.
-      def default_url_options(*args) #:nodoc:
-        controller.send(:default_url_options, *args)
-      end
-
+      # def default_url_options(*args) #:nodoc:
+      #   controller.send(:default_url_options, *args)
+      # end
+      #
       def url_options
+        return super unless controller.respond_to?(:url_options)
         controller.url_options
       end
 
@@ -97,7 +98,7 @@ module ActionView
         when Hash
           options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
           escape  = options.key?(:escape) ? options.delete(:escape) : false
-          controller.send(:url_for, options)
+          super
         when :back
           escape = false
           controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
@@ -119,13 +120,24 @@ module ActionView
       #
       # ==== Signatures
       #
-      #   link_to(name, options = {}, html_options = nil)
-      #   link_to(options = {}, html_options = nil) do
+      #   link_to(body, url, html_options = {})
+      #     # url is a String; you can use URL helpers like
+      #     # posts_path
+      #
+      #   link_to(body, url_options = {}, html_options = {})
+      #     # url_options, except :confirm or :method,
+      #     # is passed to url_for
+      #
+      #   link_to(options = {}, html_options = {}) do
+      #     # name
+      #   end
+      #
+      #   link_to(url, html_options = {}) do
       #     # name
       #   end
       #
       # ==== Options
-      # * <tt>:confirm => 'question?'</tt> - This will allow the unobtrusive JavaScript 
+      # * <tt>:confirm => 'question?'</tt> - This will allow the unobtrusive JavaScript
       #   driver to prompt with the question specified. If the user accepts, the link is
       #   processed normally, otherwise no action is taken.
       # * <tt>:method => symbol of HTTP verb</tt> - This modifier will dynamically
@@ -138,7 +150,11 @@ module ActionView
       #   disabled clicking the link will have no effect. If you are relying on the
       #   POST behavior, you should check for it in your controller's action by using
       #   the request object's methods for <tt>post?</tt>, <tt>delete?</tt> or <tt>put?</tt>.
-      # * The +html_options+ will accept a hash of html attributes for the link tag.
+      # * <tt>:remote => true</tt> - This will allow the unobtrusive JavaScript
+      #   driver to make an Ajax request to the URL in question instead of following
+      #   the link. The drivers each provide mechanisms for listening for the
+      #   completion of the Ajax request and performing JavaScript operations once
+      #   they're complete
       #
       # ==== Examples
       # Because it relies on +url_for+, +link_to+ supports both older-style controller/action/id arguments
@@ -220,8 +236,8 @@ module ActionView
           options      = args[1] || {}
           html_options = args[2]
 
-          url = url_for(options)
           html_options = convert_options_to_data_attributes(options, html_options)
+          url = url_for(options)
 
           if html_options
             html_options = html_options.stringify_keys
@@ -259,10 +275,10 @@ module ActionView
       # There are a few special +html_options+:
       # * <tt>:method</tt> - Specifies the anchor name to be appended to the path.
       # * <tt>:disabled</tt> - Specifies the anchor name to be appended to the path.
-      # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to 
+      # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
       #   prompt with the question specified. If the user accepts, the link is
       #   processed normally, otherwise no action is taken.
-      # * <tt>:remote</tt> -  If set to true, will allow the Unobtrusive JavaScript drivers to control the 
+      # * <tt>:remote</tt> -  If set to true, will allow the Unobtrusive JavaScript drivers to control the
       #   submit behaviour. By default this behaviour is an ajax submit.
       #
       # ==== Examples
@@ -282,7 +298,7 @@ module ActionView
       #   #    </form>"
       #
       #
-      #   <%= button_to('Destroy', 'http://www.example.com', :confirm => 'Are you sure?', 
+      #   <%= button_to('Destroy', 'http://www.example.com', :confirm => 'Are you sure?',
       #             :method => "delete", :remote => true, :disable_with => 'loading...') %>
       #   # => "<form class='button-to' method='post' action='http://www.example.com' data-remote='true'>
       #   #       <div>
@@ -546,8 +562,14 @@ module ActionView
       #   current_page?(:controller => 'library', :action => 'checkout')
       #   # => false
       def current_page?(options)
+        unless request
+          raise "You cannot use helpers that need to determine the current " \
+                "page unless your view context provides a Request object " \
+                "in a #request method"
+        end
+
         url_string = CGI.unescapeHTML(url_for(options))
-        request = controller.request
+
         # We ignore any extra parameters in the request_uri if the
         # submitted url doesn't have any either.  This lets the function
         # work with things like ?order=asc