X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=798ae51258dfd3c03b51f87db8d31a76d00e4ab1;hb=df8260e9a27a9d7532a21525223975fcf8e26562;hp=ffb4673ff738a2d38bf7daf4f3f9919a8c2383dc;hpb=c45384475d0d20e835d5666615ce15b17e79ff4b;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index ffb4673..798ae51 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -4,12 +4,11 @@ use strict;
 use warnings;
 use metaclass;
 
-use Carp            'confess';
-use Scalar::Util    'blessed';
+use Moose::Util  'english_list';
+use Scalar::Util 'blessed';
 
-use Data::Dumper;
-
-our $VERSION   = '0.01';
+our $VERSION   = '0.63';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Moose::Meta::Role::Application';
@@ -23,17 +22,21 @@ sub apply {
 sub check_role_exclusions {
     my ($self, $role, $class) = @_;
     if ($class->excludes_role($role->name)) {
-        confess "Conflict detected: " . $class->name . " excludes role '" . $role->name . "'";
+        $class->throw_error("Conflict detected: " . $class->name . " excludes role '" . $role->name . "'");
     }
     foreach my $excluded_role_name ($role->get_excluded_roles_list) {
         if ($class->does_role($excluded_role_name)) {
-            confess "The class " . $class->name . " does the excluded role '$excluded_role_name'";
+            $class->throw_error("The class " . $class->name . " does the excluded role '$excluded_role_name'");
         }
     }
 }
 
 sub check_required_methods {
     my ($self, $role, $class) = @_;
+
+    my @missing;
+    my @is_attr;
+
     # NOTE:
     # we might need to move this down below the
     # the attributes so that we can require any
@@ -42,9 +45,11 @@ sub check_required_methods {
     # the require methods stuff.
     foreach my $required_method_name ($role->get_required_method_list) {
 
-        unless ($class->find_method_by_name($required_method_name)) {
-            confess "'" . $role->name . "' requires the method '$required_method_name' " .
-                    "to be implemented by '" . $class->name . "'";
+        if (!$class->find_method_by_name($required_method_name)) {
+            
+            next if $self->is_aliased_method($required_method_name);
+
+            push @missing, $required_method_name;
         }
         else {
             # NOTE:
@@ -54,9 +59,8 @@ sub check_required_methods {
             my $method = $class->find_method_by_name($required_method_name);
 
             # check if it is a generated accessor ...
-            (!$method->isa('Class::MOP::Method::Accessor'))
-                || confess "'" . $role->name . "' requires the method '$required_method_name' " .
-                           "to be implemented by '" . $class->name . "', the method is only an attribute accessor";
+            push @is_attr, $required_method_name,
+                if $method->isa('Class::MOP::Method::Accessor');
 
             # NOTE:
             # All other tests here have been removed, they were tests
@@ -71,6 +75,43 @@ sub check_required_methods {
             # - SL
         }
     }
+
+    return unless @missing || @is_attr;
+
+    my $error = '';
+
+    if (@missing) {
+        my $noun = @missing == 1 ? 'method' : 'methods';
+
+        my $list
+            = Moose::Util::english_list( map { q{'} . $_ . q{'} } @missing );
+
+        $error
+            .= q{'}
+            . $role->name
+            . "' requires the $noun $list "
+            . "to be implemented by '"
+            . $class->name . q{'};
+    }
+
+    if (@is_attr) {
+        my $noun = @is_attr == 1 ? 'method' : 'methods';
+
+        my $list
+            = Moose::Util::english_list( map { q{'} . $_ . q{'} } @is_attr );
+
+        $error .= "\n" if length $error;
+
+        $error
+            .= q{'}
+            . $role->name
+            . "' requires the $noun $list "
+            . "to be implemented by '"
+            . $class->name
+            . "' but the method is only an attribute accessor";
+    }
+
+    $class->throw_error($error);
 }
 
 sub check_required_attributes {
@@ -87,20 +128,10 @@ sub apply_attributes {
             next;
         }
         else {
-            # NOTE:
-            # this is kinda ugly ...
-            if ($class->isa('Moose::Meta::Class')) {
-                $class->_process_attribute(
-                    $attribute_name,
-                    %{$role->get_attribute($attribute_name)}
-                );
-            }
-            else {
-                $class->add_attribute(
-                    $attribute_name,
-                    $role->get_attribute($attribute_name)
-                );
-            }
+            $class->add_attribute(
+                $attribute_name,
+                $role->get_attribute($attribute_name)
+            );
         }
     }
 }
@@ -109,21 +140,35 @@ sub apply_methods {
     my ($self, $role, $class) = @_;
     foreach my $method_name ($role->get_method_list) {
         
-        next if $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;
+        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 overriden
+                $class->add_method(
+                    $method_name,
+                    $role->get_method($method_name)
+                );         
+            }
         }
-        else {
-            # add it, although it could be overriden
-            $class->alias_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 ($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)
-            );
-        }
+            );                
+        }        
     }
     # we must reset the cache here since
     # we are just aliasing methods, otherwise
@@ -171,7 +216,7 @@ __END__
 
 =head1 NAME
 
-Moose::Meta::Role::Application::ToClass
+Moose::Meta::Role::Application::ToClass - Compose a role into a class
 
 =head1 DESCRIPTION