From eabe504cdfa11b580c614d6bd501eb7cc60f485d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 May 2014 15:16:40 -0700
Subject: ask the strexp for the ast

---
 actionpack/lib/action_dispatch/journey/path/pattern.rb  | 5 ++---
 actionpack/lib/action_dispatch/journey/router/strexp.rb | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'actionpack/lib/action_dispatch/journey')

diff --git a/actionpack/lib/action_dispatch/journey/path/pattern.rb b/actionpack/lib/action_dispatch/journey/path/pattern.rb
index cb0a02c298..da9d54cf6a 100644
--- a/actionpack/lib/action_dispatch/journey/path/pattern.rb
+++ b/actionpack/lib/action_dispatch/journey/path/pattern.rb
@@ -5,17 +5,16 @@ module ActionDispatch
         attr_reader :spec, :requirements, :anchored
 
         def initialize(strexp)
-          parser = Journey::Parser.new
-
           @anchored = true
 
           case strexp
           when String
+            parser        = Journey::Parser.new
             @spec         = parser.parse(strexp)
             @requirements = {}
             @separators   = "/.?"
           when Router::Strexp
-            @spec         = parser.parse(strexp.path)
+            @spec         = strexp.ast
             @requirements = strexp.requirements
             @separators   = strexp.separators.join
             @anchored     = strexp.anchor
diff --git a/actionpack/lib/action_dispatch/journey/router/strexp.rb b/actionpack/lib/action_dispatch/journey/router/strexp.rb
index f97f1a223e..161b41d6b2 100644
--- a/actionpack/lib/action_dispatch/journey/router/strexp.rb
+++ b/actionpack/lib/action_dispatch/journey/router/strexp.rb
@@ -15,6 +15,11 @@ module ActionDispatch
           @anchor       = anchor
         end
 
+        def ast
+          parser = Journey::Parser.new
+          parser.parse path
+        end
+
         def names
           @path.scan(/:\w+/).map { |s| s.tr(':', '') }
         end
-- 
cgit v1.2.3