X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FTypes%2FTypeDecorator.pm;h=3eba05dc4c377373a198483a240b40665a5b3537;hb=5a1fdc82b77fa6c2b8491b540d1625cbf63b596e;hp=12c7f4803b3bacd785f2913b07d38b3d41203974;hpb=442e42ba3e90b69452a0c8c2a78cd55d2304262a;p=gitmo%2FMooseX-Types.git

diff --git a/lib/MooseX/Types/TypeDecorator.pm b/lib/MooseX/Types/TypeDecorator.pm
index 12c7f48..3eba05d 100644
--- a/lib/MooseX/Types/TypeDecorator.pm
+++ b/lib/MooseX/Types/TypeDecorator.pm
@@ -1,15 +1,21 @@
 package MooseX::Types::TypeDecorator;
 
+#ABSTRACT: Wraps Moose::Meta::TypeConstraint objects with added features
+
 use strict;
 use warnings;
 
-
 use Carp::Clan qw( ^MooseX::Types );
 use Moose::Util::TypeConstraints ();
 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 {
     		my $self = shift @_;
     		if(blessed $self) {
@@ -18,16 +24,26 @@ use overload(
     			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 = map {
-	    blessed $_ ? $_ :
-	      Moose::Util::TypeConstraints::find_or_parse_type_constraint($_)
-	} @_;
+        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);
@@ -36,10 +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
@@ -67,12 +79,12 @@ 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.");        
     }
 }
 
@@ -90,7 +102,7 @@ sub __type_constraint {
         }
         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');
     }
 }
 
@@ -113,6 +125,7 @@ sub isa {
     }
 }
 
+
 =head2 can
 
 handle $self->can since AUTOLOAD can't.
@@ -145,6 +158,18 @@ sub meta {
 	} 
 }
 
+=head2 _throw_error
+
+properly delegate error messages
+
+=cut
+
+sub _throw_error {
+    shift;
+    require Moose;
+    unshift @_, 'Moose';
+    goto &Moose::throw_error;
+}
 
 =head2 DESTROY
 
@@ -158,7 +183,7 @@ sub DESTROY {
 
 =head2 AUTOLOAD
 
-Delegate to the decorator targe
+Delegate to the decorator target.
 
 =cut
 
@@ -172,20 +197,15 @@ sub AUTOLOAD {
     ## MooseX::Types::UndefinedType which AUTOLOADs during autovivication.
     
     my $return;
-    
     eval {
         $return = $self->__type_constraint->$method(@args);
     }; if($@) {
-        croak $@;
+        __PACKAGE__->_throw_error($@);
     } else {
         return $return;
     }
 }
 
-=head1 AUTHOR AND COPYRIGHT
-
-John Napiorkowski (jnapiorkowski) <jjnapiork@cpan.org>
-
 =head1 LICENSE
 
 This program is free software; you can redistribute it and/or modify