2 files changed, 20 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 716e2d2271..1a1a054985 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1306,14 +1306,14 @@ module ActionDispatch
         end
 
         def draw(name)
-          path = @draw_paths.find do |path|
-            path.join("#{name}.rb").file?
+          path = @draw_paths.find do |_path|
+            _path.join("#{name}.rb").file?
           end
 
           unless path
             msg  = "Your router tried to #draw the external file #{name}.rb,\n" \
                    "but the file was not found in:\n\n"
-            msg += @draw_paths.map { |path| " * #{path}" }.join("\n")
+            msg += @draw_paths.map { |_path| " * #{_path}" }.join("\n")
             raise msg
           end
 
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index ae01781013..444a79c50d 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -1,4 +1,6 @@
 require 'action_dispatch/http/request'
+require 'active_support/core_ext/uri'
+require 'rack/utils'
 
 module ActionDispatch
   module Routing
@@ -46,8 +48,17 @@ module ActionDispatch
           :params   => request.query_parameters
         }.merge options
 
+        if !params.empty? && url_options[:path].match(/%\{\w*\}/)
+          url_options[:path] = (url_options[:path] % escape_path(params))
+        end
+
         ActionDispatch::Http::URL.url_for url_options
       end
+
+      private
+        def escape_path(params)
+          Hash[params.map{ |k,v| [k, URI.parser.escape(v)] }]
+        end
     end
 
     module Redirection
@@ -96,13 +107,18 @@ module ActionDispatch
         path = args.shift
 
         block = lambda { |params, request|
-          (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params)
+          (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % escape(params))
         } if String === path
 
         block = path if path.respond_to? :call
         raise ArgumentError, "redirection argument not supported" unless block
         Redirect.new status, block
       end
+
+      private
+        def escape(params)
+          Hash[params.map{ |k,v| [k, Rack::Utils.escape(v)] }]
+        end
     end
   end
 end