Beginning of dzilization

[gitmo/Moose.git] / lib / Moose / Meta / Role / Application / ToRole.pm

diff --git a/lib/Moose/Meta/Role/Application/ToRole.pm b/lib/Moose/Meta/Role/Application/ToRole.pm
index fbae844..21091d6 100644 (file)
--- a/lib/Moose/Meta/Role/Application/ToRole.pm
+++ b/lib/Moose/Meta/Role/Application/ToRole.pm
@@ -6,8 +6,6 @@ use metaclass;
 
 use Scalar::Util    'blessed';
 
-our $VERSION   = '1.10';
-$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application';
@@ -57,9 +55,15 @@ sub apply_attributes {
             # make sure we haven't seen this one already too
             $role2->get_attribute($attribute_name) != $role1->get_attribute($attribute_name)) {
 
+            my $role2_name = $role2->name;
+
             require Moose;
-            Moose->throw_error("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"
+                    . " while being composed into '$role2_name'."
+                    . " This is a fatal error and cannot be disambiguated."
+                    . " The conflicting attribute is named '$attribute_name'." );
         }
         else {
             $role2->add_attribute(
@@ -75,7 +79,7 @@ sub apply_methods {
 
         my $method_name = $method->name;
 
-        next if $method_name eq 'meta';
+        next if $method->isa('Class::MOP::Method::Meta');
 
         unless ( $self->is_method_excluded($method_name) ) {
 
@@ -178,14 +182,12 @@ sub apply_method_modifiers {
 
 1;
 
+# ABSTRACT: Compose a role into another role
+
 __END__
 
 =pod
 
-=head1 NAME
-
-Moose::Meta::Role::Application::ToRole - Compose a role into another role
-
 =head1 DESCRIPTION
 
 =head2 METHODS
@@ -218,18 +220,5 @@ Moose::Meta::Role::Application::ToRole - Compose a role into another role
 
 See L<Moose/BUGS> for details on reporting bugs.
 
-=head1 AUTHOR
-
-Stevan Little E<lt>stevan@iinteractive.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006-2010 by Infinity Interactive, Inc.
-
-L<http://www.iinteractive.com>
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
-
 =cut