use Scalar::Util 'blessed';
-our $VERSION = '0.65';
+our $VERSION = '1.05';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::Role::Application';
sub apply {
- my ($self, $role1, $role2) = @_;
- $self->SUPER::apply($role1, $role2);
- $role2->add_role($role1);
+ my ($self, $role1, $role2) = @_;
+ $self->SUPER::apply($role1, $role2);
+ $role2->add_role($role1);
}
sub check_role_exclusions {
my ($self, $role1, $role2) = @_;
- Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'")
- if $role2->excludes_role($role1->name);
+ if ( $role2->excludes_role($role1->name) ) {
+ require Moose;
+ Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'");
+ }
foreach my $excluded_role_name ($role1->get_excluded_roles_list) {
- Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'")
- if $role2->does_role($excluded_role_name);
+ if ( $role2->does_role($excluded_role_name) ) {
+ require Moose;
+ Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'");
+ }
$role2->add_excluded_roles($excluded_role_name);
}
}
sub check_required_methods {
my ($self, $role1, $role2) = @_;
- foreach my $required_method_name ($role1->get_required_method_list) {
-
+ foreach my $required_method ($role1->get_required_method_list) {
+ my $required_method_name = $required_method->name;
+
next if $self->is_aliased_method($required_method_name);
-
- $role2->add_required_methods($required_method_name)
+
+ $role2->add_required_methods($required_method)
unless $role2->find_method_by_name($required_method_name);
}
}
sub check_required_attributes {
-
+
}
sub apply_attributes {
if ($role2->has_attribute($attribute_name) &&
# make sure we haven't seen this one already too
$role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) {
+
+ require Moose;
Moose->throw_error("Role '" . $role1->name . "' has encountered an attribute conflict " .
"during composition. This is fatal error and cannot be disambiguated.");
}
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) {
+ next if $method_name eq 'meta';
+
+ unless ( $self->is_method_excluded($method_name) ) {
+ if ( $role2->has_method($method_name)
+ && $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 ],
+ );
+ }
+ else {
+ $role2->add_method(
+ $method_name,
+ $role1->get_method($method_name)
+ );
+ }
+ }
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) {
+
+ require Moose;
Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
}
$role2->add_required_methods($method_name)
unless $self->is_method_excluded($method_name);
}
-
- next;
- }
-
- next if $self->is_method_excluded($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_required_methods($method_name);
}
- else {
- # add it, although it could be overriden
- $role2->add_method(
- $method_name,
- $role1->get_method($method_name)
- );
-
- }
-
}
}
if ($role2->has_method($method_name)) {
# if it is being composed into another role
# we have a conflict here, because you cannot
- # combine an overriden method with a locally
+ # combine an overridden method with a locally
# defined one
+ require Moose;
Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " .
"during composition (A local method of the same name as been found). This " .
"is fatal error.");
# we are composing into
if ($role2->has_override_method_modifier($method_name) &&
$role2->get_override_method_modifier($method_name) != $role2->get_override_method_modifier($method_name)) {
+
+ require Moose;
Moose->throw_error("Role '" . $role1->name . "' has encountered an 'override' method conflict " .
"during composition (Two 'override' methods of the same name encountered). " .
"This is fatal error.");
=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-2008 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>