use Carp 'confess';
use Scalar::Util 'blessed';
-our $VERSION = '0.65';
+our $VERSION = '0.71_01';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Class::MOP::Object';
sub new {
- my ($class, $metaclass, $options) = @_;
+ my ($class, @args) = @_;
- my $self = bless {
+ my ( $metaclass, $options );
+
+ if ( @args == 2 ) {
+ # compatibility args
+ ( $metaclass, $options ) = @args;
+ } else {
+ unshift @args, "metaclass" if @args % 2 == 1;
+
+ # default named args
+ my %options = @args;
+ $options = \%options;
+ $metaclass = $options{metaclass};
+ }
+
+ my $self = $class->_new(
'metaclass' => $metaclass,
'options' => $options,
'immutable_metaclass' => undef,
- } => $class;
-
- # NOTE:
- # we initialize the immutable
- # version of the metaclass here
- $self->create_immutable_metaclass;
+ );
return $self;
}
-sub immutable_metaclass { (shift)->{'immutable_metaclass'} }
+sub _new {
+ my $class = shift;
+ my $options = @_ == 1 ? $_[0] : {@_};
+
+ bless $options, $class;
+}
+
+sub immutable_metaclass {
+ my $self = shift;
+
+ $self->create_immutable_metaclass unless $self->{'immutable_metaclass'};
+
+ return $self->{'immutable_metaclass'};
+}
+
sub metaclass { (shift)->{'metaclass'} }
sub options { (shift)->{'options'} }
package_name => $metaclass->name,
name => $options{constructor_name}
)
- ) unless $metaclass->has_method($options{constructor_name});
+ ) if $options{replace_constructor} or !$metaclass->has_method($options{constructor_name});
}
if ($options{inline_destructor}) {
($metaclass->can($method_name))
|| confess "Could not find the method '$method_name' in " . $metaclass->name;
-
- if ($type eq 'ARRAY') {
- $metaclass->{'___' . $method_name} = [ $metaclass->$method_name ];
- }
- elsif ($type eq 'HASH') {
- $metaclass->{'___' . $method_name} = { $metaclass->$method_name };
- }
- elsif ($type eq 'SCALAR') {
- $metaclass->{'___' . $method_name} = $metaclass->$method_name;
- }
}
$metaclass->{'___original_class'} = blessed($metaclass);
my $self = shift;
my %methods = %DEFAULT_METHODS;
+ my $metaclass = $self->metaclass;
+ my $meta = $metaclass->meta;
foreach my $read_only_method (@{$self->options->{read_only}}) {
- my $method = $self->metaclass->meta->find_method_by_name($read_only_method);
+ my $method = $meta->find_method_by_name($read_only_method);
(defined $method)
- || confess "Could not find the method '$read_only_method' in " . $self->metaclass->name;
+ || confess "Could not find the method '$read_only_method' in " . $metaclass->name;
$methods{$read_only_method} = sub {
confess "This method is read-only" if scalar @_ > 1;
my $memoized_methods = $self->options->{memoize};
foreach my $method_name (keys %{$memoized_methods}) {
my $type = $memoized_methods->{$method_name};
+ my $key = '___' . $method_name;
+ my $method = $meta->find_method_by_name($method_name);
+
if ($type eq 'ARRAY') {
- $methods{$method_name} = sub { @{$_[0]->{'___' . $method_name}} };
+ $methods{$method_name} = sub {
+ @{$_[0]->{$key}} = $method->execute($_[0])
+ if !exists $_[0]->{$key};
+ return @{$_[0]->{$key}};
+ };
}
elsif ($type eq 'HASH') {
- $methods{$method_name} = sub { %{$_[0]->{'___' . $method_name}} };
+ $methods{$method_name} = sub {
+ %{$_[0]->{$key}} = $method->execute($_[0])
+ if !exists $_[0]->{$key};
+ return %{$_[0]->{$key}};
+ };
}
elsif ($type eq 'SCALAR') {
- $methods{$method_name} = sub { $_[0]->{'___' . $method_name} };
+ $methods{$method_name} = sub {
+ $_[0]->{$key} = $method->execute($_[0])
+ if !exists $_[0]->{$key};
+ return $_[0]->{$key};
+ };
}
}
my $wrapped_methods = $self->options->{wrapped};
foreach my $method_name (keys %{ $wrapped_methods }) {
- my $method = $self->metaclass->meta->find_method_by_name($method_name);
+ my $method = $meta->find_method_by_name($method_name);
(defined $method)
- || confess "Could not find the method '$method_name' in " . $self->metaclass->name;
+ || confess "Could not find the method '$method_name' in " . $metaclass->name;
my $wrapper = $wrapped_methods->{$method_name};