* Makefile.PL and Moose.pm
- explicitly require Perl 5.8.0+ (Dave Rolsky)
+ * Moose::Util::TypeConstraints
+ - Fix warnings from find_type_constraint if the type is not
+ found (t0m).
+
+ * Moose::Meta::TypeConstraint
+ - predicate methods (equals/is_a_type_of/is_subtype_of) now
+ return false if the type you specify cannot be found in the
+ type registry, rather than throwing an unhelpful and coincidental
+ exception. The behavior is now in line with to
+ $ob->isa('DoesNotExist') (t0m).
+ - added docs & test for this (t0m)
+
+ * Moose::Meta::TypeConstraint::Registry
+ - add_type_constraint now throws an exception if a parameter is
+ not supplied (t0m).
+ - added docs & test for this (t0m)
+
0.55_01 Wed August 20, 2008
!! Calling Moose::init_meta as a function is now !!
if ($self->should_coerce);
$type_constraint->check($value)
|| confess "Attribute (" . $self->name
- . "') does not pass the type constraint because: "
+ . ") does not pass the type constraint because: "
. $type_constraint->get_message($value);
}
$self->set_initial_value($instance, $value);
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 1 if refaddr($self) == refaddr($other);
sub is_a_type_of {
my ($self, $type_or_name) = @_;
- my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+ my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name) or return;
($self->equals($type) || $self->is_subtype_of($type));
}
sub is_subtype_of {
my ($self, $type_or_name) = @_;
- my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name);
+ my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name) or return;
my $current = $self;
=item B<equals ($type_name_or_object)>
+This checks the current type against the supplied type (only).
+Returns false either if the type name or object supplied
+does not match, or if a type name isn't found in the type registry.
+
=item B<is_a_type_of ($type_name_or_object)>
-This checks the current type name, and if it does not match,
-checks if it is a subtype of it.
+This checks the current type against the supplied type, or if the
+current type is a sub-type of the type name or object supplied.
+Returns false if the current type is not descended from the supplied
+type, of if the supplied type isn't found in the type registry.
=item B<is_subtype_of ($type_name_or_object)>
+This checks the current type is a sub-type of the type name or object supplied.
+Returns false if the current type is not descended from the supplied
+type, of if the supplied type isn't found in the type registry.
+
=item B<compile_type_constraint>
=item B<coerce ($value)>
=item B<name>
+The name of the type in the global type registry.
+
=item B<parent>
+The parent type of this type.
+
=item B<has_parent>
+If this type has a parent type.
+
=item B<parents>
=item B<constraint>
sub get_type_constraint {
my ($self, $type_name) = @_;
+ return unless defined $type_name;
$self->type_constraints->{$type_name}
}
sub add_type_constraint {
my ($self, $type) = @_;
+ confess("No type supplied / type is not a valid type constraint")
+ unless ($type && blessed $type && $type->isa('Moose::Meta::TypeConstraint'));
$self->type_constraints->{$type->name} = $type;
}
=item B<get_type_constraint ($type_name)>
+Returns a type constraint object from the registry by name. Will return
+false if the supplied type name cannot be found.
+
=item B<add_type_constraint ($type)>
+Adds a type constraint object to the registry. Will throw an exception if
+no type is supplied, or the supplied object does not inherit from
+L<Moose::Meta::TypeConstraint>
+
=item B<find_type_constraint ($type_name)>
=back
if ( blessed $type and $type->isa("Moose::Meta::TypeConstraint") ) {
return $type;
- } else {
+ }
+ else {
+ return unless $REGISTRY->has_type_constraint($type);
return $REGISTRY->get_type_constraint($type);
}
}
HashRef[CodeRef] # a hash of str to CODE ref mappings
Maybe[Str] # value may be a string, may be undefined
+B<NOTE:> Unless you parameterize a type, then it is invalid to
+include the square brackets. I.e. C<ArrayRef[]> will be
+literally interpreted as a type name.
+
B<NOTE:> The C<Undef> type constraint for the most part works
correctly now, but edge cases may still exist, please use it
sparringly.
=item B<where>
-This is just sugar for the type constraint construction syntax.
+This is just sugar for the type constraint construction syntax.
+
+Takes a block/code ref as an argument. When the type constraint is tested,
+the supplied code is run with the value to be tested in $_. Returning
+a true value indicates that the type constraint passes, a false value
+indicates that it failed.
=item B<message>
This is just sugar for the type constraint construction syntax.
+Takes a block/code ref as an argument. When the type constraint fails,
+then the code block is run (with the value again in $_), and the value
+returned is the text of the exception which is thrown.
+
=item B<optimize_as>
This can be used to define a "hand optimized" version of your
use strict;
use warnings;
-use Test::More tests => 38;
+use Test::More tests => 44;
use Test::Exception;
use Scalar::Util ();
lives_ok { Moose::Meta::Attribute->new('bob', isa => 'Spong') }
'meta-attr construction ok even when type constraint utils loaded first';
+
+# Test type constraint predicate return values.
+
+foreach my $predicate (qw/equals is_subtype_of is_a_type_of/) {
+ ok( !defined $string->$predicate('DoesNotExist'), "$predicate predicate returns undef for non existant constraint");
+}
+
+# Test adding things which don't look like types to the registry throws an exception
+
+my $r = Moose::Util::TypeConstraints->get_type_constraint_registry;
+throws_ok {$r->add_type_constraint()} qr/not a valid type constraint/, '->add_type_constraint(undef) throws';
+throws_ok {$r->add_type_constraint('foo')} qr/not a valid type constraint/, '->add_type_constraint("foo") throws';
+throws_ok {$r->add_type_constraint(bless {}, 'SomeClass')} qr/not a valid type constraint/, '->add_type_constraint(SomeClass->new) throws';
+
projects / gitmo/Moose.git / commitdiff