use Carp 'confess';
use Scalar::Util 'weaken', 'blessed', 'reftype';
-our $VERSION = '0.13';
+our $VERSION = '0.18';
our $AUTHORITY = 'cpan:STEVAN';
use Moose::Meta::Method::Overriden;
return $instance;
}
-
# FIXME:
# This is ugly
sub get_method_map {
my $self = shift;
+
+ if (defined $self->{'$!_package_cache_flag'} &&
+ $self->{'$!_package_cache_flag'} == Class::MOP::check_package_cache_flag($self->meta->name)) {
+ return $self->{'%!methods'};
+ }
+
my $map = $self->{'%!methods'};
my $class_name = $self->name;
defined $map->{$symbol} &&
$map->{$symbol}->body == $code;
- my $gv = B::svref_2object($code)->GV;
+ my ($pkg, $name) = Class::MOP::get_code_info($code);
- my $pkg = $gv->STASH->NAME;
- if ($pkg->can('meta') && $pkg->meta && $pkg->meta->isa('Moose::Meta::Role')) {
+ if ($pkg->can('meta')
+ # NOTE:
+ # we don't know what ->meta we are calling
+ # here, so we need to be careful cause it
+ # just might blow up at us, or just complain
+ # loudly (in the case of Curses.pm) so we
+ # just be a little overly cautious here.
+ # - SL
+ && eval { no warnings; blessed($pkg->meta) }
+ && $pkg->meta->isa('Moose::Meta::Role')) {
#my $role = $pkg->meta->name;
#next unless $self->does_role($role);
}
else {
- next if ($gv->STASH->NAME || '') ne $class_name &&
- ($gv->NAME || '') ne '__ANON__';
+ next if ($pkg || '') ne $class_name &&
+ ($name || '') ne '__ANON__';
+
}
$map->{$symbol} = $method_metaclass->wrap($code);
sub add_attribute {
my $self = shift;
- my $name = shift;
- if (scalar @_ == 1 && ref($_[0]) eq 'HASH') {
- # NOTE:
- # if it is a HASH ref, we de-ref it.
- # this will usually mean that it is
- # coming from a role
- $self->SUPER::add_attribute($name => %{$_[0]});
- }
- else {
- # otherwise we just pass the args
- $self->SUPER::add_attribute($name => @_);
- }
+ $self->SUPER::add_attribute($self->_process_attribute(@_));
}
sub add_override_method_modifier {
my @args = @_;
no warnings 'redefine';
if ($Moose::SUPER_SLOT{$_super_package}) {
- local *{$Moose::SUPER_SLOT{$_super_package}}
- = sub { $super->(@args) };
- return $method->(@args);
+ local *{$Moose::SUPER_SLOT{$_super_package}} = sub { $super->body->(@args) };
+ return $method->(@args);
} else {
- confess "Trying to call override modifier'd method without super()";
+ confess "Trying to call override modifier'd method without super()";
}
}));
}
my @args = @_;
no warnings 'redefine';
if ($Moose::INNER_SLOT{$_super_package}) {
- local *{$Moose::INNER_SLOT{$_super_package}}
- = sub { $method->(@args) };
- return $super->(@args);
- } else {
- return $super->(@args);
+ local *{$Moose::INNER_SLOT{$_super_package}} = sub {
+ local *{$Moose::INNER_SLOT{$_super_package}} = sub {};
+ $method->(@args);
+ };
+ return $super->body->(@args);
+ }
+ else {
+ return $super->body->(@args);
}
});
}
return $self;
}
-sub _apply_all_roles {
- my ($self, @roles) = @_;
- ($_->can('meta') && $_->meta->isa('Moose::Meta::Role'))
- || confess "You can only consume roles, $_ is not a Moose role"
- foreach @roles;
- if (scalar @roles == 1) {
- $roles[0]->meta->apply($self);
- }
- else {
- # FIXME
- # we should make a Moose::Meta::Role::Composite
- # which is a smaller version of Moose::Meta::Role
- # which does not use any package stuff
- Moose::Meta::Role->combine(
- map { $_->meta } @roles
- )->apply($self);
- }
+# NOTE:
+# this was crap anyway, see
+# Moose::Util::apply_all_roles
+# instead
+sub _apply_all_roles {
+ die 'DEPRECATED: use Moose::Util::apply_all_roles($meta, @roles) instead'
}
+my %ANON_CLASSES;
+
sub _process_attribute {
- my ($self, $name, %options) = @_;
+ my $self = shift;
+ my $name = shift;
+ my %options = ((scalar @_ == 1 && ref($_[0]) eq 'HASH') ? %{$_[0]} : @_);
+
if ($name =~ /^\+(.*)/) {
- my $new_attr = $self->_process_inherited_attribute($1, %options);
- $self->add_attribute($new_attr);
+ return $self->_process_inherited_attribute($1, %options);
}
else {
+ my $attr_metaclass_name;
if ($options{metaclass}) {
my $metaclass_name = $options{metaclass};
eval {
if ($@) {
Class::MOP::load_class($metaclass_name);
}
- $self->add_attribute($metaclass_name->new($name, %options));
+ $attr_metaclass_name = $metaclass_name;
}
else {
- $self->add_attribute($name, %options);
+ $attr_metaclass_name = $self->attribute_metaclass;
}
+
+ if ($options{traits}) {
+
+ my $anon_role_key = join "|" => @{$options{traits}};
+
+ my $class;
+ if (exists $ANON_CLASSES{$anon_role_key} && defined $ANON_CLASSES{$anon_role_key}) {
+ $class = $ANON_CLASSES{$anon_role_key};
+ }
+ else {
+ $class = Moose::Meta::Class->create_anon_class(
+ superclasses => [ $attr_metaclass_name ]
+ );
+ $ANON_CLASSES{$anon_role_key} = $class;
+
+ my @traits;
+ foreach my $trait (@{$options{traits}}) {
+ eval {
+ my $possible_full_name = 'Moose::Meta::Attribute::Custom::Trait::' . $trait;
+ Class::MOP::load_class($possible_full_name);
+ push @traits => $possible_full_name->can('register_implementation')
+ ? $possible_full_name->register_implementation
+ : $possible_full_name;
+ };
+ if ($@) {
+ push @traits => $trait;
+ }
+ }
+
+ Moose::Util::apply_all_roles($class, @traits);
+ }
+
+ $attr_metaclass_name = $class->name;
+ }
+
+ return $attr_metaclass_name->new($name, %options);
}
}
my $inherited_attr = $self->find_attribute_by_name($attr_name);
(defined $inherited_attr)
|| confess "Could not find an attribute by the name of '$attr_name' to inherit from";
- my $new_attr;
if ($inherited_attr->isa('Moose::Meta::Attribute')) {
- $new_attr = $inherited_attr->clone_and_inherit_options(%options);
+ return $inherited_attr->clone_and_inherit_options(%options);
}
else {
# NOTE:
# kind of a kludge to handle Class::MOP::Attributes
- $new_attr = Moose::Meta::Attribute::clone_and_inherit_options(
- $inherited_attr, %options
- );
+ return $inherited_attr->Moose::Meta::Attribute::clone_and_inherit_options(%options);
}
- return $new_attr;
}
## -------------------------------------------------
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Moose.git / blobdiff