use warnings;
use metaclass;
-use Carp 'confess';
use Scalar::Util 'blessed';
-use Data::Dumper;
-
-our $VERSION = '0.54';
+our $VERSION = '0.67';
+$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
use base 'Moose::Meta::Role::Application';
sub check_role_exclusions {
my ($self, $role1, $role2) = @_;
- confess "Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'"
+ Moose->throw_error("Conflict detected: " . $role2->name . " excludes role '" . $role1->name . "'")
if $role2->excludes_role($role1->name);
foreach my $excluded_role_name ($role1->get_excluded_roles_list) {
- confess "The class " . $role2->name . " does the excluded role '$excluded_role_name'"
+ Moose->throw_error("The class " . $role2->name . " does the excluded role '$excluded_role_name'")
if $role2->does_role($excluded_role_name);
$role2->add_excluded_roles($excluded_role_name);
}
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)) {
- confess "Role '" . $role1->name . "' has encountered an attribute conflict " .
- "during composition. This is fatal error and cannot be disambiguated.";
+ 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(
sub apply_methods {
my ($self, $role1, $role2) = @_;
foreach my $method_name ($role1->get_method_list) {
-
- next if $self->is_method_excluded($method_name);
if ($self->is_method_aliased($method_name)) {
my $aliased_method_name = $self->get_method_aliases->{$method_name};
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) {
- confess "Cannot create a method alias if a local method of the same name exists";
+ Moose->throw_error("Cannot create a method alias if a local method of the same name exists");
}
- $role2->alias_method(
+ $role2->add_method(
$aliased_method_name,
$role1->get_method($method_name)
);
if (!$role2->has_method($method_name)) {
- $role2->add_required_methods($method_name);
+ $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) &&
$role2->add_required_methods($method_name);
}
else {
- # add it, although it could be overriden
- $role2->alias_method(
+ # add it, although it could be overridden
+ $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
- confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " .
+ 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.";
+ "is fatal error.");
}
else {
# if we are a role, we need to make sure
# 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)) {
- confess "Role '" . $role1->name . "' has encountered an 'override' method conflict " .
+ 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.";
+ "This is fatal error.");
}
else {
# if there is no conflict,
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>