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=620baf0c3dab71b10926aac52e03eb6ef3c79aa6;hp=62382c4a81e6a2f745377fa0508622b6cf67f12e;hb=e058b279f94cfd76ca59d7972209e1b346492db9;hpb=71e7b544ac5b18ce7b09b9a95723b1a4e28b4321

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 62382c4..620baf0 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -4,17 +4,17 @@ use Mouse::Util qw(:meta not_supported english_list); # enables strict and warni
 use Mouse::Meta::Module;
 our @ISA = qw(Mouse::Meta::Module);
 
-sub method_metaclass(){ 'Mouse::Meta::Role::Method' } # required for get_method()
+sub method_metaclass;
 
 sub _construct_meta {
     my $class = shift;
 
     my %args  = @_;
 
-    $args{methods}          ||= {};
-    $args{attributes}       ||= {};
-    $args{required_methods} ||= [];
-    $args{roles}            ||= [];
+    $args{methods}          = {};
+    $args{attributes}       = {};
+    $args{required_methods} = [];
+    $args{roles}            = [];
 
     my $self = bless \%args, ref($class) || $class;
     if($class ne __PACKAGE__){
@@ -29,11 +29,16 @@ sub create_anon_role{
     return $self->create(undef, @_);
 }
 
-sub is_anon_role{
-    return exists $_[0]->{anon_serial_id};
-}
+sub is_anon_role;
+
+sub get_roles;
 
-sub get_roles { $_[0]->{roles} }
+sub calculate_all_roles {
+    my $self = shift;
+    my %seen;
+    return grep { !$seen{ $_->name }++ }
+           ($self, map  { $_->calculate_all_roles } @{ $self->get_roles });
+}
 
 sub get_required_method_list{
     return @{ $_[0]->{required_methods} };
@@ -56,6 +61,7 @@ sub add_attribute {
     my $name = shift;
 
     $self->{attributes}->{$name} = (@_ == 1) ? $_[0] : { @_ };
+    return;
 }
 
 sub _check_required_methods{
@@ -65,20 +71,22 @@ sub _check_required_methods{
         $applicant->add_required_methods($role->get_required_method_list);
     }
     else{ # to class or instance
-        my $class_name = $applicant->name;
-        my $role_name  = $role->name;
+        my $applicant_class_name = $applicant->name;
+
         my @missing;
         foreach my $method_name(@{$role->{required_methods}}){
-            if(!($class_name->can($method_name) || exists $args->{to_be_provided}{$method_name})){
-                push @missing, $method_name;
-            }
+            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){
-            $role->throw_error("'$role_name' requires the "
-                . (@missing == 1 ? 'method' : 'methods')
-                . " "
-                . english_list(map{ sprintf q{'%s'}, $_ } @missing)
-                . " to be implemented by '$class_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);
         }
     }
 
@@ -88,9 +96,6 @@ sub _check_required_methods{
 sub _apply_methods{
     my($role, $applicant, $args) = @_;
 
-    my $role_name  = $role->name;
-    my $class_name = $applicant->name;
-
     my $alias    = $args->{-alias};
     my $excludes = $args->{-excludes};
 
@@ -99,14 +104,14 @@ sub _apply_methods{
 
         my $code = $role->get_method_body($method_name);
 
-        if($excludes && !exists $excludes->{$method_name}){
+        if(!exists $excludes->{$method_name}){
             if(!$applicant->has_method($method_name)){
-                # The third argument, $role, is used in Role::Composite
+                # 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 = $applicant->get_method_body($dstname);
@@ -137,16 +142,21 @@ sub _apply_attributes{
 sub _apply_modifiers{
     my($role, $applicant, $args) = @_;
 
-    for my $modifier_type (qw/override before around after/) {
+    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;
 
         my $add_modifier = "add_${modifier_type}_method_modifier";
 
         foreach my $method_name (keys %{$modifiers}){
-            my $modifier_codes = $modifiers->{$method_name};
-            foreach my $code(ref($modifier_codes) eq 'ARRAY' ? @{$modifier_codes} : $modifier_codes){
-                next if $applicant->{"_$modifier_type"}{$code}++; # skip applied 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);
             }
         }
@@ -174,22 +184,22 @@ sub apply {
 
     my %args = (@_ == 1) ? %{ $_[0] } : @_;
 
-    if($applicant->isa('Mouse::Meta::Class')){  # Application::ToClass
+    my $instance;
+
+    if(Mouse::Util::is_a_metaclass($applicant)){  # Application::ToClass
         $args{_to} = 'class';
     }
-    elsif($applicant->isa('Mouse::Meta::Role')){ # Application::ToRole
+    elsif(Mouse::Util::is_a_metarole($applicant)){ # Application::ToRole
         $args{_to} = 'role';
     }
     else{                                       # Appplication::ToInstance
         $args{_to} = 'instance';
+        $instance = $applicant;
 
-        my $metaclass = $applicant->meta->create_anon_class(
-            superclasses => [ref $applicant],
+        $applicant = (Mouse::Util::class_of($instance) || 'Mouse::Meta::Class')->create_anon_class(
+            superclasses => [ref $instance],
             cache        => 1,
         );
-        bless $applicant, $metaclass->name; # rebless
-
-        $applicant = $metaclass;
     }
 
     if($args{alias} && !exists $args{-alias}){
@@ -199,12 +209,10 @@ sub apply {
         $args{-excludes} = $args{excludes};
     }
 
-    # In Moose it is called 'aliased methods'
-    $args{to_be_provided} = {};
+    $args{aliased_methods} = {};
     if(my $alias = $args{-alias}){
-        @{$args{to_be_provided}}{ values %{$alias} } = ();
+        @{$args{aliased_methods}}{ values %{$alias} } = ();
     }
-    @{ $args{to_be_provided} }{ $self->get_method_list } = ();
 
     if(my $excludes = $args{-excludes}){
         $args{-excludes} = {}; # replace with a hash ref
@@ -221,6 +229,14 @@ sub apply {
     $self->_apply_methods($applicant, \%args);
     $self->_apply_modifiers($applicant, \%args);
     $self->_append_roles($applicant, \%args);
+
+
+    if(defined $instance){ # Application::ToInstance
+        # rebless instance
+        bless $instance, $applicant->name;
+        $applicant->_initialize_object($instance, $instance);
+    }
+
     return;
 }
 
@@ -239,29 +255,36 @@ sub combine {
     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} ||= [] }
-    };
-
-    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;
+sub add_before_method_modifier {
+    my ($self, $method_name, $method) = @_;
+
+    push @{ $self->{before_method_modifiers}{$method_name} ||= [] }, $method;
+    return;
+}
+sub add_around_method_modifier {
+    my ($self, $method_name, $method) = @_;
+
+    push @{ $self->{around_method_modifiers}{$method_name} ||= [] }, $method;
+    return;
+}
+sub add_after_method_modifier {
+    my ($self, $method_name, $method) = @_;
+
+    push @{ $self->{after_method_modifiers}{$method_name} ||= [] }, $method;
+    return;
+}
+
+sub get_before_method_modifiers {
+    my ($self, $method_name) = @_;
+    return @{ $self->{before_method_modifiers}{$method_name} ||= [] }
+}
+sub get_around_method_modifiers {
+    my ($self, $method_name) = @_;
+    return @{ $self->{around_method_modifiers}{$method_name} ||= [] }
+}
+sub get_after_method_modifiers {
+    my ($self, $method_name) = @_;
+    return @{ $self->{after_method_modifiers}{$method_name} ||= [] }
 }
 
 sub add_override_method_modifier{
@@ -278,23 +301,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) = @_;
 
@@ -310,15 +321,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.40_06
+
 =head1 SEE ALSO
 
 L<Moose::Meta::Role>