X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=ea4b1fa9fdb698c0b03f9041f6d65ce979512532;hp=bfa99cb466cc3b4933076fb9c94577eddbd56cc7;hb=06a970ab9fb60a4cac5e3f1774cf9a2914c94cc1;hpb=fb6960c6c727d4ec71fe565d662e3744d294d7b7

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index bfa99cb..ea4b1fa 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -41,7 +41,9 @@ sub get_required_method_list{
 
 sub add_required_methods {
     my($self, @methods) = @_;
-    push @{$self->{required_methods}}, @methods;
+    my %required = map{ $_ => 1 } @{$self->{required_methods}};
+    push @{$self->{required_methods}}, grep{ !$required{$_}++ && !$self->has_method($_) } @methods;
+    return;
 }
 
 sub requires_method {
@@ -54,84 +56,32 @@ sub add_attribute {
     my $name = shift;
 
     $self->{attributes}->{$name} = (@_ == 1) ? $_[0] : { @_ };
+    return;
 }
 
-sub _canonicalize_apply_args{
-    my($self, $applicant, %args) = @_;
-
-    if($applicant->isa('Mouse::Meta::Class')){ # Application::ToClass
-        $args{_to} = 'class';
-    }
-    elsif($applicant->isa('Mouse::Meta::Role')){ # Application::ToRole
-        $args{_to} = 'role';
-    }
-    else{ # Appplication::ToInstance
-        $args{_to} = 'class';
-
-        my $metaclass = $applicant->meta->create_anon_class(
-            superclasses => [ref $applicant],
-            cache        => 1,
-        );
-        bless $applicant, $metaclass->name; # rebless
-
-        $applicant = $metaclass;
-    }
-
-    if($args{alias} && !exists $args{-alias}){
-        $args{-alias} = $args{alias};
-    }
-    if($args{excludes} && !exists $args{-excludes}){
-        $args{-excludes} = $args{excludes};
-    }
+sub _check_required_methods{
+    my($role, $applicant, $args) = @_;
 
-    if(my $excludes = $args{-excludes}){
-        $args{-excludes} = {}; # replace with a hash ref
-        if(ref $excludes){
-            %{$args{-excludes}} = (map{ $_ => undef } @{$excludes});
-        }
-        else{
-            $args{-excludes}{$excludes} = undef;
-        }
+    if($args->{_to} eq 'role'){
+        $applicant->add_required_methods($role->get_required_method_list);
     }
+    else{ # to class or instance
+        my $applicant_class_name = $applicant->name;
 
-    return( $applicant, \%args );
-}
-
-sub _check_required_methods{
-    my($role, $class, $args, @other_roles) = @_;
-
-    if($args->{_to} eq 'class'){
-        my $class_name = $class->name;
-        my $role_name  = $role->name;
         my @missing;
         foreach my $method_name(@{$role->{required_methods}}){
-            if(!$class_name->can($method_name)){
-                my $has_method      = 0;
-
-                foreach my $another_role_spec(@other_roles){
-                    my $another_role_name = $another_role_spec->[0];
-                    if($role_name ne $another_role_name && $another_role_name->can($method_name)){
-                        $has_method = 1;
-                        last;
-                    }
-                }
-
-                push @missing, $method_name if !$has_method;
-            }
+            next if exists $args->{aliased_methods}{$method_name};
+            next if exists $role->{methods}{$method_name};
+            next if $applicant_class_name->can($method_name);
+
+            push @missing, $method_name;
         }
         if(@missing){
-            $class->throw_error("'$role_name' requires the "
-                . (@missing == 1 ? 'method' : 'methods')
-                . " "
-                . english_list(map{ sprintf q{'%s'}, $_ } @missing)
-                . " to be implemented by '$class_name'");
-        }
-    }
-    else {
-        # apply role($role) to role($class)
-        foreach my $method_name($role->get_required_method_list){
-            next if $class->has_method($method_name); # already has it
-            $class->add_required_methods($method_name);
+            $role->throw_error(sprintf "'%s' requires the method%s %s to be implemented by '%s'",
+                $role->name,
+                (@missing == 1 ? '' : 's'), # method or methods
+                english_list(map{ sprintf q{'%s'}, $_ } @missing),
+                $applicant_class_name);
         }
     }
 
@@ -139,10 +89,7 @@ sub _check_required_methods{
 }
 
 sub _apply_methods{
-    my($role, $class, $args) = @_;
-
-    my $role_name  = $role->name;
-    my $class_name = $class->name;
+    my($role, $applicant, $args) = @_;
 
     my $alias    = $args->{-alias};
     my $excludes = $args->{-excludes};
@@ -150,24 +97,25 @@ sub _apply_methods{
     foreach my $method_name($role->get_method_list){
         next if $method_name eq 'meta';
 
-        my $code = $role_name->can($method_name);
+        my $code = $role->get_method_body($method_name);
 
         if(!exists $excludes->{$method_name}){
-            if(!$class->has_method($method_name)){
-                $class->add_method($method_name => $code);
+            if(!$applicant->has_method($method_name)){
+                # The third argument $role is used in Role::Composite
+                $applicant->add_method($method_name => $code, $role);
             }
         }
 
-        if($alias && $alias->{$method_name}){
+        if(exists $alias->{$method_name}){
             my $dstname = $alias->{$method_name};
 
-            my $dstcode = do{ no strict 'refs'; *{$class_name . '::' . $dstname}{CODE} };
+            my $dstcode = $applicant->get_method_body($dstname);
 
             if(defined($dstcode) && $dstcode != $code){
-                $class->throw_error("Cannot create a method alias if a local method of the same name exists");
+                $role->throw_error("Cannot create a method alias if a local method of the same name exists");
             }
             else{
-                $class->add_method($dstname => $code);
+                $applicant->add_method($dstname => $code, $role);
             }
         }
     }
@@ -176,41 +124,35 @@ sub _apply_methods{
 }
 
 sub _apply_attributes{
-    my($role, $class, $args) = @_;
+    my($role, $applicant, $args) = @_;
 
-    if ($args->{_to} eq 'class') {
-        # apply role to class
-        for my $attr_name ($role->get_attribute_list) {
-            next if $class->has_attribute($attr_name);
-
-            my $spec = $role->get_attribute($attr_name);
-
-            $class->add_attribute($attr_name => %{$spec});
-        }
-    }
-    else {
-        # apply role to role
-        for my $attr_name ($role->get_attribute_list) {
-            next if $class->has_attribute($attr_name);
+    for my $attr_name ($role->get_attribute_list) {
+        next if $applicant->has_attribute($attr_name);
 
-            my $spec = $role->get_attribute($attr_name);
-            $class->add_attribute($attr_name => $spec);
-        }
+        $applicant->add_attribute($attr_name => $role->get_attribute($attr_name));
     }
-
     return;
 }
 
 sub _apply_modifiers{
-    my($role, $class, $args) = @_;
+    my($role, $applicant, $args) = @_;
+
+    if(my $modifiers = $role->{override_method_modifiers}){
+        foreach my $method_name (keys %{$modifiers}){
+            $applicant->add_override_method_modifier($method_name => $modifiers->{$method_name});
+        }
+    }
+
+    for my $modifier_type (qw/before around after/) {
+        my $modifiers = $role->{"${modifier_type}_method_modifiers"}
+            or next;
 
-    for my $modifier_type (qw/override before around after/) {
         my $add_modifier = "add_${modifier_type}_method_modifier";
-        my $modifiers    = $role->{"${modifier_type}_method_modifiers"};
 
-        while(my($method_name, $modifier_codes) = each %{$modifiers}){
-            foreach my $code(ref($modifier_codes) eq 'ARRAY' ? @{$modifier_codes} : $modifier_codes){
-                $class->$add_modifier($method_name => $code);
+        foreach my $method_name (keys %{$modifiers}){
+            foreach my $code(@{ $modifiers->{$method_name} }){
+                next if $applicant->{"_applied_$modifier_type"}{$method_name, $code}++; # skip applied modifiers
+                $applicant->$add_modifier($method_name => $code);
             }
         }
     }
@@ -218,12 +160,12 @@ sub _apply_modifiers{
 }
 
 sub _append_roles{
-    my($role, $class, $args) = @_;
+    my($role, $applicant, $args) = @_;
 
-    my $roles = ($args->{_to} eq 'class') ? $class->roles : $class->get_roles;
+    my $roles = ($args->{_to} eq 'role') ? $applicant->get_roles : $applicant->roles;
 
     foreach my $r($role, @{$role->get_roles}){
-        if(!$class->does_role($r->name)){
+        if(!$applicant->does_role($r->name)){
             push @{$roles}, $r;
         }
     }
@@ -234,132 +176,91 @@ sub _append_roles{
 sub apply {
     my $self      = shift;
     my $applicant = shift;
-    my $args;
 
-    ($applicant, $args) = $self->_canonicalize_apply_args($applicant, @_);
+    my %args = (@_ == 1) ? %{ $_[0] } : @_;
 
-    $self->_check_required_methods($applicant, $args);
-    $self->_apply_methods($applicant, $args);
-    $self->_apply_attributes($applicant, $args);
-    $self->_apply_modifiers($applicant, $args);
-    $self->_append_roles($applicant, $args);
-    return;
-}
+    my $instance;
 
-sub combine_apply {
-    my($role_class, $applicant, @roles) = @_;
+    if($applicant->isa('Mouse::Meta::Class')){  # Application::ToClass
+        $args{_to} = 'class';
+    }
+    elsif($applicant->isa('Mouse::Meta::Role')){ # Application::ToRole
+        $args{_to} = 'role';
+    }
+    else{                                       # Appplication::ToInstance
+        $args{_to} = 'instance';
+        $instance = $applicant;
 
-    ($applicant) = $role_class->_canonicalize_apply_args($applicant);
+        $applicant = (Mouse::Util::class_of($instance) || 'Mouse::Meta::Class')->create_anon_class(
+            superclasses => [ref $instance],
+            cache        => 1,
+        );
+    }
 
-    # check conflicting
-    my %method_provided;
-    my @method_conflicts;
-    my %attr_provided;
-    my %override_provided;
+    if($args{alias} && !exists $args{-alias}){
+        $args{-alias} = $args{alias};
+    }
+    if($args{excludes} && !exists $args{-excludes}){
+        $args{-excludes} = $args{excludes};
+    }
 
-    foreach my $role_spec (@roles) {
-        my $role      = $role_spec->[0]->meta;
-        my $role_name = $role->name;
+    $args{aliased_methods} = {};
+    if(my $alias = $args{-alias}){
+        @{$args{aliased_methods}}{ values %{$alias} } = ();
+    }
 
-        # methods
-        foreach my $method_name($role->get_method_list){
-            next if $applicant->has_method($method_name); # manually resolved
+    if(my $excludes = $args{-excludes}){
+        $args{-excludes} = {}; # replace with a hash ref
+        if(ref $excludes){
+            %{$args{-excludes}} = (map{ $_ => undef } @{$excludes});
+        }
+        else{
+            $args{-excludes}{$excludes} = undef;
+        }
+    }
 
-            my $code = do{ no strict 'refs'; \&{ $role_name . '::' . $method_name } };
+    $self->_check_required_methods($applicant, \%args);
+    $self->_apply_attributes($applicant, \%args);
+    $self->_apply_methods($applicant, \%args);
+    $self->_apply_modifiers($applicant, \%args);
+    $self->_append_roles($applicant, \%args);
 
-            my $c = $method_provided{$method_name};
 
-            if($c && $c->[0] != $code){
-                push @{$c}, $role;
-                push @method_conflicts, $c;
-            }
-            else{
-                $method_provided{$method_name} = [$code, $method_name, $role];
-            }
-        }
+    if(defined $instance){ # Application::ToInstance
+        # rebless instance
+        bless $instance, $applicant->name;
+        $applicant->_initialize_object($instance, $instance);
+    }
 
-        # attributes
-        foreach my $attr_name($role->get_attribute_list){
-            my $attr = $role->get_attribute($attr_name);
-            my $c    = $attr_provided{$attr_name};
-            if($c && $c != $attr){
-                $role_class->throw_error("We have encountered an attribute conflict with '$attr_name' "
-                                   . "during composition. This is fatal error and cannot be disambiguated.")
-            }
-            else{
-                $attr_provided{$attr_name} = $attr;
-            }
-        }
+    return;
+}
 
-        # override modifiers
-        foreach my $method_name($role->get_method_modifier_list('override')){
-            my $override = $role->get_override_method_modifier($method_name);
-            my $c        = $override_provided{$method_name};
-            if($c && $c != $override){
-                $role_class->throw_error( "We have encountered an 'override' method conflict with '$method_name' during "
-                                   . "composition (Two 'override' methods of the same name encountered). "
-                                   . "This is fatal error.")
-            }
-            else{
-                $override_provided{$method_name} = $override;
-            }
-        }
-    }
-    if(@method_conflicts){
-        my $error;
-
-        if(@method_conflicts == 1){
-            my($code, $method_name, @roles) = @{$method_conflicts[0]};
-            $role_class->throw_error(
-                sprintf q{Due to a method name conflict in roles %s, the method '%s' must be implemented or excluded by '%s'},
-                    english_list(map{ sprintf q{'%s'}, $_->name } @roles), $method_name, $applicant->name
-            );
-        }
-        else{
-            @method_conflicts = sort { $a->[0] cmp $b->[0] } @method_conflicts; # to avoid hash-ordering bugs
-            my $methods = english_list(map{ sprintf q{'%s'}, $_->[1] } @method_conflicts);
-            my $roles   = english_list(
-                map{ sprintf q{'%s'}, $_->name }
-                map{ my($code, $method_name, @roles) = @{$_}; @roles } @method_conflicts
-            );
-
-            $role_class->throw_error(
-                sprintf q{Due to method name conflicts in roles %s, the methods %s must be implemented or excluded by '%s'},
-                    $roles, $methods, $applicant->name
-            );
-        }
-    }
 
-    foreach my $role_spec (@roles) {
-        my($role_name, $args) = @{$role_spec};
+sub combine {
+    my($role_class, @role_specs) = @_;
 
-        my $role = $role_name->meta;
+    require 'Mouse/Meta/Role/Composite.pm'; # we don't want to create its namespace
 
-        ($applicant, $args) = $role->_canonicalize_apply_args($applicant, %{$args});
+    my $composite = Mouse::Meta::Role::Composite->create_anon_role();
 
-        $role->_check_required_methods($applicant, $args, @roles);
-        $role->_apply_methods($applicant, $args);
-        $role->_apply_attributes($applicant, $args);
-        $role->_apply_modifiers($applicant, $args);
-        $role->_append_roles($applicant, $args);
+    foreach my $role_spec (@role_specs) {
+        my($role_name, $args) = @{$role_spec};
+        $role_name->meta->apply($composite, %{$args});
     }
-    return;
+    return $composite;
 }
 
 for my $modifier_type (qw/before after around/) {
 
     my $modifier = "${modifier_type}_method_modifiers";
+
     my $add_method_modifier =  sub {
         my ($self, $method_name, $method) = @_;
 
         push @{ $self->{$modifier}->{$method_name} ||= [] }, $method;
         return;
     };
-    my $has_method_modifiers = sub{
-        my($self, $method_name) = @_;
-        my $m = $self->{$modifier}->{$method_name};
-        return $m && @{$m} != 0;
-    };
+
     my $get_method_modifiers = sub {
         my ($self, $method_name) = @_;
         return @{ $self->{$modifier}->{$method_name} ||= [] }
@@ -367,8 +268,9 @@ for my $modifier_type (qw/before after around/) {
 
     no strict 'refs';
     *{ 'add_' . $modifier_type . '_method_modifier'  } = $add_method_modifier;
-    *{ 'has_' . $modifier_type . '_method_modifiers' } = $has_method_modifiers;
     *{ 'get_' . $modifier_type . '_method_modifiers' } = $get_method_modifiers;
+
+    # has_${modifier_type}_method_modifiers is moved into t::lib::Test::Mouse
 }
 
 sub add_override_method_modifier{
@@ -385,23 +287,11 @@ sub add_override_method_modifier{
     $self->{override_method_modifiers}->{$method_name} = $method;
 }
 
-sub has_override_method_modifier {
-    my ($self, $method_name) = @_;
-    return exists $self->{override_method_modifiers}->{$method_name};
-}
-
 sub get_override_method_modifier {
     my ($self, $method_name) = @_;
     return $self->{override_method_modifiers}->{$method_name};
 }
 
-sub get_method_modifier_list {
-    my($self, $modifier_type) = @_;
-
-    return keys %{ $self->{$modifier_type . '_method_modifiers'} };
-}
-
-# This is currently not passing all the Moose tests.
 sub does_role {
     my ($self, $role_name) = @_;
 
@@ -417,15 +307,17 @@ sub does_role {
     return 0;
 }
 
-
 1;
-
 __END__
 
 =head1 NAME
 
 Mouse::Meta::Role - The Mouse Role metaclass
 
+=head1 VERSION
+
+This document describes Mouse version 0.38
+
 =head1 SEE ALSO
 
 L<Moose::Meta::Role>