1 files changed, 33 insertions, 61 deletions

diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 36561c71a1..21817b374c 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -20,60 +20,32 @@ module ActionDispatch
       # :nodoc:
       VERSION = '2.0.0'
 
-      class NullReq # :nodoc:
-        attr_reader :env
-        def initialize(env)
-          @env = env
-        end
-
-        def request_method
-          env['REQUEST_METHOD']
-        end
-
-        def path_info
-          env['PATH_INFO']
-        end
-
-        def ip
-          env['REMOTE_ADDR']
-        end
-
-        def [](k)
-          env[k]
-        end
-      end
-
-      attr_reader :request_class, :formatter
       attr_accessor :routes
 
-      def initialize(routes, options)
-        @options       = options
-        @params_key    = options[:parameters_key]
-        @request_class = options[:request_class] || NullReq
-        @routes        = routes
+      def initialize(routes)
+        @routes = routes
       end
 
-      def call(env)
-        env['PATH_INFO'] = Utils.normalize_path(env['PATH_INFO'])
-
-        find_routes(env).each do |match, parameters, route|
-          script_name, path_info, set_params = env.values_at('SCRIPT_NAME',
-                                                             'PATH_INFO',
-                                                             @params_key)
+      def serve(req)
+        find_routes(req).each do |match, parameters, route|
+          set_params  = req.path_parameters
+          path_info   = req.path_info
+          script_name = req.script_name
 
           unless route.path.anchored
-            env['SCRIPT_NAME'] = (script_name.to_s + match.to_s).chomp('/')
-            env['PATH_INFO']   = match.post_match
+            req.script_name = (script_name.to_s + match.to_s).chomp('/')
+            req.path_info = match.post_match
+            req.path_info = "/" + req.path_info unless req.path_info.start_with? "/"
           end
 
-          env[@params_key] = (set_params || {}).merge parameters
+          req.path_parameters = set_params.merge parameters
 
-          status, headers, body = route.app.call(env)
+          status, headers, body = route.app.serve(req)
 
           if 'pass' == headers['X-Cascade']
-            env['SCRIPT_NAME'] = script_name
-            env['PATH_INFO']   = path_info
-            env[@params_key]   = set_params
+            req.script_name     = script_name
+            req.path_info       = path_info
+            req.path_parameters = set_params
             next
           end
 
@@ -83,14 +55,14 @@ module ActionDispatch
         return [404, {'X-Cascade' => 'pass'}, ['Not Found']]
       end
 
-      def recognize(req)
-        find_routes(req.env).each do |match, parameters, route|
+      def recognize(rails_req)
+        find_routes(rails_req).each do |match, parameters, route|
           unless route.path.anchored
-            req.env['SCRIPT_NAME'] = match.to_s
-            req.env['PATH_INFO']   = match.post_match.sub(/^([^\/])/, '/\1')
+            rails_req.script_name = match.to_s
+            rails_req.path_info   = match.post_match.sub(/^([^\/])/, '/\1')
           end
 
-          yield(route, nil, parameters)
+          yield(route, parameters)
         end
       end
 
@@ -124,29 +96,31 @@ module ActionDispatch
           simulator.memos(path) { [] }
         end
 
-        def find_routes env
-          req = request_class.new(env)
-
+        def find_routes req
           routes = filter_routes(req.path_info).concat custom_routes.find_all { |r|
             r.path.match(req.path_info)
           }
-          routes.concat get_routes_as_head(routes)
 
-          routes.sort_by!(&:precedence).select! { |r| r.matches?(req) }
+          if req.env["REQUEST_METHOD"] === "HEAD"
+            routes.concat get_routes_as_head(routes)
+          end
+
+          routes.select! { |r| r.matches?(req) }
+          routes.sort_by!(&:precedence)
 
           routes.map! { |r|
             match_data  = r.path.match(req.path_info)
-            match_names = match_data.names.map { |n| n.to_sym }
-            match_values = match_data.captures.map { |v| v && Utils.unescape_uri(v) }
-            info = Hash[match_names.zip(match_values).find_all { |_, y| y }]
-
-            [match_data, r.defaults.merge(info), r]
+            path_parameters = r.defaults.dup
+            match_data.names.zip(match_data.captures) { |name,val|
+              path_parameters[name.to_sym] = Utils.unescape_uri(val) if val
+            }
+            [match_data, path_parameters, r]
           }
         end
 
         def get_routes_as_head(routes)
           precedence = (routes.map(&:precedence).max || 0) + 1
-          routes = routes.select { |r|
+          routes.select { |r|
             r.verb === "GET" && !(r.verb === "HEAD")
           }.map! { |r|
             Route.new(r.name,
@@ -157,8 +131,6 @@ module ActionDispatch
                         route.precedence = r.precedence + precedence
                       end
           }
-          routes.flatten!
-          routes
         end
     end
   end