aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2019-04-09 16:02:50 -0400
committerGitHub <noreply@github.com>2019-04-09 16:02:50 -0400
commit52114b7ae667d39a2ace7ded746b067feb1f732e (patch)
tree1aa51d63960674234f67cd85cbfb42dcd603c880 /actionpack
parentd5f2deb1539927c8793588e7d1e86d84211d4da8 (diff)
parent79c15566da3f267d66cfd6cc8e2257b6aacc0e38 (diff)
downloadrails-52114b7ae667d39a2ace7ded746b067feb1f732e.tar.gz
rails-52114b7ae667d39a2ace7ded746b067feb1f732e.tar.bz2
rails-52114b7ae667d39a2ace7ded746b067feb1f732e.zip
Merge pull request #35913 from baweaver/baweaver/actionpack/named_captures
Adds named_captures to MatchData to emulate Regex
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/journey/path/pattern.rb4
-rw-r--r--actionpack/test/journey/path/pattern_test.rb9
2 files changed, 13 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/journey/path/pattern.rb b/actionpack/lib/action_dispatch/journey/path/pattern.rb
index 697f5b9d8b..a968df5f19 100644
--- a/actionpack/lib/action_dispatch/journey/path/pattern.rb
+++ b/actionpack/lib/action_dispatch/journey/path/pattern.rb
@@ -136,6 +136,10 @@ module ActionDispatch
Array.new(length - 1) { |i| self[i + 1] }
end
+ def named_captures
+ @names.zip(captures).to_h
+ end
+
def [](x)
idx = @offsets[x - 1] + x
@match[idx]
diff --git a/actionpack/test/journey/path/pattern_test.rb b/actionpack/test/journey/path/pattern_test.rb
index fcfaba96b0..2f39abcb92 100644
--- a/actionpack/test/journey/path/pattern_test.rb
+++ b/actionpack/test/journey/path/pattern_test.rb
@@ -280,6 +280,15 @@ module ActionDispatch
assert_equal "list", match[1]
assert_equal "rss", match[2]
end
+
+ def test_named_captures
+ path = Path::Pattern.from_string "/books(/:action(.:format))"
+
+ uri = "/books/list.rss"
+ match = path =~ uri
+ named_captures = { "action" => "list", "format" => "rss" }
+ assert_equal named_captures, match.named_captures
+ end
end
end
end