X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FTypes%2FTypeDecorator.pm;h=943bcd63191ac5cdcafa78a0699c2bd7dd26fb8a;hb=6e73ec86fc0b97ac2130e57e79ebb9028eb0e973;hp=519cad75e1e5cc2de5a2f834191b90c61f23c13e;hpb=e7d06577ac86f8d5aa7f917e0dbcb42fe4a62b3e;p=gitmo%2FMooseX-Types.git

diff --git a/lib/MooseX/Types/TypeDecorator.pm b/lib/MooseX/Types/TypeDecorator.pm
index 519cad7..943bcd6 100644
--- a/lib/MooseX/Types/TypeDecorator.pm
+++ b/lib/MooseX/Types/TypeDecorator.pm
@@ -1,5 +1,7 @@
 package MooseX::Types::TypeDecorator;
 
+#ABSTRACT: Wraps Moose::Meta::TypeConstraint objects with added features
+
 use strict;
 use warnings;
 
@@ -9,16 +11,40 @@ use Moose::Meta::TypeConstraint::Union;
 use Scalar::Util qw(blessed);
 
 use overload(
+    '0+' => sub {
+            my $self = shift @_;
+            my $tc = $self->{__type_constraint};
+            return 0+$tc;
+     },
     '""' => sub {
-        return shift->__type_constraint->name; 
+    		my $self = shift @_;
+    		if(blessed $self) {
+        		return $self->__type_constraint->name;     		
+    		} else {
+    			return "$self";
+    		}
     },
+    bool => sub { 1 },
     '|' => sub {
         
         ## It's kind of ugly that we need to know about Union Types, but this
         ## is needed for syntax compatibility.  Maybe someday we'll all just do
         ## Or[Str,Str,Int]
-        
-        my @tc = grep {blessed $_} @_;
+
+        my @args = @_[0,1]; ## arg 3 is special,  see the overload docs.
+        my @tc = grep {blessed $_} map {
+            blessed $_ ? $_ :
+            Moose::Util::TypeConstraints::find_or_parse_type_constraint($_)
+              || __PACKAGE__->_throw_error( "$_ is not a type constraint")
+        } @args;
+
+        ( scalar @tc == scalar @args)
+            || __PACKAGE__->_throw_error(
+			  "one of your type constraints is bad.  Passed: ". join(', ', @args) ." Got: ". join(', ', @tc));
+
+        ( scalar @tc >= 2 )
+            || __PACKAGE__->_throw_error("You must pass in at least 2 type names to make a union");
+
         my $union = Moose::Meta::TypeConstraint::Union->new(type_constraints=>\@tc);
         return Moose::Util::TypeConstraints::register_type_constraint($union);
     },
@@ -26,11 +52,6 @@ use overload(
     
 );
 
-
-=head1 NAME
-
-MooseX::Types::TypeDecorator - More flexible access to a Type Constraint
-
 =head1 DESCRIPTION
 
 This is a decorator object that contains an underlying type constraint.  We use
@@ -47,7 +68,11 @@ Old school instantiation
 =cut
 
 sub new {
-    my $class = shift @_;
+    my $proto = shift;
+    if (ref($proto)) {
+        return $proto->_try_delegate('new', @_);
+    }
+    my $class = $proto;
     if(my $arg = shift @_) {
         if(blessed $arg && $arg->isa('Moose::Meta::TypeConstraint')) {
             return bless {'__type_constraint'=>$arg}, $class;
@@ -58,31 +83,30 @@ sub new {
             ## stub in case we'll need to handle these types differently
             return bless {'__type_constraint'=>$arg}, $class;
         } elsif(blessed $arg) {
-            croak "Argument must be ->isa('Moose::Meta::TypeConstraint') or ->isa('MooseX::Types::UndefinedType'), not ". blessed $arg;
+            __PACKAGE__->_throw_error("Argument must be ->isa('Moose::Meta::TypeConstraint') or ->isa('MooseX::Types::UndefinedType'), not ". blessed $arg);
         } else {
-            croak "Argument cannot be '$arg'";
+            __PACKAGE__->_throw_error("Argument cannot be '$arg'");
         }
     } else {
-        croak "This method [new] requires a single argument.";        
+        __PACKAGE__->_throw_error("This method [new] requires a single argument.");        
     }
 }
 
-=head __type_constraint ($type_constraint)
+=head2 __type_constraint ($type_constraint)
 
 Set/Get the type_constraint.
 
 =cut
 
 sub __type_constraint {
-    my $self = shift @_;
-    
+    my $self = shift @_;    
     if(blessed $self) {
         if(defined(my $tc = shift @_)) {
             $self->{__type_constraint} = $tc;
         }
         return $self->{__type_constraint};        
     } else {
-        croak 'cannot call __type_constraint as a class method';
+        __PACKAGE__->_throw_error('cannot call __type_constraint as a class method');
     }
 }
 
@@ -93,12 +117,10 @@ handle $self->isa since AUTOLOAD can't.
 =cut
 
 sub isa {
-    my ($self, $target) = @_;  
-    if(defined $target) {
-        return $self->__type_constraint->isa($target);
-    } else {
-        return;
-    }
+  my $self = shift;
+  return
+    $self->__type_constraint->isa(@_)
+    || $self->_try_delegate('isa', @_);
 }
 
 =head2 can
@@ -107,13 +129,19 @@ handle $self->can since AUTOLOAD can't.
 
 =cut
 
-sub can {
-    my ($self, $target) = @_;
-    if(defined $target) {
-        return $self->__type_constraint->can($target);
-    } else {
-        return;
-    }
+sub can { shift->_try_delegate('can', @_) }
+
+=head2 _throw_error
+
+properly delegate error messages
+
+=cut
+
+sub _throw_error {
+    shift;
+    require Moose;
+    unshift @_, 'Moose';
+    goto &Moose::throw_error;
 }
 
 =head2 DESTROY
@@ -128,23 +156,48 @@ sub DESTROY {
 
 =head2 AUTOLOAD
 
-Delegate to the decorator targe
+Delegate to the decorator target.
 
 =cut
 
 sub AUTOLOAD {
     my ($self, @args) = @_;
     my ($method) = (our $AUTOLOAD =~ /([^:]+)$/);
-    if($self->__type_constraint->can($method)) {
-        return $self->__type_constraint->$method(@args);
-    } else {
-        croak "Method '$method' is not supported for ". ref($self->__type_constraint);   
-    }
-}
+    
+    ## We delegate with this method in an attempt to support a value of
+    ## __type_constraint which is also AUTOLOADing, in particular the class
+    ## MooseX::Types::UndefinedType which AUTOLOADs during autovivication.
 
-=head1 AUTHOR AND COPYRIGHT
+    $self->_try_delegate($method, @args);    
+}
 
-John Napiorkowski (jnapiorkowski) <jjnapiork@cpan.org>
+sub _try_delegate {
+    my ($self, $method, @args) = @_;
+    my $tc = $self->__type_constraint;
+    my $class;
+    if ($tc->can('is_subtype_of')) { # Union can't
+        my $search_tc = $tc;
+        while (1) {
+            if ($search_tc->isa('Moose::Meta::TypeConstraint::Class')) {
+                $class = $search_tc->class;
+                last;
+            }
+            $search_tc = $search_tc->parent;
+            last unless $search_tc->is_subtype_of('Object');
+        }
+    }
+        
+    my $inv = (
+        $class
+            ? (
+                $method eq 'new' || $class->can($method)
+                    ? $class
+                    : $tc
+              )
+            : $tc
+    );
+    $inv->$method(@args);
+}
 
 =head1 LICENSE