X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Farg_constraints.t;h=5ef97e53ed916118423f32a7e3c6b7d559ffa1dd;hp=a1cd3fd8b5bae223253812fea7989d52e88be2d7;hb=50b07d604b372d9487863120b9df9c813bbe7334;hpb=aef0cb5dc1b5dbadba8f6345587ea2012011108f

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index a1cd3fd..5ef97e5 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -1,13 +1,16 @@
 use warnings;
 use strict;
 use HTTP::Request::Common;
+use utf8;
 
 BEGIN {
   use Test::More;
-  eval "use Types::Standard; use Type::Utils; use Type::Library; 1;" || do {
-    plan skip_all => "Trouble loading Types::Standard => $@";
+  eval "use Type::Tiny 1.000005; 1" || do {
+    plan skip_all => "Trouble loading Type::Tiny and friends => $@";
   };
+}
 
+BEGIN {
   package MyApp::Types;
   $INC{'MyApp/Types.pm'} = __FILE__;
 
@@ -18,7 +21,7 @@ BEGIN {
   use Types::Standard -types;
   use Type::Library
    -base,
-   -declare => qw( UserId User ContextLike );
+   -declare => qw( UserId Heart User ContextLike );
 
   extends "Types::Standard"; 
 
@@ -29,6 +32,10 @@ BEGIN {
    as Int,
    where { $_ < 5 };
 
+  declare Heart,
+   as Str,
+   where { $_ eq '♥' };
+
   # Tests using this are skipped pending deeper thought
   coerce User,
    from ContextLike,
@@ -36,6 +43,23 @@ BEGIN {
 }
 
 {
+  package MyApp::Role::Controller;
+  $INC{'MyApp/Role/Controller.pm'} = __FILE__;
+
+  use Moose::Role;
+  use MooseX::MethodAttributes::Role;
+  use MyApp::Types qw/Int Str/;
+
+  sub role_str :Path('role_test') Args(Str) {
+    my ($self, $c, $arg) = @_;
+    $c->res->body('role_str'.$arg);
+  }
+
+  sub role_int :Path('role_test') Args(Int) {
+    my ($self, $c, $arg) = @_;
+    $c->res->body('role_int'.$arg);
+  }
+
   package MyApp::Model::User;
   $INC{'MyApp/Model/User.pm'} = __FILE__;
 
@@ -59,9 +83,12 @@ BEGIN {
 
   use Moose;
   use MooseX::MethodAttributes;
-  use MyApp::Types qw/Tuple Int Str StrMatch ArrayRef UserId User/;
+  use Types::Standard qw/slurpy/;
+  use MyApp::Types qw/Tuple Int Str StrMatch ArrayRef UserId User Heart/;
 
   extends 'Catalyst::Controller';
+  with 'MyApp::Role::Controller';
+
 
   sub user :Local Args(UserId) {
     my ($self, $c, $int) = @_;
@@ -75,6 +102,11 @@ BEGIN {
     $c->res->body("name: $user->{name}, age: $user->{age}");
   }
 
+  sub stringy_enum :Local Args('Int',Int) {
+    my ($self, $c) = @_;
+    $c->res->body('enum');
+  }
+
   sub an_int :Local Args(Int) {
     my ($self, $c, $int) = @_;
     $c->res->body('an_int');
@@ -86,7 +118,7 @@ BEGIN {
   }
 
   sub many_ints :Local Args(ArrayRef[Int]) {
-    my ($self, $c, $int) = @_;
+    my ($self, $c, @ints) = @_;
     $c->res->body('many_ints');
   }
 
@@ -95,6 +127,11 @@ BEGIN {
     $c->res->body('tuple');
   }
 
+  sub slurpy_tuple :Local Args(Tuple[Str,Int, slurpy ArrayRef[Int]]) {
+    my ($self, $c, $str, $int) = @_;
+    $c->res->body('tuple');
+  }
+
   sub match :Local Args(StrMatch[qr{\d\d-\d\d-\d\d}]) {
     my ($self, $c, $int) = @_;
     $c->res->body('match');
@@ -141,13 +178,19 @@ BEGIN {
 
   sub chain_base2 :Chained(/) CaptureArgs(1) { }
 
-    sub chained_zero_post2 :POST Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero_post2') }
+    sub chained_zero_again : Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero_again') }
+    sub chained_zero_post2 : Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero_post2') }
     sub chained_zero2      :     Chained(chain_base2) PathPart('') Args(0) { $_[1]->res->body('chained_zero2') }
 
-    sub chained_zero_post3 :POST Chained(chain_base2) PathPart('') Args(1) { $_[1]->res->body('chained_zero_post3') }
+    sub chained_zero_post3 : Chained(chain_base2) PathPart('') Args(1) { $_[1]->res->body('chained_zero_post3') }
     sub chained_zero3      :     Chained(chain_base2) PathPart('') Args(1) { $_[1]->res->body('chained_zero3') }
 
 
+  sub heart :Local Args(Heart) { }
+
+  sub utf8_base :Chained(/) CaptureArgs(Heart) { }
+    sub utf8_end :Chained(utf8_base) PathPart('') Args(Heart) { }
+
   sub default :Default {
     my ($self, $c, $int) = @_;
     $c->res->body('default');
@@ -155,6 +198,48 @@ BEGIN {
 
   MyApp::Controller::Root->config(namespace=>'');
 
+  package MyApp::Controller::Autoclean;
+  $INC{'MyApp/Controller/Autoclean.pm'} = __FILE__;
+
+  use Moose;
+  use MooseX::MethodAttributes;
+  use namespace::autoclean;
+
+  use MyApp::Types qw/Int/;
+
+  extends 'Catalyst::Controller';
+
+  sub an_int :Local Args(Int) {
+    my ($self, $c, $int) = @_;
+    $c->res->body('an_int (autoclean)');
+  }
+
+  MyApp::Controller::Autoclean->config(namespace=>'autoclean');
+
+  package MyApp::Role;
+  $INC{'MyApp/Role.pm'} = __FILE__;
+
+  use Moose::Role;
+  use MooseX::MethodAttributes::Role;
+  use MyApp::Types qw/Int/;
+
+  sub an_int :Local Args(Int) {
+    my ($self, $c, $int) = @_;
+    $c->res->body('an_int (withrole)');
+  }
+
+  package MyApp::Controller::WithRole;
+  $INC{'MyApp/Controller/WithRole.pm'} = __FILE__;
+
+  use Moose;
+  use MooseX::MethodAttributes;
+
+  extends 'Catalyst::Controller';
+
+  with 'MyApp::Role';
+
+  MyApp::Controller::WithRole->config(namespace=>'withrole');
+
   package MyApp;
   use Catalyst;
 
@@ -282,6 +367,17 @@ SKIP: {
 }
 
 {
+  my $res = request '/tuple/aaa/111/111/111';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/slurpy_tuple/aaa/111/111/111';
+  is $res->content, 'tuple';
+}
+
+
+{
   my $res = request '/many_ints/1/2/a';
   is $res->content, 'default';
 }
@@ -321,43 +417,60 @@ SKIP: {
   is $res->content, 'finally2';
 }
 
-=over
-
-| /chain_base/*                                               | /chain_base (1)                                             |
-|                                                             | => /chained_zero (0)                                        |
-| /chain_base/*                                               | /chain_base (1)                                             |
-|                                                             | => POST /chained_zero_post (0)                              
-
-=cut
 
 {
     my $res = request PUT '/chain_base2/capture/1';
-    is $res->content, 'chained_zero3';
+    is $res->content, 'chained_zero3', "request PUT '/chain_base2/capture/1'";
 }
 
 {
     my $res = request '/chain_base2/capture/1';
-    is $res->content, 'chained_zero3';
+    is $res->content, 'chained_zero3', "request '/chain_base2/capture/1'";
 }
 
 {
     my $res = request POST '/chain_base2/capture/1';
-    is $res->content, 'chained_zero3';
+    is $res->content, 'chained_zero3', "request POST '/chain_base2/capture/1'";
 }
 
 {
     my $res = request PUT '/chain_base2/capture';
-    is $res->content, 'chained_zero2';
+    is $res->content, 'chained_zero2', "request PUT '/chain_base2/capture'";
 }
 
 {
     my $res = request '/chain_base2/capture';
-    is $res->content, 'chained_zero2';
+    is $res->content, 'chained_zero2', "request '/chain_base2/capture'";
 }
 
 {
     my $res = request POST '/chain_base2/capture';
-    is $res->content, 'chained_zero2';
+    is $res->content, 'chained_zero2', "request POST '/chain_base2/capture'";
+}
+
+{
+    my $res = request '/stringy_enum/1/2';
+    is $res->content, 'enum', "request '/stringy_enum/a'";
+}
+
+{
+    my $res = request '/stringy_enum/b/2';
+    is $res->content, 'default', "request '/stringy_enum/a'";
+}
+
+{
+    my $res = request '/stringy_enum/1/a';
+    is $res->content, 'default', "request '/stringy_enum/a'";
+}
+
+{
+  my $res = request '/autoclean/an_int/1';
+  is $res->content, 'an_int (autoclean)';
+}
+
+{
+  my $res = request '/withrole/an_int/1';
+  is $res->content, 'an_int (withrole)';
 }
 
 =over
@@ -369,17 +482,82 @@ SKIP: {
 
 =cut
 
-
-done_testing;
-
-__END__
 {
   # URI testing
   my ($res, $c) = ctx_request '/';
-  ok my $url1 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5],6);
-  warn $url1;
 
-  ok my $url2 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]);
-  warn $url2;
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('user'), 2) };
+    is $url, 'http://localhost/user/2';
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('user'), [2]) };
+    is $url, 'http://localhost/user/2';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('user'), [20]) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,4],6) };
+    is $url, 'http://localhost/chain_base/1/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,4,6]) };
+    is $url, 'http://localhost/chain_base/1/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a',2,3,4,4,6]) };
+    is $url, 'http://localhost/chain_base/a/2/3/4/4/6';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a','1',3,4,4,'a']) };
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('finally'), ['a','a',3,4,4,'6']) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('heart'), ['♥']) };
+    is $url, 'http://localhost/heart/%E2%99%A5';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('heart'), ['1']) };
+  }
+
+  {
+    ok my $url = eval { $c->uri_for($c->controller('Root')->action_for('utf8_end'), ['♥','♥']) };
+    is $url, 'http://localhost/utf8_base/%E2%99%A5/%E2%99%A5';
+  }
+
+  {
+    ok my $url = ! eval { $c->uri_for($c->controller('Root')->action_for('utf8_end'), ['2','1']) };
+  }
+
 }
 
+# Test Roles
+
+{
+    my $res = request '/role_test/1';
+    is $res->content, 'role_int1';
+}
+
+{
+    my $res = request '/role_test/a';
+    is $res->content, 'role_stra';
+}
+
+
+done_testing;