use Scalar::Util 'blessed', 'weaken', 'reftype';
use Carp 'confess';
+use Sub::Name 'subname';
use overload ();
-our $VERSION = '0.15';
+our $VERSION = '0.16';
our $AUTHORITY = 'cpan:STEVAN';
use Moose::Meta::Method::Accessor;
if (exists $options->{lazy_build} && $options->{lazy_build} == 1) {
confess("You can not use lazy_build and default for the same attribute")
if exists $options->{default};
- $options->{lazy} = 1;
- $options->{required} = 1;
- $options->{builder} ||= "_build_${name}";
- if($name =~ /^_/){
+ $options->{lazy} = 1;
+ $options->{required} = 1;
+ $options->{builder} ||= "_build_${name}";
+ if ($name =~ /^_/) {
$options->{clearer} ||= "_clear${name}";
$options->{predicate} ||= "_has${name}";
- } else {
+ }
+ else {
$options->{clearer} ||= "clear_${name}";
$options->{predicate} ||= "has_${name}";
}
my $value_is_set;
if (exists $params->{$init_arg}) {
$val = $params->{$init_arg};
- $value_is_set = 1;
+ $value_is_set = 1;
}
else {
# skip it if it's lazy
if ($self->has_default) {
$val = $self->default($instance);
$value_is_set = 1;
- } elsif ($self->has_builder) {
- if(my $builder = $instance->can($self->builder)){
+ }
+ elsif ($self->has_builder) {
+ if (my $builder = $instance->can($self->builder)){
$val = $instance->$builder;
$value_is_set = 1;
- } else {
+ }
+ else {
confess(blessed($instance)." does not support builder method '".$self->builder."' for attribute '" . $self->name . "'");
}
}
$type_constraint->name .
") with '" .
(defined $val
- ? (blessed($val) && overload::Overloaded($val)
- ? overload::StrVal($val)
- : $val)
+ ? overload::StrVal($val)
: 'undef') .
"'";
}
$meta_instance->set_slot_value($instance, $self->name, $val);
$meta_instance->weaken_slot_value($instance, $self->name)
- if ref $val && $self->is_weak_ref;
+ if ref $val && $self->is_weak_ref;
}
## Slot management
. $type_constraint->name
. ") with "
. (defined($value)
- ? ("'" .
- (blessed($value) && overload::Overloaded($value)
- ? overload::StrVal($value)
- : $value)
- . "'")
+ ? ("'" . overload::StrVal($value) . "'")
: "undef")
if defined($value);
}
$self->set_value($instance, $default);
}
if ( $self->has_builder ){
- if(my $builder = $instance->can($self->builder)){
+ if (my $builder = $instance->can($self->builder)){
$self->set_value($instance, $instance->$builder);
- } else {
- confess(blessed($instance)." does not support builder method '".$self->builder."' for attribute '" . $self->name . "'");
+ }
+ else {
+ confess(blessed($instance)
+ . " does not support builder method '"
+ . $self->builder
+ . "' for attribute '"
+ . $self->name
+ . "'");
}
- } else {
+ }
+ else {
$self->set_value($instance, undef);
}
}
my $associated_class = $self->associated_class;
foreach my $handle (keys %handles) {
my $method_to_call = $handles{$handle};
+ my $class_name = $associated_class->name;
+ my $name = "${class_name}::${handle}";
(!$associated_class->has_method($handle))
|| confess "You cannot overwrite a locally defined method ($handle) with a delegation";
# any of these methods, as they will
# override the ones in your class, which
# is almost certainly not what you want.
- next if $handle =~ /^BUILD|DEMOLISH$/ || Moose::Object->can($handle);
+
+ # FIXME warn when $handle was explicitly specified, but not if the source is a regex or something
+ #cluck("Not delegating method '$handle' because it is a core method") and
+ next if $class_name->isa("Moose::Object") and $handle =~ /^BUILD|DEMOLISH$/ || Moose::Object->can($handle);
if ((reftype($method_to_call) || '') eq 'CODE') {
- $associated_class->add_method($handle => $method_to_call);
+ $associated_class->add_method($handle => subname $name, $method_to_call);
}
else {
- $associated_class->add_method($handle => sub {
- # FIXME
- # we should check for lack of
- # a callable return value from
- # the accessor here
+ $associated_class->add_method($handle => subname $name, sub {
my $proxy = (shift)->$accessor();
@_ = ($proxy, @_);
- goto &{ $proxy->can($method_to_call) };
+ goto &{ $proxy->can($method_to_call) || return };
});
}
}
Any coercion to convert values is done before checking the type constraint.
To check a value against a type constraint before setting it, fetch the
-attribute instance using L<Moose::Meta::Attribute/find_attribute_by_name>,
+attribute instance using L<Class::MOP::Class/find_attribute_by_name>,
fetch the type_constraint from the attribute using L<Moose::Meta::Attribute/type_constraint>
and call L<Moose::Meta::TypeConstraint/check>. See L<Moose::Cookbook::RecipeX>
for an example.
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>