From f3c703a32f6c7833705e46b8e14f172330a1c916 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 4 Aug 2010 16:20:56 +0200
Subject: Refactor RoutesProxy to avoid using _with_routes in helpers

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 actionpack/lib/action_dispatch/routing/url_for.rb   | 4 ++++
 actionpack/lib/action_view/helpers/url_helper.rb    | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 219fa37fcb..363bcbd2b0 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -307,7 +307,7 @@ module ActionDispatch
         routes = self
         MountedHelpers.class_eval do
           define_method "_#{name}" do
-            RoutesProxy.new(routes, self)
+            RoutesProxy.new(routes, self._routes_context)
           end
         end
 
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 19db730b6a..e836cf7c8e 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -141,6 +141,10 @@ module ActionDispatch
         ensure
           @_routes = old_routes
         end
+
+        def _routes_context
+          self
+        end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index f21cffea26..555be6ed2b 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -22,6 +22,10 @@ module ActionView
       include ActionDispatch::Routing::UrlFor
       include TagHelper
 
+      def _routes_context
+        controller
+      end
+
       # Need to map default url options to controller one.
       # def default_url_options(*args) #:nodoc:
       #   controller.send(:default_url_options, *args)
@@ -29,9 +33,7 @@ module ActionView
       #
       def url_options
         return super unless controller.respond_to?(:url_options)
-        controller.send(:_with_routes, _routes) do
-          controller.url_options
-        end
+        controller.url_options
       end
 
       # Returns the URL for the set of +options+ provided. This takes the
-- 
cgit v1.2.3