use Scalar::Util 'blessed';
-our $VERSION = '0.86';
+our $VERSION = '1.12';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
}
else {
$role2->add_attribute(
- $attribute_name,
- $role1->get_attribute($attribute_name)
+ $role1->get_attribute($attribute_name)->clone
);
}
}
}
sub apply_methods {
- my ($self, $role1, $role2) = @_;
- foreach my $method_name ($role1->get_method_list) {
+ my ( $self, $role1, $role2 ) = @_;
+ foreach my $method ( $role1->_get_local_methods ) {
- if ($self->is_method_aliased($method_name)) {
- my $aliased_method_name = $self->get_method_aliases->{$method_name};
- # it if it has one already
- if ($role2->has_method($aliased_method_name) &&
- # and if they are not the same thing ...
- $role2->get_method($aliased_method_name)->body != $role1->get_method($method_name)->body) {
+ my $method_name = $method->name;
- require Moose;
- Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
- }
+ next if $method_name eq 'meta';
- $role2->add_method(
- $aliased_method_name,
- $role1->get_method($method_name)
- );
+ unless ( $self->is_method_excluded($method_name) ) {
- if (!$role2->has_method($method_name)) {
- $role2->add_required_methods($method_name)
- unless $self->is_method_excluded($method_name);
- }
+ my $role2_method = $role2->get_method($method_name);
+ if ( $role2_method
+ && $role2_method->body != $method->body ) {
- next;
+ # method conflicts between roles result in the method becoming
+ # a requirement
+ $role2->add_conflicting_method(
+ name => $method_name,
+ roles => [ $role1->name, $role2->name ],
+ );
+ }
+ else {
+ $role2->add_method(
+ $method_name,
+ $method,
+ );
+ }
}
- next if $self->is_method_excluded($method_name);
+ next unless $self->is_method_aliased($method_name);
- # it if it has one already
- if ($role2->has_method($method_name) &&
- # and if they are not the same thing ...
- $role2->get_method($method_name)->body != $role1->get_method($method_name)->body) {
- # method conflicts between roles result
- # in the method becoming a requirement
- $role2->add_conflicting_method(
- name => $method_name,
- roles => [$role1->name, $role2->name],
+ my $aliased_method_name = $self->get_method_aliases->{$method_name};
+
+ my $role2_method = $role2->get_method($aliased_method_name);
+
+ if ( $role2_method
+ && $role2_method->body != $method->body ) {
+
+ require Moose;
+ Moose->throw_error(
+ "Cannot create a method alias if a local method of the same name exists"
);
}
- else {
- # add it, although it could be overridden
- $role2->add_method(
- $method_name,
- $role1->get_method($method_name)
- );
- }
+ $role2->add_method(
+ $aliased_method_name,
+ $role1->get_method($method_name)
+ );
+ if ( !$role2->has_method($method_name) ) {
+ $role2->add_required_methods($method_name)
+ unless $self->is_method_excluded($method_name);
+ }
}
}
=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>