better error checking, more correct stringification

[gitmo/MooseX-Types.git] / lib / MooseX / Types / TypeDecorator.pm

diff --git a/lib/MooseX/Types/TypeDecorator.pm b/lib/MooseX/Types/TypeDecorator.pm
index 57827b2..3d74d30 100644 (file)
--- a/lib/MooseX/Types/TypeDecorator.pm
+++ b/lib/MooseX/Types/TypeDecorator.pm
@@ -6,18 +6,25 @@ use warnings;
 use Carp::Clan qw( ^MooseX::Types );
 use Moose::Util::TypeConstraints ();
 use Moose::Meta::TypeConstraint::Union;
+use Scalar::Util qw(blessed);
 
 use overload(
     '""' => sub {
-        shift->__type_constraint->name;  
+        return shift->__type_constraint->name; 
     },
     '|' => sub {
-        my @tc = grep {ref $_} @_;
+        
+        ## 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 $union = Moose::Meta::TypeConstraint::Union->new(type_constraints=>\@tc);
         return Moose::Util::TypeConstraints::register_type_constraint($union);
     },
 );
 
+
 =head1 NAME
 
 MooseX::Types::TypeDecorator - More flexible access to a Type Constraint
@@ -40,20 +47,22 @@ Old school instantiation
 sub new {
     my $class = shift @_;
     if(my $arg = shift @_) {
-        if(ref $arg && $arg->isa('Moose::Meta::TypeConstraint')) {
+        if(blessed $arg && $arg->isa('Moose::Meta::TypeConstraint')) {
             return bless {'__type_constraint'=>$arg}, $class;
-        } elsif(ref $arg && $arg->isa('MooseX::Types::UndefinedType')) {
+        } elsif(blessed $arg && $arg->isa('MooseX::Types::UndefinedType')) {
             ## 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;
         } else {
-            croak "Argument must be ->isa('Moose::Meta::TypeConstraint') or ->isa('MooseX::Types::UndefinedType')";
+            croak "Argument cannot be '$arg'";
         }
     } else {
-        croak "This method [new] requires a single argument";        
+        croak "This method [new] requires a single argument of 'arg'.";        
     }
 }
 
-=head type_constraint ($type_constraint)
+=head __type_constraint ($type_constraint)
 
 Set/Get the type_constraint.
 
@@ -61,10 +70,15 @@ Set/Get the type_constraint.
 
 sub __type_constraint {
     my $self = shift @_;
-    if(defined(my $tc = shift @_)) {
-        $self->{__type_constraint} = $tc;
+    
+    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';
     }
-    return $self->{__type_constraint};
 }
 
 =head2 isa
@@ -74,7 +88,7 @@ handle $self->isa since AUTOLOAD can't.
 =cut
 
 sub isa {
-    my ($self, $target) = @_;
+    my ($self, $target) = @_;  
     if(defined $target) {
         return $self->__type_constraint->isa($target);
     } else {