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

diff --git a/lib/MooseX/Types/TypeDecorator.pm b/lib/MooseX/Types/TypeDecorator.pm
index b73ccf3..519cad7 100644
--- a/lib/MooseX/Types/TypeDecorator.pm
+++ b/lib/MooseX/Types/TypeDecorator.pm
@@ -3,19 +3,30 @@ package MooseX::Types::TypeDecorator;
 use strict;
 use warnings;
 
-use Moose::Util::TypeConstraints;
+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 @names = grep {$_} map {"$_"} @_;
-        ## Don't know why I can't use the array version of this...
-        my $names = join('|', @names);
-        Moose::Util::TypeConstraints::create_type_constraint_union($names);
+        
+        ## 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);
     },
+    fallback => 1,
+    
 );
 
+
 =head1 NAME
 
 MooseX::Types::TypeDecorator - More flexible access to a Type Constraint
@@ -36,22 +47,73 @@ Old school instantiation
 =cut
 
 sub new {
-    my ($class, %args) = @_;
-    return bless \%args, $class;
+    my $class = shift @_;
+    if(my $arg = shift @_) {
+        if(blessed $arg && $arg->isa('Moose::Meta::TypeConstraint')) {
+            return bless {'__type_constraint'=>$arg}, $class;
+        } 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 cannot be '$arg'";
+        }
+    } else {
+        croak "This method [new] requires a single argument.";        
+    }
 }
 
-=head type_constraint ($type_constraint)
+=head __type_constraint ($type_constraint)
 
-Set/Get the type_constraint
+Set/Get the type_constraint.
 
 =cut
 
-sub type_constraint {
+sub __type_constraint {
     my $self = shift @_;
-    if(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';
+    }
+}
+
+=head2 isa
+
+handle $self->isa since AUTOLOAD can't.
+
+=cut
+
+sub isa {
+    my ($self, $target) = @_;  
+    if(defined $target) {
+        return $self->__type_constraint->isa($target);
+    } else {
+        return;
+    }
+}
+
+=head2 can
+
+handle $self->can since AUTOLOAD can't.
+
+=cut
+
+sub can {
+    my ($self, $target) = @_;
+    if(defined $target) {
+        return $self->__type_constraint->can($target);
+    } else {
+        return;
     }
-    return $self->{type_constraint};
 }
 
 =head2 DESTROY
@@ -70,10 +132,14 @@ Delegate to the decorator targe
 
 =cut
 
-sub AUTOLOAD
-{
+sub AUTOLOAD {
+    my ($self, @args) = @_;
     my ($method) = (our $AUTOLOAD =~ /([^:]+)$/);
-    return shift->type_constraint->$method(@_);
+    if($self->__type_constraint->can($method)) {
+        return $self->__type_constraint->$method(@args);
+    } else {
+        croak "Method '$method' is not supported for ". ref($self->__type_constraint);   
+    }
 }
 
 =head1 AUTHOR AND COPYRIGHT