X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FTypeConstraint%2FClass.pm;h=f4f95592e2da3d7e14c5f11f6e047d8bc7f6fbc6;hb=ae7820b1b884344a7ee90d94b484ca46459eb7b1;hp=a094aae7c994cc8e9149b7742ae5a2aa3b18e9dd;hpb=dabed765f61b9f85c133dfabd885b1d6cd3b1d52;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/TypeConstraint/Class.pm b/lib/Moose/Meta/TypeConstraint/Class.pm index a094aae..f4f9559 100644 --- a/lib/Moose/Meta/TypeConstraint/Class.pm +++ b/lib/Moose/Meta/TypeConstraint/Class.pm @@ -7,26 +7,23 @@ use metaclass; use Scalar::Util 'blessed'; use Moose::Util::TypeConstraints (); -our $VERSION = '0.01'; +our $VERSION = '1.06'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use base 'Moose::Meta::TypeConstraint'; __PACKAGE__->meta->add_attribute('class' => ( - reader => 'class', + reader => 'class', )); sub new { my ( $class, %args ) = @_; - $args{class} = $args{name} unless exists $args{class}; - $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object'); - - my $self = $class->meta->new_object(%args); + my $self = $class->_new(\%args); $self->_create_hand_optimized_type_constraint; - $self->compile_type_constraint(); return $self; @@ -35,7 +32,11 @@ sub new { sub _create_hand_optimized_type_constraint { my $self = shift; my $class = $self->class; - $self->hand_optimized_type_constraint(sub { blessed( $_[0] ) && $_[0]->isa($class) }); + $self->hand_optimized_type_constraint( + sub { + blessed( $_[0] ) && blessed( $_[0] ) ne 'Regexp' && $_[0]->isa($class) + } + ); } sub parents { @@ -48,8 +49,10 @@ sub parents { # if anybody thinks this problematic please discuss on IRC. # a possible fix is to add by attr indexing to the type registry to find types of a certain property # regardless of their name - Moose::Util::TypeConstraints::find_type_constraint($_) || __PACKAGE__->new( name => $_ ) - } $self->class->meta->superclasses, + Moose::Util::TypeConstraints::find_type_constraint($_) + || + __PACKAGE__->new( class => $_, name => "__ANON__" ) + } Class::MOP::class_of($self->class)->superclasses, ); } @@ -58,6 +61,7 @@ sub equals { my $other = Moose::Util::TypeConstraints::find_type_constraint($type_or_name); + return unless defined $other; return unless $other->isa(__PACKAGE__); return $self->class eq $other->class; @@ -74,14 +78,17 @@ sub is_a_type_of { sub is_subtype_of { my ($self, $type_or_name_or_class ) = @_; - if ( not ref $type_or_name_or_class ) { - # it might be a class - return 1 if $self->class->isa( $type_or_name_or_class ); - } - my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_class); - if ( $type->isa(__PACKAGE__) ) { + if ( not defined $type ) { + if ( not ref $type_or_name_or_class ) { + # it might be a class + return 1 if $self->class->isa( $type_or_name_or_class ); + } + return; + } + + if ( $type->isa(__PACKAGE__) && $type->class ne $self->class) { # if $type_or_name_or_class isn't a class, it might be the TC name of another ::Class type # or it could also just be a type object in this branch return $self->class->isa( $type->class ); @@ -91,6 +98,27 @@ sub is_subtype_of { } } +# This is a bit counter-intuitive, but a child type of a Class type +# constraint is not itself a Class type constraint (it has no class +# attribute). This whole create_child_type thing needs some changing +# though, probably making MMC->new a factory or something. +sub create_child_type { + my ($self, @args) = @_; + return Moose::Meta::TypeConstraint->new(@args, parent => $self); +} + +sub get_message { + my $self = shift; + my ($value) = @_; + + if ($self->has_message) { + return $self->SUPER::get_message(@_); + } + + $value = (defined $value ? overload::StrVal($value) : 'undef'); + return "Validation failed for '" . $self->name . "' with value $value (not isa " . $self->class . ")"; +} + 1; __END__ @@ -101,35 +129,68 @@ __END__ Moose::Meta::TypeConstraint::Class - Class/TypeConstraint parallel hierarchy +=head1 DESCRIPTION + +This class represents type constraints for a class. + +=head1 INHERITANCE + +C is a subclass of +L. + =head1 METHODS =over 4 -=item B +=item B<< Moose::Meta::TypeConstraint::Class->new(%options) >> + +This creates a new class type constraint based on the given +C<%options>. + +It takes the same options as its parent, with two exceptions. First, +it requires an additional option, C, which is name of the +constraint's class. Second, it automatically sets the parent to the +C type. + +The constructor also overrides the hand optimized type constraint with +one it creates internally. + +=item B<< $constraint->class >> + +Returns the class name associated with the constraint. + +=item B<< $constraint->parents >> + +Returns all the type's parent types, corresponding to its parent +classes. -=item B +=item B<< $constraint->is_subtype_of($type_name_or_object) >> -=item B +If the given type is also a class type, then this checks that the +type's class is a subclass of the other type's class. -=item B +Otherwise it falls back to the implementation in +L. -=item B +=item B<< $constraint->create_child_type(%options) >> -=item B +This returns a new L object with the type +as its parent. -=item B +Note that it does I return a +C object! -Return all the parent types, corresponding to the parent classes. +=item B<< $constraint->get_message($value) >> -=item B +This is the same as L except +that it explicitly says C was checked. This is to help users deal +with accidentally autovivified type constraints. =back =head1 BUGS -All complex software has bugs lurking in it, and this module is no -exception. If you find a bug please either email me, or add the bug -to cpan-RT. +See L for details on reporting bugs. =head1 AUTHOR @@ -137,7 +198,7 @@ Yuval Kogman Enothingmuch@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L