Merge branch 'master' of git@github.com:lifo/docrails

1 files changed, 13 insertions, 12 deletions

diff --git a/actionpack/lib/action_controller/routing/optimisations.rb b/actionpack/lib/action_controller/routing/optimisations.rb
index cd4a423e6b..0fe836606c 100644
--- a/actionpack/lib/action_controller/routing/optimisations.rb
+++ b/actionpack/lib/action_controller/routing/optimisations.rb
@@ -1,14 +1,14 @@
 module ActionController
   module Routing
-    # Much of the slow performance from routes comes from the 
+    # Much of the slow performance from routes comes from the
     # complexity of expiry, <tt>:requirements</tt> matching, defaults providing
-    # and figuring out which url pattern to use.  With named routes 
-    # we can avoid the expense of finding the right route.  So if 
+    # and figuring out which url pattern to use.  With named routes
+    # we can avoid the expense of finding the right route.  So if
     # they've provided the right number of arguments, and have no
     # <tt>:requirements</tt>, we can just build up a string and return it.
-    # 
-    # To support building optimisations for other common cases, the 
-    # generation code is separated into several classes 
+    #
+    # To support building optimisations for other common cases, the
+    # generation code is separated into several classes
     module Optimisation
       def generate_optimisation_block(route, kind)
         return "" unless route.optimise?
@@ -20,6 +20,7 @@ module ActionController
 
       class Optimiser
         attr_reader :route, :kind
+
         def initialize(route, kind)
           @route = route
           @kind  = kind
@@ -53,12 +54,12 @@ module ActionController
       #   map.person '/people/:id'
       #
       # If the user calls <tt>person_url(@person)</tt>, we can simply
-      # return a string like "/people/#{@person.to_param}" 
+      # return a string like "/people/#{@person.to_param}"
       # rather than triggering the expensive logic in +url_for+.
       class PositionalArguments < Optimiser
         def guard_condition
           number_of_arguments = route.segment_keys.size
-          # if they're using foo_url(:id=>2) it's one 
+          # if they're using foo_url(:id=>2) it's one
           # argument, but we don't want to generate /foos/id2
           if number_of_arguments == 1
             "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == 1 && !args.first.is_a?(Hash)"
@@ -76,7 +77,7 @@ module ActionController
             elements << '#{request.host_with_port}'
           end
 
-          elements << '#{request.relative_url_root if request.relative_url_root}'
+          elements << '#{ActionController::Base.relative_url_root if ActionController::Base.relative_url_root}'
 
           # The last entry in <tt>route.segments</tt> appears to *always* be a
           # 'divider segment' for '/' but we have assertions to ensure that
@@ -94,14 +95,14 @@ module ActionController
       end
 
       # This case is mostly the same as the positional arguments case
-      # above, but it supports additional query parameters as the last 
+      # above, but it supports additional query parameters as the last
       # argument
       class PositionalArgumentsWithAdditionalParams < PositionalArguments
         def guard_condition
           "(!defined?(default_url_options) || default_url_options.blank?) && defined?(request) && request && args.size == #{route.segment_keys.size + 1} && !args.last.has_key?(:anchor) && !args.last.has_key?(:port) && !args.last.has_key?(:host)"
         end
 
-        # This case uses almost the same code as positional arguments, 
+        # This case uses almost the same code as positional arguments,
         # but add an args.last.to_query on the end
         def generation_code
           super.insert(-2, '?#{args.last.to_query}')
@@ -110,7 +111,7 @@ module ActionController
         # To avoid generating "http://localhost/?host=foo.example.com" we
         # can't use this optimisation on routes without any segments
         def applicable?
-          super && route.segment_keys.size > 0 
+          super && route.segment_keys.size > 0
         end
       end