X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FTypes%2FTypeDecorator.pm;h=febb46a6469119e1cae7114725db5482d32640d8;hb=989b05700d2f7f091f29a395c9d8789d429ab74a;hp=6f028138af5491db08ebeae1ab69c6a93898800b;hpb=d7d0bd99611df609fb566d2aa772e002ce0747c3;p=gitmo%2FMooseX-Types.git diff --git a/lib/MooseX/Types/TypeDecorator.pm b/lib/MooseX/Types/TypeDecorator.pm index 6f02813..febb46a 100644 --- a/lib/MooseX/Types/TypeDecorator.pm +++ b/lib/MooseX/Types/TypeDecorator.pm @@ -112,13 +112,16 @@ sub __type_constraint { =head2 isa -handle $self->isa since AUTOLOAD can't. +handle $self->isa since AUTOLOAD can't - this tries both the type constraint, +and for a class type, the class. =cut sub isa { - return 1 if $_[1]->isa('Moose::Meta::TypeConstraint'); - shift->_try_delegate('isa', @_) + my $self = shift; + return + $self->__type_constraint->isa(@_) + || $self->_try_delegate('isa', @_); } =head2 can @@ -154,7 +157,9 @@ sub DESTROY { =head2 AUTOLOAD -Delegate to the decorator target. +Delegate to the decorator target, unless this is a class type, in which +case it will call the class' version of the method if present, and fall +back to the type's version if not. =cut @@ -185,15 +190,8 @@ sub _try_delegate { } } - my $inv = ( - $class - ? ( - $method eq 'new' || $class->can($method) - ? $class - : $tc - ) - : $tc - ); + my $inv = ($class && $class->can($method)) ? $class : $tc; + $inv->$method(@args); }