1 files changed, 29 insertions, 22 deletions

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index d80faf7423..c1134d16ad 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -109,6 +109,7 @@ module ActionDispatch
           @default_action     = default_action
           @ast                = ast
           @anchor             = anchor
+          @via                = via
 
           path_params = ast.find_all(&:symbol?).map(&:to_sym)
 
@@ -140,9 +141,19 @@ module ActionDispatch
           @defaults = formats[:defaults].merge(@defaults).merge(normalize_defaults(options))
 
           @required_defaults = (split_options[:required_defaults] || []).map(&:first)
-          unless via == [:all]
-            @conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
-          end
+        end
+
+        def make_route(name, precedence)
+          route = Journey::Route.new(name,
+                            application,
+                            path,
+                            conditions,
+                            required_defaults,
+                            defaults,
+                            request_method)
+
+          route.precedence = precedence
+          route
         end
 
         def application
@@ -160,36 +171,32 @@ module ActionDispatch
         def build_conditions(current_conditions, request_class)
           conditions = current_conditions.dup
 
-          # Rack-Mount requires that :request_method be a regular expression.
-          # :request_method represents the HTTP verb that matches this route.
-          #
-          # Here we munge values before they get sent on to rack-mount.
-          verbs = conditions[:request_method] || []
-          unless verbs.empty?
-            conditions[:request_method] = %r[^#{verbs.join('|')}$]
-          end
-
           conditions.keep_if do |k, _|
             request_class.public_method_defined?(k)
           end
         end
         private :build_conditions
 
-        def build_path(ast, requirements, anchor)
-          pattern = Journey::Path::Pattern.new(ast, requirements, SEPARATORS, anchor)
+        def request_method
+          @via.map { |x| Journey::Route.verb_matcher(x) }
+        end
+        private :request_method
 
-          builder = Journey::GTG::Builder.new ast
+        JOINED_SEPARATORS = SEPARATORS.join # :nodoc:
+
+        def build_path(ast, requirements, anchor)
+          pattern = Journey::Path::Pattern.new(ast, requirements, JOINED_SEPARATORS, anchor)
 
           # Get all the symbol nodes followed by literals that are not the
           # dummy node.
-          symbols = ast.grep(Journey::Nodes::Symbol).find_all { |n|
-            builder.followpos(n).first.literal?
-          }
+          symbols = ast.find_all { |n|
+            n.cat? && n.left.symbol? && n.right.cat? && n.right.left.literal?
+          }.map(&:left)
 
           # Get all the symbol nodes preceded by literals.
-          symbols.concat ast.find_all(&:literal?).map { |n|
-            builder.followpos(n).first
-          }.find_all(&:symbol?)
+          symbols.concat ast.find_all { |n|
+            n.cat? && n.left.literal? && n.right.cat? && n.right.left.symbol?
+          }.map { |n| n.right.left }
 
           symbols.each { |x|
             x.regexp = /(?:#{Regexp.union(x.regexp, '-')})+/
@@ -628,7 +635,7 @@ module ActionDispatch
 
         # Query if the following named route was already defined.
         def has_named_route?(name)
-          @set.named_routes.routes[name.to_sym]
+          @set.named_routes.key? name
         end
 
         private