use Carp 'confess';
use Scalar::Util 'blessed', 'reftype', 'weaken';
-our $VERSION = '0.16';
+our $VERSION = '0.17';
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Object';
if ref $options{builder} || !(defined $options{builder});
confess("Setting both default and builder is not allowed.")
if exists $options{default};
+ } else {
+ (is_default_a_coderef(\%options))
+ || confess("References are not allowed as default values, you must ".
+ "wrap then in a CODE reference (ex: sub { [] } and not [])")
+ if exists $options{default} && ref $options{default};
}
- (is_default_a_coderef(\%options))
- || confess("References are not allowed as default values, you must ".
- "wrap then in a CODE reference (ex: sub { [] } and not [])")
- if exists $options{default} && ref $options{default};
-
bless {
'$!name' => $name,
'$!accessor' => $options{accessor},
my ($self, $meta_instance, $instance, $params) = @_;
my $init_arg = $self->{'$!init_arg'};
# try to fetch the init arg from the %params ...
- my $val;
- $val = $params->{$init_arg} if exists $params->{$init_arg};
+
# if nothing was in the %params, we can use the
# attribute's default value (if it has one)
- if (!defined $val && defined $self->{'$!default'}) {
- $val = $self->default($instance);
- }
- if (!defined $val && defined $self->{'$!builder'}) {
- my $builder = $self->{'$!builder'};
- confess(blessed($instance)." does not support builder method '$builder' for attribute '" . $self->name . "'")
- unless $instance->can($builder);
- $val = $instance->$builder;
+ if(exists $params->{$init_arg}){
+ $meta_instance->set_slot_value($instance, $self->name, $params->{$init_arg});
+ } elsif (defined $self->{'$!default'}) {
+ $meta_instance->set_slot_value($instance, $self->name, $self->default($instance));
+ } elsif (defined( my $builder = $self->{'$!builder'})) {
+ if($builder = $instance->can($builder) ){
+ $meta_instance->set_slot_value($instance, $self->name, $instance->$builder);
+ } else {
+ confess(blessed($instance)." does not support builder method '". $self->{'$!builder'} ."' for attribute '" . $self->name . "'");
+ }
}
- $meta_instance->set_slot_value($instance, $self->name, $val);
}
# NOTE:
sub has_value {
my ($self, $instance) = @_;
- defined Class::MOP::Class->initialize(blessed($instance))
- ->get_meta_instance
- ->get_slot_value($instance, $self->name) ? 1 : 0;
+ Class::MOP::Class->initialize(blessed($instance))
+ ->get_meta_instance
+ ->is_slot_initialized($instance, $self->name);
}
sub clear_value {