use Test::More qw(no_plan);
-use Web::Simple::DispatchParser;
+use Web::Dispatch::Parser;
-my $dp = Web::Simple::DispatchParser->new;
+my $dp = Web::Dispatch::Parser->new;
{
- my $get = $dp->parse_dispatch_specification('GET');
+ my $get = $dp->parse('GET');
is_deeply(
[ $get->({ REQUEST_METHOD => 'GET' }) ],
);
}
-ok(
- !eval { $dp->parse_dispatch_specification('GET POST'); 1; },
- "Don't yet allow two methods"
-);
-
{
- my $html = $dp->parse_dispatch_specification('.html');
+ my $html = $dp->parse('.html');
is_deeply(
[ $html->({ PATH_INFO => '/foo/bar.html' }) ],
- [ { PATH_INFO => '/foo/bar' } ],
+ [ { } ],
'.html matches'
);
}
{
- my $any_ext = $dp->parse_dispatch_specification('.*');
+ my $any_ext = $dp->parse('.*');
is_deeply(
[ $any_ext->({ PATH_INFO => '/foo/bar.html' }) ],
- [ { PATH_INFO => '/foo/bar' }, 'html' ],
+ [ { }, 'html' ],
'.html matches .* and extension returned'
);
}
{
- my $slash = $dp->parse_dispatch_specification('/');
+ my $slash = $dp->parse('/');
is_deeply(
[ $slash->({ PATH_INFO => '/' }) ],
}
{
- my $post = $dp->parse_dispatch_specification('/post/*');
+ my $post = $dp->parse('/post/*');
is_deeply(
[ $post->({ PATH_INFO => '/post/one' }) ],
[],
'/post/one/ does not match'
);
+
+ is_deeply(
+ [ $post->({ PATH_INFO => '/post/one.html' }) ],
+ [ {}, 'one' ],
+ '/post/one.html still parses out one'
+ );
+}
+
+{
+ my $post = $dp->parse('/foo-bar/*');
+
+ is_deeply(
+ [ $post->({ PATH_INFO => '/foo-bar/one' }) ],
+ [ {}, 'one' ],
+ '/foo-bar/one parses out one'
+ );
+
+ is_deeply(
+ [ $post->({ PATH_INFO => '/foo-bar/one/' }) ],
+ [],
+ '/foo-bar/one/ does not match'
+ );
}
{
- my $combi = $dp->parse_dispatch_specification('GET+/post/*');
+ my $combi = $dp->parse('GET+/post/*');
is_deeply(
[ $combi->({ PATH_INFO => '/post/one', REQUEST_METHOD => 'GET' }) ],
}
{
- my $or = $dp->parse_dispatch_specification('GET|POST');
+ my $or = $dp->parse('GET|POST');
foreach my $meth (qw(GET POST)) {
}
{
- my $or = $dp->parse_dispatch_specification('GET|POST|DELETE');
+ my $or = $dp->parse('GET|POST|DELETE');
foreach my $meth (qw(GET POST DELETE)) {
}
{
- my $nest = $dp->parse_dispatch_specification('(GET+/foo)|POST');
+ my $nest = $dp->parse('(GET+/foo)|POST');
is_deeply(
[ $nest->({ PATH_INFO => '/foo', REQUEST_METHOD => 'GET' }) ],
{
local $@;
ok(
- !eval { $dp->parse_dispatch_specification('/foo+(GET'); 1 },
+ !eval { $dp->parse('/foo+(GET'); 1 },
'Death with missing closing )'
);
my $err = q{
}
{
- my $not = $dp->parse_dispatch_specification('!.html+.*');
+ my $not = $dp->parse('!.html+.*');
is_deeply(
[ $not->({ PATH_INFO => '/foo.xml' }) ],
- [ { PATH_INFO => '/foo' }, 'xml' ],
+ [ {}, 'xml' ],
'!.html+.* matches /foo.xml'
);
}
{
- my $sub = $dp->parse_dispatch_specification('/foo/*/...');
+ my $sub = $dp->parse('/foo/*/...');
is_deeply(
[ $sub->({ PATH_INFO => '/foo/1/bar' }) ],
- [ { PATH_INFO => '/bar' }, 1 ],
+ [ { PATH_INFO => '/bar', SCRIPT_NAME => '/foo/1' }, 1 ],
'/foo/*/... matches /foo/1/bar and strips to /bar'
);
is_deeply(
[ $sub->({ PATH_INFO => '/foo/1/' }) ],
- [ { PATH_INFO => '/' }, 1 ],
+ [ { PATH_INFO => '/', SCRIPT_NAME => '/foo/1' }, 1 ],
'/foo/*/... matches /foo/1/bar and strips to /'
);
);
}
+{
+ my @dot_pairs = (
+ [ '/one/*' => 'two' ],
+ [ '/one/*.*' => 'two.three' ],
+ [ '/**' => 'one/two' ],
+ [ '/**.*' => 'one/two.three' ],
+ );
+
+ foreach my $p (@dot_pairs) {
+ is_deeply(
+ [ $dp->parse($p->[0])->({ PATH_INFO => '/one/two.three' }) ],
+ [ {}, $p->[1] ],
+ "${\$p->[0]} matches /one/two.three and returns ${\$p->[1]}"
+ );
+ }
+}
+
#
# query string
#
);
foreach my $lose ('?foo=','?:foo=','?@foo=','?:@foo=') {
- my $foo = $dp->parse_dispatch_specification($lose);
+ my $foo = $dp->parse($lose);
is_deeply(
[ $foo->({ QUERY_STRING => '' }) ],
[ '?:baz=&:evil=' => { baz => 'one two', evil => '/' } ],
[ '?*' => \%all_single ],
[ '?@*' => \%all_multi ],
- [ '?foo=&@*' => 'FOO', do { my %h = %all_multi; delete $h{foo}; \%h } ],
+ [ '?foo=&@*' => 'FOO', \%all_multi ],
[ '?:foo=&@*' => { %all_multi, foo => 'FOO' } ],
[ '?:@bar=&*' => { %all_single, bar => [ qw(BAR1 BAR2) ] } ],
) {
my ($spec, @res) = @$win;
- my $match = $dp->parse_dispatch_specification($spec);
+ my $match = $dp->parse($spec);
#use Data::Dump::Streamer; warn Dump($match);
is_deeply(
[ $match->({ QUERY_STRING => $q }) ],
#
foreach my $lose2 ('/foo/bar/+?foo=','/foo/bar/+?:foo=','/foo/bar/+?@foo=','/foo/bar/+?:@foo=') {
- my $foo = $dp->parse_dispatch_specification($lose2);
+ my $foo = $dp->parse($lose2);
is_deeply(
[ $foo->({ PATH_INFO => '/foo/bar/', QUERY_STRING => '' }) ],
[ '/foo/bar/+?:baz=&:evil=' => { baz => 'one two', evil => '/' } ],
[ '/foo/bar/+?*' => \%all_single ],
[ '/foo/bar/+?@*' => \%all_multi ],
- [ '/foo/bar/+?foo=&@*' => 'FOO', do { my %h = %all_multi; delete $h{foo}; \%h } ],
+ [ '/foo/bar/+?foo=&@*' => 'FOO', \%all_multi ],
[ '/foo/bar/+?:foo=&@*' => { %all_multi, foo => 'FOO' } ],
[ '/foo/bar/+?:@bar=&*' => { %all_single, bar => [ qw(BAR1 BAR2) ] } ],
) {
my ($spec, @res) = @$win2;
- my $match = $dp->parse_dispatch_specification($spec);
+ my $match = $dp->parse($spec);
# use Data::Dump::Streamer; warn Dump($match);
is_deeply(
[ $match->({ PATH_INFO => '/foo/bar/', QUERY_STRING => $q }) ],
#
foreach my $lose3 ('/foo/bar+?foo=','/foo/bar+?:foo=','/foo/bar+?@foo=','/foo/bar+?:@foo=') {
- my $foo = $dp->parse_dispatch_specification($lose3);
+ my $foo = $dp->parse($lose3);
is_deeply(
[ $foo->({ PATH_INFO => '/foo/bar', QUERY_STRING => '' }) ],
[ '/foo/bar+?:baz=&:evil=' => { baz => 'one two', evil => '/' } ],
[ '/foo/bar+?*' => \%all_single ],
[ '/foo/bar+?@*' => \%all_multi ],
- [ '/foo/bar+?foo=&@*' => 'FOO', do { my %h = %all_multi; delete $h{foo}; \%h } ],
+ [ '/foo/bar+?foo=&@*' => 'FOO', \%all_multi ],
[ '/foo/bar+?:foo=&@*' => { %all_multi, foo => 'FOO' } ],
[ '/foo/bar+?:@bar=&*' => { %all_single, bar => [ qw(BAR1 BAR2) ] } ],
) {
my ($spec, @res) = @$win3;
- my $match = $dp->parse_dispatch_specification($spec);
+ my $match = $dp->parse($spec);
# use Data::Dump::Streamer; warn Dump($match);
is_deeply(
[ $match->({ PATH_INFO => '/foo/bar', QUERY_STRING => $q }) ],