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=bbc312f07a31f14f7149595ccac2c8b8fcf1d442;hb=50b07d604b372d9487863120b9df9c813bbe7334;hpb=d91504e32dc14e87f6650b1835f1287cac40fe7e

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index bbc312f..5ef97e5 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -1,23 +1,245 @@
 use warnings;
 use strict;
-use Test::More;
 use HTTP::Request::Common;
+use utf8;
+
+BEGIN {
+  use Test::More;
+  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__;
+
+  use strict;
+  use warnings;
+ 
+  use Type::Utils -all;
+  use Types::Standard -types;
+  use Type::Library
+   -base,
+   -declare => qw( UserId Heart User ContextLike );
+
+  extends "Types::Standard"; 
+
+  class_type User, { class => "MyApp::Model::User::user" };
+  duck_type ContextLike, [qw/model/];
+
+  declare UserId,
+   as Int,
+   where { $_ < 5 };
+
+  declare Heart,
+   as Str,
+   where { $_ eq '♥' };
+
+  # Tests using this are skipped pending deeper thought
+  coerce User,
+   from ContextLike,
+     via { $_->model('User')->find( $_->req->args->[0] ) };
+}
 
 {
+  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__;
+
+  use base 'Catalyst::Model';
+
+  our %users = (
+    1 => { name => 'john', age => 46 },
+    2 => { name => 'mary', age => 36 },
+    3 => { name => 'ian', age => 25 },
+    4 => { name => 'visha', age => 18 },
+  );
+
+  sub find {
+    my ($self, $id) = @_;
+    my $user = $users{$id} || return;
+    return bless $user, "MyApp::Model::User::user";
+  }
+
   package MyApp::Controller::Root;
   $INC{'MyApp/Controller/Root.pm'} = __FILE__;
 
   use Moose;
   use MooseX::MethodAttributes;
+  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) = @_;
+    my $user = $c->model("User")->find($int);
+    $c->res->body("name: $user->{name}, age: $user->{age}");
+  }
+
+  # Tests using this are current skipped pending coercion rethink
+  sub user_object :Local Args(User) Coerce(1) {
+    my ($self, $c, $user) = @_;
+    $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');
+  }
+
+  sub two_ints :Local Args(Int,Int) {
+    my ($self, $c, $int) = @_;
+    $c->res->body('two_ints');
+  }
 
-  sub check :Local {
-    pop->res->from_psgi_response([200, ['Content-Type'=>'text/plain'],['check']]);
+  sub many_ints :Local Args(ArrayRef[Int]) {
+    my ($self, $c, @ints) = @_;
+    $c->res->body('many_ints');
+  }
+
+  sub tuple :Local Args(Tuple[Str,Int]) {
+    my ($self, $c, $str, $int) = @_;
+    $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');
+  }
+
+  sub any_priority :Path('priority_test') Args(1) { $_[1]->res->body('any_priority') }
+
+  sub int_priority :Path('priority_test') Args(Int) { $_[1]->res->body('int_priority') }
+
+  sub chain_base :Chained(/) CaptureArgs(1) { }
+
+    sub any_priority_chain :GET Chained(chain_base) PathPart('') Args(1) { $_[1]->res->body('any_priority_chain') }
+
+    sub int_priority_chain :Chained(chain_base) PathPart('') Args(Int) { $_[1]->res->body('int_priority_chain') }
+
+    sub link_any :Chained(chain_base) PathPart('') CaptureArgs(1) { }
+
+      sub any_priority_link_any :Chained(link_any) PathPart('') Args(1) { $_[1]->res->body('any_priority_link_any') }
+
+      sub int_priority_link_any :Chained(link_any) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link_any') }
+    
+    sub link_int :Chained(chain_base) PathPart('') CaptureArgs(Int) { }
+
+      sub any_priority_link :Chained(link_int) PathPart('') Args(1) { $_[1]->res->body('any_priority_link') }
+
+      sub int_priority_link :Chained(link_int) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link') }
+
+    sub link_int_int :Chained(chain_base) PathPart('') CaptureArgs(Int,Int) { }
+
+      sub any_priority_link2 :Chained(link_int_int) PathPart('') Args(1) { $_[1]->res->body('any_priority_link2') }
+
+      sub int_priority_link2 :Chained(link_int_int) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link2') }
+
+    sub link_tuple :Chained(chain_base) PathPart('') CaptureArgs(Tuple[Int,Int,Int]) { }
+
+      sub any_priority_link3 :Chained(link_tuple) PathPart('') Args(1) { $_[1]->res->body('any_priority_link3') }
+
+      sub int_priority_link3 :Chained(link_tuple) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link3') }
+
+      sub link2_int :Chained(link_tuple) PathPart('') CaptureArgs(UserId) { }
+
+        sub finally2 :GET Chained(link2_int) PathPart('') Args { $_[1]->res->body('finally2') }
+        sub finally :GET Chained(link2_int) PathPart('') Args(Int) { $_[1]->res->body('finally') }
+
+  sub chain_base2 :Chained(/) CaptureArgs(1) { }
+
+    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 : 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');
   }
 
   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;
 
@@ -27,10 +249,315 @@ use HTTP::Request::Common;
 use Catalyst::Test 'MyApp';
 
 {
-  my $res = request '/check';
-  is $res->code, 200, 'OK';
-  is $res->content, 'check', 'correct body';
-  is $res->content_length, 5, 'correct length';
+  my $res = request '/an_int/1';
+  is $res->content, 'an_int';
+}
+
+{
+  my $res = request '/an_int/aa';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/many_ints/1';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/many_ints/1/2';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/many_ints/1/2/3';
+  is $res->content, 'many_ints';
+}
+
+{
+  my $res = request '/priority_test/1';
+  is $res->content, 'int_priority';
+}
+
+{
+  my $res = request '/priority_test/a';
+  is $res->content, 'any_priority';
+}
+
+{
+  my $res = request '/match/11-22-33';
+  is $res->content, 'match';
+}
+
+{
+  my $res = request '/match/aaa';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/user/2';
+  is $res->content, 'name: mary, age: 36';
 }
 
+{
+  my $res = request '/user/20';
+  is $res->content, 'default';
+}
+
+
+SKIP: {
+  skip "coercion support needs more thought", 1;
+  my $res = request '/user_object/20';
+  is $res->content, 'default';
+}
+
+SKIP: {
+  skip "coercion support needs more thought", 1;
+  my $res = request '/user_object/2';
+  is $res->content, 'name: mary, age: 36';
+}
+
+{
+  my $res = request '/chain_base/capture/arg';
+  is $res->content, 'any_priority_chain';
+}
+
+{
+  my $res = request '/chain_base/cap1/100/arg';
+  is $res->content, 'any_priority_link';
+}
+
+{
+  my $res = request '/chain_base/cap1/101/102';
+  is $res->content, 'int_priority_link';
+}
+
+{
+  my $res = request '/chain_base/capture/100';
+  is $res->content, 'int_priority_chain', 'got expected';
+}
+
+{
+  my $res = request '/chain_base/cap1/a/arg';
+  is $res->content, 'any_priority_link_any';
+}
+
+{
+  my $res = request '/chain_base/cap1/a/102';
+  is $res->content, 'int_priority_link_any';
+}
+
+{
+  my $res = request '/two_ints/1/2';
+  is $res->content, 'two_ints';
+}
+
+{
+  my $res = request '/two_ints/aa/111';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/tuple/aaa/aaa';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/tuple/aaa/111';
+  is $res->content, 'tuple';
+}
+
+{
+  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';
+}
+
+{
+  my $res = request '/chain_base/100/100/100/100';
+  is $res->content, 'int_priority_link2';
+}
+
+{
+  my $res = request '/chain_base/100/ss/100/100';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/chain_base/100/100/100/100/100';
+  is $res->content, 'int_priority_link3';
+}
+
+{
+  my $res = request '/chain_base/100/ss/100/100/100';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/6';
+  is $res->content, 'finally';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/a';
+  is $res->content, 'finally2';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/6/7/8/9';
+  is $res->content, 'finally2';
+}
+
+
+{
+    my $res = request PUT '/chain_base2/capture/1';
+    is $res->content, 'chained_zero3', "request PUT '/chain_base2/capture/1'";
+}
+
+{
+    my $res = request '/chain_base2/capture/1';
+    is $res->content, 'chained_zero3', "request '/chain_base2/capture/1'";
+}
+
+{
+    my $res = request POST '/chain_base2/capture/1';
+    is $res->content, 'chained_zero3', "request POST '/chain_base2/capture/1'";
+}
+
+{
+    my $res = request PUT '/chain_base2/capture';
+    is $res->content, 'chained_zero2', "request PUT '/chain_base2/capture'";
+}
+
+{
+    my $res = request '/chain_base2/capture';
+    is $res->content, 'chained_zero2', "request '/chain_base2/capture'";
+}
+
+{
+    my $res = request POST '/chain_base2/capture';
+    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
+
+| /chain_base/*/*/*/*/*/*                 | /chain_base (1)
+|                                         | -> /link_tuple (Tuple[Int,Int,Int])
+|                                         | -> /link2_int (UserId)
+|                                         | => GET /finally (Int)
+
+=cut
+
+{
+  # URI testing
+  my ($res, $c) = ctx_request '/';
+
+  {
+    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;