X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=6a231ca3e50044834a6ca77f78a7423405f0f655;hb=fce211ae5c3943a1b041b9c0985c4daf189fb8a8;hp=0312a563e348c104abd72dbb7b342262a6120cd9;hpb=b5bc67d9637279a43d742b979c4dcff58570506b;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm index 0312a56..6a231ca 100644 --- a/lib/Mouse/Meta/Attribute.pm +++ b/lib/Mouse/Meta/Attribute.pm @@ -1,7 +1,6 @@ package Mouse::Meta::Attribute; use strict; use warnings; -require overload; use Carp 'confess'; use Scalar::Util (); @@ -160,7 +159,7 @@ sub _generate_accessor{ }'; my $sub = eval $accessor; - Carp::confess($@) if $@; + $attribute->throw_error($@) if $@; return $sub; } @@ -172,7 +171,7 @@ sub _generate_predicate { my $predicate = 'sub { exists($_[0]->{'.$key.'}) }'; my $sub = eval $predicate; - confess $@ if $@; + $attribute->throw_error($@) if $@; return $sub; } @@ -183,7 +182,7 @@ sub _generate_clearer { my $clearer = 'sub { delete($_[0]->{'.$key.'}) }'; my $sub = eval $clearer; - confess $@ if $@; + $attribute->throw_error($@) if $@; return $sub; } @@ -203,7 +202,7 @@ sub _generate_handles { }'; $method_map{$local_method} = eval $method; - confess $@ if $@; + $attribute->throw_error($@) if $@; } return \%method_map; @@ -222,13 +221,6 @@ sub create { if exists $args{coerce}; if (exists $args{isa}) { - confess "Got isa => $args{isa}, but Mouse does not yet support parameterized types for containers other than ArrayRef and HashRef (rt.cpan.org #39795)" - if $args{isa} =~ /^([^\[]+)\[.+\]$/ && - $1 ne 'ArrayRef' && - $1 ne 'HashRef' && - $1 ne 'Maybe' - ; - my $type_constraint = delete $args{isa}; $args{type_constraint}= Mouse::Util::TypeConstraints::find_or_create_isa_type_constraint($type_constraint); } @@ -239,10 +231,15 @@ sub create { $class->add_attribute($attribute); + my $associated_methods = 0; + + my $is_metadata = $attribute->_is_metadata || ''; + # install an accessor - if ($attribute->_is_metadata eq 'rw' || $attribute->_is_metadata eq 'ro') { + if ($is_metadata eq 'rw' || $is_metadata eq 'ro') { my $code = $attribute->_generate_accessor(); $class->add_method($name => $code); + $associated_methods++; } for my $method (qw/predicate clearer/) { @@ -251,6 +248,7 @@ sub create { my $generator = "_generate_$method"; my $coderef = $attribute->$generator; $class->add_method($attribute->$method => $coderef); + $associated_methods++; } } @@ -258,9 +256,15 @@ sub create { my $method_map = $attribute->_generate_handles; for my $method_name (keys %$method_map) { $class->add_method($method_name => $method_map->{$method_name}); + $associated_methods++; } } + if($associated_methods == 0 && $is_metadata ne 'bare'){ + Carp::cluck(qq{Attribute ($name) of class }.$class->name.qq{ has no associated methods (did you mean to provide an "is" argument?)}); + + } + return $attribute; } @@ -292,31 +296,31 @@ sub validate_args { my $name = shift; my $args = shift; - confess "You can not use lazy_build and default for the same attribute ($name)" + $self->throw_error("You can not use lazy_build and default for the same attribute ($name)") if $args->{lazy_build} && exists $args->{default}; - confess "You cannot have lazy attribute ($name) without specifying a default value for it" + $self->throw_error("You cannot have lazy attribute ($name) without specifying a default value for it") if $args->{lazy} && !exists($args->{default}) && !exists($args->{builder}); - confess "References are not allowed as default values, you must wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])" + $self->throw_error("References are not allowed as default values, you must wrap the default of '$name' in a CODE reference (ex: sub { [] } and not [])") if ref($args->{default}) && ref($args->{default}) ne 'CODE'; - confess "You cannot auto-dereference without specifying a type constraint on attribute ($name)" + $self->throw_error("You cannot auto-dereference without specifying a type constraint on attribute ($name)") if $args->{auto_deref} && !exists($args->{isa}); - confess "You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)" + $self->throw_error("You cannot auto-dereference anything other than a ArrayRef or HashRef on attribute ($name)") if $args->{auto_deref} && $args->{isa} !~ /^(?:ArrayRef|HashRef)(?:\[.*\])?$/; if ($args->{trigger}) { if (ref($args->{trigger}) eq 'HASH') { - Carp::carp "HASH-based form of trigger has been removed. Only the coderef form of triggers are now supported."; + $self->throw_error("HASH-based form of trigger has been removed. Only the coderef form of triggers are now supported."); } - confess "Trigger must be a CODE ref on attribute ($name)" + $self->throw_error("Trigger must be a CODE ref on attribute ($name)") if ref($args->{trigger}) ne 'CODE'; } @@ -336,7 +340,7 @@ sub verify_against_type_constraint { sub verify_type_constraint_error { my($self, $name, $value, $type) = @_; - Carp::confess("Attribute ($name) does not pass the type constraint because: " . $type->get_message($value)); + $self->throw_error("Attribute ($name) does not pass the type constraint because: " . $type->get_message($value)); } sub coerce_constraint { ## my($self, $value) = @_; @@ -356,7 +360,7 @@ sub _canonicalize_handles { return map { $_ => $_ } @$handles; } else { - confess "Unable to canonicalize the 'handles' option with $handles"; + $self->throw_error("Unable to canonicalize the 'handles' option with $handles"); } } @@ -380,7 +384,14 @@ sub get_parent_args { return %{ $super_attr->_create_args }; } - confess "Could not find an attribute by the name of '$name' to inherit from"; + $self->throw_error("Could not find an attribute by the name of '$name' to inherit from"); +} + +sub throw_error{ + my $self = shift; + + my $metaclass = (ref $self && $self->associated_class) || 'Mouse::Meta::Class'; + $metaclass->throw_error(@_, depth => 1); } 1;