fix for bug and prep for cpan
[gitmo/MooseX-Types-Structured.git] / lib / MooseX / Meta / TypeConstraint / Structured.pm
index b58c92e..a770be0 100644 (file)
@@ -1,14 +1,13 @@
 package ## Hide from PAUSE
  MooseX::Meta::TypeConstraint::Structured;
+# ABSTRACT: MooseX::Meta::TypeConstraint::Structured - Structured type constraints.
 
 use Moose;
+use Devel::PartialDump;
 use Moose::Util::TypeConstraints ();
 use MooseX::Meta::TypeCoercion::Structured;
 extends 'Moose::Meta::TypeConstraint';
 
-=head1 NAME
-
-MooseX::Meta::TypeConstraint::Structured - Structured type constraints.
 
 =head1 DESCRIPTION
 
@@ -18,15 +17,11 @@ idea here is that a Type Constraint could be something like, "An Int followed by
 an Int and then a Str" and that this could be done so with a declaration like:
 
     Tuple[Int,Int,Str]; ## Example syntax
-    
+
 So a structure is a list of Type constraints (the "Int,Int,Str" in the above
 example) which are intended to function together.
 
-=head1 ATTRIBUTES
-
-This class defines the following attributes.
-
-=head2 type_constraints
+=attr type_constraints
 
 A list of L<Moose::Meta::TypeConstraint> objects.
 
@@ -38,7 +33,7 @@ has 'type_constraints' => (
     predicate=>'has_type_constraints',
 );
 
-=head2 constraint_generator
+=attr constraint_generator
 
 A subref or closure that contains the way we validate incoming values against
 a set of type constraints.
@@ -51,26 +46,61 @@ has 'constraint_generator' => (
     predicate=>'has_constraint_generator',
 );
 
-=head1 METHODS
+has coercion => (
+    is      => 'ro',
+    isa     => 'Object',
+    builder => '_build_coercion',
+);
 
-This class defines the following methods.
+sub _build_coercion {
+    my ($self) = @_;
+    return MooseX::Meta::TypeCoercion::Structured->new(
+        type_constraint => $self,
+    );
+}
 
-=head2 new
+=method validate
 
-Initialization stuff.
+Messing with validate so that we can support niced error messages.
 
 =cut
 
-around 'new' => sub {
-    my ($new, $class, @args)  = @_;
-    my $self = $class->$new(@args);
-    $self->coercion(MooseX::Meta::TypeCoercion::Structured->new(
-        type_constraint => $self,
-    ));
-    return $self;
+sub _clean_message {
+    my $message = shift @_;
+    $message =~s/MooseX::Types::Structured:://g;
+    return $message;
+}
+
+override 'validate' => sub {
+    my ($self, $value, $message_stack) = @_;
+    unless ($message_stack) {
+        $message_stack = MooseX::Types::Structured::MessageStack->new();
+    }
+
+    $message_stack->inc_level;
+
+    if ($self->_compiled_type_constraint->($value, $message_stack)) {
+        ## Everything is good, no error message to return
+        return undef;
+    } else {
+        ## Whoops, need to figure out the right error message
+        my $args = Devel::PartialDump::dump($value);
+        $message_stack->dec_level;
+        if($message_stack->has_messages) {
+            if($message_stack->level) {
+                ## we are inside a deeply structured constraint
+                return $self->get_message($args);
+            } else {
+                my $message_str = $message_stack->as_string;
+                return _clean_message($self->get_message("$args, Internal Validation Error is: $message_str"));
+            }
+        } else {
+            return $self->get_message($args);
+        }
+    }
 };
 
-=head2 generate_constraint_for ($type_constraints)
+=method generate_constraint_for ($type_constraints)
 
 Given some type constraints, use them to generate validation rules for an ref
 of values (to be passed at check time)
@@ -79,21 +109,16 @@ of values (to be passed at check time)
 
 sub generate_constraint_for {
     my ($self, $type_constraints) = @_;
-    return sub {
-        my (@args) = @_;
-        my $constraint_generator = $self->constraint_generator;
-        return $constraint_generator->($type_constraints, @args);
-    };
+    return $self->constraint_generator->($self, $type_constraints);
 }
 
-=head2 parameterize (@type_constraints)
+=method parameterize (@type_constraints)
 
 Given a ref of type constraints, create a structured type.
 
 =cut
 
 sub parameterize {
-    
     my ($self, @type_constraints) = @_;
     my $class = ref $self;
     my $name = $self->name .'['. join(',', map {"$_"} @type_constraints) .']';
@@ -107,7 +132,7 @@ sub parameterize {
     );
 }
 
-=head2 __infer_constraint_generator
+=method __infer_constraint_generator
 
 This returns a CODEREF which generates a suitable constraint generator.  Not
 user servicable, you'll never call this directly.
@@ -123,12 +148,12 @@ sub __infer_constraint_generator {
             ## I'm not sure about this stuff but everything seems to work
             my $tc = shift @_;
             my $merged_tc = [@$tc, @{$self->parent->type_constraints}];
-            $self->constraint->($merged_tc, @_);            
+            $self->constraint->($merged_tc, @_);
         };
-    }    
+    }
 }
 
-=head2 compile_type_constraint
+=method compile_type_constraint
 
 hook into compile_type_constraint so we can set the correct validation rules.
 
@@ -136,17 +161,17 @@ hook into compile_type_constraint so we can set the correct validation rules.
 
 around 'compile_type_constraint' => sub {
     my ($compile_type_constraint, $self, @args) = @_;
-    
+
     if($self->has_type_constraints) {
         my $type_constraints = $self->type_constraints;
         my $constraint = $self->generate_constraint_for($type_constraints);
-        $self->_set_constraint($constraint);        
+        $self->_set_constraint($constraint);
     }
 
     return $self->$compile_type_constraint(@args);
 };
 
-=head2 create_child_type
+=method create_child_type
 
 modifier to make sure we get the constraint_generator
 
@@ -160,11 +185,11 @@ around 'create_child_type' => sub {
     );
 };
 
-=head2 is_a_type_of
+=method is_a_type_of
 
-=head2 is_subtype_of
+=method is_subtype_of
 
-=head2 equals
+=method equals
 
 Override the base class behavior.
 
@@ -172,66 +197,153 @@ Override the base class behavior.
 
 sub equals {
     my ( $self, $type_or_name ) = @_;
-    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name)
+      or return;
 
     return unless $other->isa(__PACKAGE__);
-    
+
     return (
-        $self->type_constraints_equals($other)
+        $self->parent->equals($other->parent)
             and
-        $self->parent->equals( $other->parent )
+        $self->type_constraints_equals($other)
     );
 }
 
-=head2 type_constraints_equals
+sub is_a_type_of {
+    my ( $self, $type_or_name ) = @_;
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name)
+      or return;
+
+    if ( $other->isa(__PACKAGE__) and @{ $other->type_constraints || [] }) {
+        if ( $self->parent->is_a_type_of($other->parent) ) {
+            return $self->_type_constraints_op_all($other, "is_a_type_of");
+        } elsif ( $self->parent->is_a_type_of($other) ) {
+            return 1;
+            # FIXME compare?
+        } else {
+            return 0;
+        }
+    } else {
+        return $self->SUPER::is_a_type_of($other);
+    }
+}
 
-Checks to see if the internal type contraints are equal.
+sub is_subtype_of {
+    my ( $self, $type_or_name ) = @_;
+    my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name)
+      or return;
+    if ( $other->isa(__PACKAGE__) ) {
+        if ( $other->type_constraints and $self->type_constraints ) {
+            if ( $self->parent->is_a_type_of($other->parent) ) {
+                return (
+                    $self->_type_constraints_op_all($other, "is_a_type_of")
+                      and
+                    $self->_type_constraints_op_any($other, "is_subtype_of")
+                );
+            } elsif ( $self->parent->is_a_type_of($other) ) {
+                return 1;
+                # FIXME compare?
+            } else {
+                return 0;
+            }
+        } else {
+            if ( $self->type_constraints ) {
+                if ( $self->SUPER::is_subtype_of($other) ) {
+                    return 1;
+                } else {
+                    return;
+                }
+            } else {
+                return $self->parent->is_subtype_of($other->parent);
+            }
+        }
+    } else {
+        return $self->SUPER::is_subtype_of($other);
+    }
+}
+
+=method type_constraints_equals
+
+Checks to see if the internal type constraints are equal.
 
 =cut
 
 sub type_constraints_equals {
-    my ($self, $other) = @_;
+    my ( $self, $other ) = @_;
+    $self->_type_constraints_op_all($other, "equals");
+}
+
+sub _type_constraints_op_all {
+    my ($self, $other, $op) = @_;
+
+    return unless $other->isa(__PACKAGE__);
+
     my @self_type_constraints = @{$self->type_constraints||[]};
     my @other_type_constraints = @{$other->type_constraints||[]};
-    
+
+    return unless @self_type_constraints == @other_type_constraints;
+
     ## Incoming ay be either arrayref or hashref, need top compare both
     while(@self_type_constraints) {
         my $self_type_constraint = shift @self_type_constraints;
-        my $other_type_constraint = shift @other_type_constraints
-         || return; ## $other needs the same number of children.
-        
-        if( ref $self_type_constraint) {
-            $self_type_constraint->equals($other_type_constraint)
-             || return; ## type constraints obviously need top be equal
-        } else {
-            $self_type_constraint eq $other_type_constraint
-             || return; ## strings should be equal
-        }
+        my $other_type_constraint = shift @other_type_constraints;
+
+        $_ = Moose::Util::TypeConstraints::find_or_create_isa_type_constraint($_)
+          for $self_type_constraint, $other_type_constraint;
 
+        my $result = $self_type_constraint->$op($other_type_constraint);
+        return unless $result;
     }
-    
+
     return 1; ##If we get this far, everything is good.
 }
 
-=head2 get_message
+sub _type_constraints_op_any {
+    my ($self, $other, $op) = @_;
 
-May want to override this to set a more useful error message
+    return unless $other->isa(__PACKAGE__);
 
-=head1 SEE ALSO
+    my @self_type_constraints = @{$self->type_constraints||[]};
+    my @other_type_constraints = @{$other->type_constraints||[]};
 
-The following modules or resources may be of interest.
+    return unless @self_type_constraints == @other_type_constraints;
 
-L<Moose>, L<Moose::Meta::TypeConstraint>
+    ## Incoming ay be either arrayref or hashref, need top compare both
+    while(@self_type_constraints) {
+        my $self_type_constraint = shift @self_type_constraints;
+        my $other_type_constraint = shift @other_type_constraints;
 
-=head1 AUTHOR
+        $_ = Moose::Util::TypeConstraints::find_or_create_isa_type_constraint($_)
+          for $self_type_constraint, $other_type_constraint;
 
-John Napiorkowski, C<< <jjnapiork@cpan.org> >>
+        return 1 if $self_type_constraint->$op($other_type_constraint);
+    }
 
-=head1 COPYRIGHT & LICENSE
+    return 0;
+}
+
+=method get_message
 
-This program is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+Give you a better peek into what's causing the error.  For now we stringify the
+incoming deep value with L<Devel::PartialDump> and pass that on to either your
+custom error message or the default one.  In the future we'll try to provide a
+more complete stack trace of the actual offending elements
+
+=cut
+
+around 'get_message' => sub {
+    my ($get_message, $self, $value) = @_;
+    $value = Devel::PartialDump::dump($value)
+     if ref $value;
+    return $self->$get_message($value);
+};
+
+=head1 SEE ALSO
+
+The following modules or resources may be of interest.
+
+L<Moose>, L<Moose::Meta::TypeConstraint>
 
 =cut
 
-1;
\ No newline at end of file
+__PACKAGE__->meta->make_immutable(inline_constructor => 0);