aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-09-12 16:50:25 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-09-12 16:50:49 -0700
commitf65b2215cd5ab54d3aca2095f51429b7e503431f (patch)
tree3cd24851e75128249d823caaae3773d53f05e60a /actionpack/lib/action_dispatch/routing/mapper.rb
parent68ec26c70c38c388822a7acd8682ac97d0d43b5e (diff)
downloadrails-f65b2215cd5ab54d3aca2095f51429b7e503431f.tar.gz
rails-f65b2215cd5ab54d3aca2095f51429b7e503431f.tar.bz2
rails-f65b2215cd5ab54d3aca2095f51429b7e503431f.zip
removing backwards compatibility module
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index c9fa96facf..cd59b13c42 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -213,8 +213,8 @@ module ActionDispatch
end
def segment_keys
- @segment_keys ||= Rack::Mount::RegexpWithNamedGroups.new(
- Rack::Mount::Strexp.compile(@path, requirements, SEPARATORS)
+ @segment_keys ||= Journey::Path::Pattern.new(
+ Journey::Router::Strexp.compile(@path, requirements, SEPARATORS)
).names
end
@@ -235,7 +235,7 @@ module ActionDispatch
# (:locale) becomes (/:locale) instead of /(:locale). Except
# for root cases, where the latter is the correct one.
def self.normalize_path(path)
- path = Rack::Mount::Utils.normalize_path(path)
+ path = Journey::Router::Utils.normalize_path(path)
path.gsub!(%r{/(\(+)/?}, '\1/') unless path =~ %r{^/\(+[^/]+\)$}
path
end