X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fdispatch_parser.t;h=b42bb61dbde91c08b34184af351f7fa133407e38;hb=cb12d2a32b35b292b35a9146d55a11f86db87954;hp=f147468e44b4983b87047e7898db7dae8096ee84;hpb=6c0f599aa455ebf62c0581ef7ff8e9be5af5924e;p=catagits%2FWeb-Simple.git

diff --git a/t/dispatch_parser.t b/t/dispatch_parser.t
index f147468..b42bb61 100644
--- a/t/dispatch_parser.t
+++ b/t/dispatch_parser.t
@@ -3,12 +3,12 @@ use warnings FATAL => 'all';
 
 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' }) ],
@@ -23,17 +23,12 @@ my $dp = Web::Simple::DispatchParser->new;
    );
 }
 
-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'
    );
 
@@ -45,11 +40,11 @@ ok(
 }
 
 {
-   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'
    );
 
@@ -61,7 +56,7 @@ ok(
 }
 
 {
-   my $slash = $dp->parse_dispatch_specification('/');
+   my $slash = $dp->parse('/');
 
    is_deeply(
      [ $slash->({ PATH_INFO => '/' }) ],
@@ -77,7 +72,7 @@ ok(
 }
 
 {
-   my $post = $dp->parse_dispatch_specification('/post/*');
+   my $post = $dp->parse('/post/*');
 
    is_deeply(
      [ $post->({ PATH_INFO => '/post/one' }) ],
@@ -90,10 +85,32 @@ ok(
      [],
      '/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' }) ],
@@ -115,7 +132,7 @@ ok(
 }
 
 {
-   my $or = $dp->parse_dispatch_specification('GET|POST');
+   my $or = $dp->parse('GET|POST');
 
    foreach my $meth (qw(GET POST)) {
 
@@ -134,7 +151,7 @@ ok(
 }
 
 {
-   my $or = $dp->parse_dispatch_specification('GET|POST|DELETE');
+   my $or = $dp->parse('GET|POST|DELETE');
 
    foreach my $meth (qw(GET POST DELETE)) {
 
@@ -153,7 +170,7 @@ ok(
 }
 
 {
-   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' }) ],
@@ -183,7 +200,7 @@ ok(
 {
   local $@;
   ok(
-    !eval { $dp->parse_dispatch_specification('/foo+(GET'); 1 },
+    !eval { $dp->parse('/foo+(GET'); 1 },
     'Death with missing closing )'
   );
   my $err = q{
@@ -199,11 +216,11 @@ ok(
 }
 
 {
-   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'
    );
 
@@ -221,17 +238,17 @@ ok(
 }
 
 {
-   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 /'
    );
 
@@ -242,6 +259,23 @@ ok(
    );
 }
 
+{
+  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
 #
@@ -266,7 +300,7 @@ my %all_multi = (
 );
 
 foreach my $lose ('?foo=','?:foo=','?@foo=','?:@foo=') {
-    my $foo = $dp->parse_dispatch_specification($lose);
+    my $foo = $dp->parse($lose);
 
     is_deeply(
         [ $foo->({ QUERY_STRING => '' }) ],
@@ -298,12 +332,12 @@ foreach my $win (
     [ '?: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 }) ],
@@ -317,7 +351,7 @@ foreach my $win (
 #
 
 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 => '' }) ],
@@ -349,12 +383,12 @@ foreach my $win2 (
     [ '/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 }) ],
@@ -368,7 +402,7 @@ foreach my $win2 (
 #
 
 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 => '' }) ],
@@ -400,12 +434,12 @@ foreach my $win3 (
     [ '/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 }) ],