X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=4910f72bf737aa7244cdebfb97931869c016be96;hb=8a168350bb0fea8bdae0034bc89fcdbe81f85ddc;hp=90370443e3716c13df4cd008281c69778ede0a9f;hpb=2e92bb89f22acc49ce81b6ec6593d6190559ac45;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index 9037044..4910f72 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -1,9 +1,10 @@
-#!/usr/bin/env perl
 package Mouse::Meta::Role;
 use strict;
 use warnings;
 use Carp 'confess';
 
+use Mouse::Util qw(version authority identifier);
+
 do {
     my %METACLASS_CACHE;
 
@@ -30,6 +31,7 @@ sub new {
 
     $args{attributes}       ||= {};
     $args{required_methods} ||= [];
+    $args{roles}            ||= [];
 
     bless \%args, $class;
 }
@@ -42,6 +44,8 @@ sub add_required_methods {
     push @{$self->{required_methods}}, @methods;
 }
 
+
+
 sub add_attribute {
     my $self = shift;
     my $name = shift;
@@ -60,44 +64,86 @@ sub get_method_list {
 
     no strict 'refs';
     # Get all the CODE symbol table entries
-    my @functions = grep !/^meta$/,
-      grep { /\A[^\W\d]\w*\z/o }
+    my @functions =
+      grep !/^(?:has|with|around|before|after|augment|inner|override|super|blessed|extends|confess|excludes|requires)$/,
       grep { defined &{"${name}::$_"} }
       keys %{"${name}::"};
     wantarray ? @functions : \@functions;
 }
 
+# Moose uses Application::ToInstance, Application::ToClass, Application::ToRole
 sub apply {
     my $self  = shift;
     my $selfname = $self->name;
     my $class = shift;
     my $classname = $class->name;
+    my %args  = @_;
 
-    for my $name (@{$self->{required_methods}}) {
-        unless ($classname->can($name)) {
-            confess "'$selfname' requires the method '$name' to be implemented by '$classname'";
+    if ($class->isa('Mouse::Object')) {
+        Carp::croak('Mouse does not support Application::ToInstance yet');
+    }
+
+    if ($class->isa('Mouse::Meta::Class')) {
+        for my $name (@{$self->{required_methods}}) {
+            unless ($classname->can($name)) {
+                confess "'$selfname' requires the method '$name' to be implemented by '$classname'";
+            }
         }
     }
 
     {
         no strict 'refs';
         for my $name ($self->get_method_list) {
-            next if $name eq 'has' || $name eq 'requires' || $name eq 'meta' || $name eq 'with' || $name eq 'around' || $name eq 'before' || $name eq 'after' || $name eq 'blessed' || $name eq 'extends' || $name eq 'confess' || $name eq 'excludes';
-            if ($classname->can($name)) {
+            next if $name eq 'meta';
+
+            my $class_function = "${classname}::${name}";
+            my $role_function = "${selfname}::${name}";
+            if (defined &$class_function) {
                 # XXX what's Moose's behavior?
-                next;
+                #next;
+            } else {
+                *{$class_function} = \&{$role_function};
+            }
+            if ($args{alias} && $args{alias}->{$name}) {
+                my $dstname = $args{alias}->{$name};
+                unless ($classname->can($dstname)) {
+                    *{"${classname}::${dstname}"} = \&$role_function;
+                }
             }
-            *{"${classname}::${name}"} = *{"${selfname}::${name}"};
         }
     }
 
-    for my $name ($self->get_attribute_list) {
-        next if $class->has_attribute($name);
-        my $spec = $self->get_attribute($name);
-        Mouse::Meta::Attribute->create($class, $name, %$spec);
+    if ($class->isa('Mouse::Meta::Class')) {
+        # apply role to class
+        for my $name ($self->get_attribute_list) {
+            next if $class->has_attribute($name);
+            my $spec = $self->get_attribute($name);
+
+            my $metaclass = 'Mouse::Meta::Attribute';
+            if ( my $metaclass_name = $spec->{metaclass} ) {
+                my $new_class = Mouse::Util::resolve_metaclass_alias(
+                    'Attribute',
+                    $metaclass_name
+                );
+                if ( $metaclass ne $new_class ) {
+                    $metaclass = $new_class;
+                }
+            }
+
+            $metaclass->create($class, $name, %$spec);
+        }
+    } else {
+        # apply role to role
+        # XXX Room for speed improvement
+        for my $name ($self->get_attribute_list) {
+            next if $class->has_attribute($name);
+            my $spec = $self->get_attribute($name);
+            $class->add_attribute($name, $spec);
+        }
     }
 
-    for my $modifier_type (qw/before after around/) {
+    # XXX Room for speed improvement in role to role
+    for my $modifier_type (qw/before after around override/) {
         my $add_method = "add_${modifier_type}_method_modifier";
         my $modified = $self->{"${modifier_type}_method_modifiers"};
 
@@ -107,9 +153,122 @@ sub apply {
             }
         }
     }
+
+    # append roles
+    push @{ $class->roles }, $self, @{ $self->roles };
+}
+
+sub combine_apply {
+    my(undef, $class, @roles) = @_;
+    my $classname = $class->name;
+
+    if ($class->isa('Mouse::Meta::Class')) {
+        for my $role_spec (@roles) {
+            my $self = $role_spec->[0]->meta;
+            for my $name (@{$self->{required_methods}}) {
+                unless ($classname->can($name)) {
+                    my $method_required = 0;
+                    for my $role (@roles) {
+                        $method_required = 1 if $self->name ne $role->[0] && $role->[0]->can($name);
+                    }
+                    confess "'".$self->name."' requires the method '$name' to be implemented by '$classname'"
+                        unless $method_required;
+                }
+            }
+        }
+    }
+
+    {
+        no strict 'refs';
+        for my $role_spec (@roles) {
+            my $self = $role_spec->[0]->meta;
+            my $selfname = $self->name;
+            my %args = %{ $role_spec->[1] };
+            for my $name ($self->get_method_list) {
+                next if $name eq 'meta';
+
+                my $class_function = "${classname}::${name}";
+                my $role_function = "${selfname}::${name}";
+                if (defined &$class_function) {
+                    # XXX what's Moose's behavior?
+                    #next;
+                } else {
+                    *$class_function = *$role_function;
+                }
+                if ($args{alias} && $args{alias}->{$name}) {
+                    my $dstname = $args{alias}->{$name};
+                    unless ($classname->can($dstname)) {
+                        *{"${classname}::${dstname}"} = \&$role_function;
+                    }
+                }
+            }
+        }
+    }
+
+
+    if ($class->isa('Mouse::Meta::Class')) {
+        # apply role to class
+        for my $role_spec (@roles) {
+            my $self = $role_spec->[0]->meta;
+            for my $name ($self->get_attribute_list) {
+                next if $class->has_attribute($name);
+                my $spec = $self->get_attribute($name);
+
+                my $metaclass = 'Mouse::Meta::Attribute';
+                if ( my $metaclass_name = $spec->{metaclass} ) {
+                    my $new_class = Mouse::Util::resolve_metaclass_alias(
+                        'Attribute',
+                        $metaclass_name
+                    );
+                    if ( $metaclass ne $new_class ) {
+                        $metaclass = $new_class;
+                    }
+                }
+
+                $metaclass->create($class, $name, %$spec);
+            }
+        }
+    } else {
+        # apply role to role
+        # XXX Room for speed improvement
+        for my $role_spec (@roles) {
+            my $self = $role_spec->[0]->meta;
+            for my $name ($self->get_attribute_list) {
+                next if $class->has_attribute($name);
+                my $spec = $self->get_attribute($name);
+                $class->add_attribute($name, $spec);
+            }
+        }
+    }
+
+    # XXX Room for speed improvement in role to role
+    for my $modifier_type (qw/before after around override/) {
+        my $add_method = "add_${modifier_type}_method_modifier";
+        for my $role_spec (@roles) {
+            my $self = $role_spec->[0]->meta;
+            my $modified = $self->{"${modifier_type}_method_modifiers"};
+
+            for my $method_name (keys %$modified) {
+                for my $code (@{ $modified->{$method_name} }) {
+                    $class->$add_method($method_name => $code);
+                }
+            }
+        }
+    }
+
+    # append roles
+    my %role_apply_cache;
+    my $apply_roles = $class->roles;
+    for my $role_spec (@roles) {
+        my $self = $role_spec->[0]->meta;
+        push @$apply_roles, $self unless $role_apply_cache{$self}++;
+        for my $role (@{ $self->roles }) {
+            push @$apply_roles, $role unless $role_apply_cache{$role}++;
+        }
+    }
 }
 
-for my $modifier_type (qw/before after around/) {
+for my $modifier_type (qw/before after around override/) {
     no strict 'refs';
     *{ __PACKAGE__ . '::' . "add_${modifier_type}_method_modifier" } = sub {
         my ($self, $method_name, $method) = @_;
@@ -124,5 +283,25 @@ for my $modifier_type (qw/before after around/) {
     };
 }
 
+sub roles { $_[0]->{roles} }
+
+
+# This is currently not passing all the Moose tests.
+sub does_role {
+    my ($self, $role_name) = @_;
+
+    (defined $role_name)
+        || confess "You must supply a role name to look for";
+
+    # if we are it,.. then return true
+    return 1 if $role_name eq $self->name;
+
+    for my $role (@{ $self->{roles} }) {
+        return 1 if $role->does_role($role_name);
+    }
+    return 0;
+}
+
+
 1;