use Moose::Util 'english_list';
use Scalar::Util 'weaken', 'blessed';
-our $VERSION = '0.89_01';
+our $VERSION = '1.16';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
sub apply_attributes {
my ($self, $role, $class) = @_;
+ my $attr_metaclass = $class->attribute_metaclass;
+
foreach my $attribute_name ($role->get_attribute_list) {
# it if it has one already
if ($class->has_attribute($attribute_name) &&
}
else {
$class->add_attribute(
- $attribute_name,
- $role->get_attribute($attribute_name)
+ $role->get_attribute($attribute_name)->attribute_for_class($attr_metaclass)
);
}
}
}
sub apply_methods {
- my ($self, $role, $class) = @_;
- foreach my $method_name ($role->get_method_list) {
-
- unless ($self->is_method_excluded($method_name)) {
- # it if it has one already
- if ($class->has_method($method_name) &&
- # and if they are not the same thing ...
- $class->get_method($method_name)->body != $role->get_method($method_name)->body) {
- next;
- }
- else {
- # add it, although it could be overridden
- $class->add_method(
- $method_name,
- $role->get_method($method_name)
- );
- }
- }
+ my ( $self, $role, $class ) = @_;
+
+ foreach my $method ( $role->_get_local_methods ) {
+ my $method_name = $method->name;
+
+ next if $method->isa('Class::MOP::Method::Meta');
+
+ unless ( $self->is_method_excluded($method_name) ) {
+
+ my $class_method = $class->get_method($method_name);
+
+ next if $class_method && $class_method->body != $method->body;
- if ($self->is_method_aliased($method_name)) {
- my $aliased_method_name = $self->get_method_aliases->{$method_name};
- # it if it has one already
- if ($class->has_method($aliased_method_name) &&
- # and if they are not the same thing ...
- $class->get_method($aliased_method_name)->body != $role->get_method($method_name)->body) {
- $class->throw_error("Cannot create a method alias if a local method of the same name exists");
- }
$class->add_method(
- $aliased_method_name,
- $role->get_method($method_name)
+ $method_name,
+ $method,
);
}
+
+ next unless $self->is_method_aliased($method_name);
+
+ my $aliased_method_name = $self->get_method_aliases->{$method_name};
+
+ my $class_method = $class->get_method($aliased_method_name);
+
+ if ( $class_method && $class_method->body != $method->body ) {
+ $class->throw_error(
+ "Cannot create a method alias if a local method of the same name exists"
+ );
+ }
+
+ $class->add_method(
+ $aliased_method_name,
+ $method,
+ );
}
+
# we must reset the cache here since
# we are just aliasing methods, otherwise
# the modifiers go wonky.
=head1 BUGS
-All complex software has bugs lurking in it, and this module is no
-exception. If you find a bug please either email me, or add the bug
-to cpan-RT.
+See L<Moose/BUGS> for details on reporting bugs.
=head1 AUTHOR
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>