From 0d690d75fbb088e967556ea186140ec96b320c42 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Sat, 29 Nov 2014 01:26:10 +0100 Subject: make OR in journey patterns compile to a valid regular expression --- actionpack/lib/action_dispatch/journey/path/pattern.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionpack/lib/action_dispatch/journey/path/pattern.rb') diff --git a/actionpack/lib/action_dispatch/journey/path/pattern.rb b/actionpack/lib/action_dispatch/journey/path/pattern.rb index 3af940a02f..0d82008d8e 100644 --- a/actionpack/lib/action_dispatch/journey/path/pattern.rb +++ b/actionpack/lib/action_dispatch/journey/path/pattern.rb @@ -122,6 +122,11 @@ module ActionDispatch re = @matchers[node.left.to_sym] || '.+' "(#{re})" end + + def visit_OR(node) + children = node.children.map { |n| visit n } + "(?:#{children.join(?|)})" + end end class UnanchoredRegexp < AnchoredRegexp # :nodoc: -- cgit v1.2.3