X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FRole.pm;h=b7d0b5be6296d1c6b3283133b7ccc6da7ae20789;hb=d468e99669162209fc407bc22706a91b8675dbbc;hp=b9f6b38707f1e48ebf09d25266edf40fb0fa6e95;hpb=fce211ae5c3943a1b041b9c0985c4daf189fb8a8;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index b9f6b38..b7d0b5b 100644
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -1,224 +1,118 @@
 package Mouse::Meta::Role;
-use strict;
-use warnings;
+use Mouse::Util qw(:meta); # enables strict and warnings
 
-use Mouse::Util qw(not_supported);
-use base qw(Mouse::Meta::Module);
+use Mouse::Meta::Module;
+our @ISA = qw(Mouse::Meta::Module);
 
-sub _new {
+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}            = [];
 
-    bless \%args, $class;
+    my $self = bless \%args, ref($class) || $class;
+    if($class ne __PACKAGE__){
+        $self->meta->_initialize_object($self, \%args);
+    }
+    return $self;
 }
 
-sub get_roles { $_[0]->{roles} }
-
-
-sub add_required_methods {
+sub create_anon_role{
     my $self = shift;
-    my @methods = @_;
-    push @{$self->{required_methods}}, @methods;
+    return $self->create(undef, @_);
 }
 
-sub add_attribute {
-    my $self = shift;
-    my $name = shift;
-    my $spec = shift;
-    $self->{attributes}->{$name} = $spec;
-}
+sub is_anon_role;
 
-sub _check_required_methods{
-    my($role, $class, $args, @other_roles) = @_;
-
-    if($class->isa('Mouse::Meta::Class')){
-        my $class_name = $class->name;
-        foreach my $method_name(@{$role->{required_methods}}){
-            unless($class_name->can($method_name)){
-                my $role_name       = $role->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;
-                    }
-                }
-                
-                $role->throw_error("'$role_name' requires the method '$method_name' to be implemented by '$class_name'")
-                    unless $has_method;
-            }
-        }
-    }
+sub get_roles;
 
-    return;
+sub calculate_all_roles {
+    my $self = shift;
+    my %seen;
+    return grep { !$seen{ $_->name }++ }
+           ($self, map  { $_->calculate_all_roles } @{ $self->get_roles });
 }
 
-sub _apply_methods{
-    my($role, $class, $args) = @_;
-
-    my $role_name  = $role->name;
-    my $class_name = $class->name;
-    my $alias      = $args->{alias};
-
-    foreach my $method_name($role->get_method_list){
-        next if $method_name eq 'meta';
-
-        my $code = $role_name->can($method_name);
-        if(do{ no strict 'refs'; defined &{$class_name . '::' . $method_name} }){
-            # XXX what's Moose's behavior?
-        }
-        else{
-            $class->add_method($method_name => $code);
-        }
-
-        if($alias && $alias->{$method_name}){
-            my $dstname = $alias->{$method_name};
-            if(do{ no strict 'refs'; defined &{$class_name . '::' . $dstname} }){
-                # XXX wat's Moose's behavior?
-            }
-            else{
-                $class->add_method($dstname => $code);
-            }
-        }
-    }
-
-    return;
+sub get_required_method_list{
+    return @{ $_[0]->{required_methods} };
 }
 
-sub _apply_attributes{
-    my($role, $class, $args) = @_;
-
-    if ($class->isa('Mouse::Meta::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);
-
-            my $attr_metaclass = 'Mouse::Meta::Attribute';
-            if ( my $metaclass_name = $spec->{metaclass} ) {
-                $attr_metaclass = Mouse::Util::resolve_metaclass_alias(
-                    'Attribute',
-                    $metaclass_name
-                );
-            }
-
-            $attr_metaclass->create($class, $attr_name => %$spec);
-        }
-    } else {
-        # apply role to role
-        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);
-        }
-    }
-
+sub add_required_methods {
+    my($self, @methods) = @_;
+    my %required = map{ $_ => 1 } @{$self->{required_methods}};
+    push @{$self->{required_methods}}, grep{ !$required{$_}++ && !$self->has_method($_) } @methods;
     return;
 }
 
-sub _apply_modifiers{
-    my($role, $class, $args) = @_;
-
-    for my $modifier_type (qw/before after around override/) {
-        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(@{$modifier_codes}){
-                $class->$add_modifier($method_name => $code);
-            }
-        }
-    }
-    return;
+sub requires_method {
+    my($self, $name) = @_;
+    return scalar( grep{ $_ eq $name } @{ $self->{required_methods} } ) != 0;
 }
 
-sub _append_roles{
-    my($role, $class, $args) = @_;
-
-    my $roles = $class->isa('Mouse::Meta::Class') ? $class->roles : $class->get_roles;
+sub add_attribute {
+    my $self = shift;
+    my $name = shift;
 
-    foreach my $r($role, @{$role->get_roles}){
-        if(!$class->does_role($r->name)){
-            push @{$roles}, $r;
-        }
-    }
+    $self->{attributes}->{$name} = (@_ == 1) ? $_[0] : { @_ };
     return;
 }
 
-# Moose uses Application::ToInstance, Application::ToClass, Application::ToRole
 sub apply {
-    my($self, $class, %args) = @_;
+    my $self     = shift;
+    my $consumer = shift;
 
-    if ($class->isa('Mouse::Object')) {
-        not_supported 'Application::ToInstance';
-    }
+    require 'Mouse/Meta/Role/Application.pm';
+    return Mouse::Meta::Role::Application->new(@_)->apply($self, $consumer);
+}
 
-    $self->_check_required_methods($class, \%args);
-    $self->_apply_methods($class, \%args);
-    $self->_apply_attributes($class, \%args);
-    $self->_apply_modifiers($class, \%args);
-    $self->_append_roles($class, \%args);
-    return;
+sub combine {
+    my($self, @role_specs) = @_;
+
+    require 'Mouse/Meta/Role/Composite.pm';
+    return Mouse::Meta::Role::Composite->new(roles => \@role_specs);
 }
 
-sub combine_apply {
-    my(undef, $class, @roles) = @_;
+sub add_before_method_modifier;
+sub add_around_method_modifier;
+sub add_after_method_modifier;
 
-    foreach my $role_spec (@roles) {
-        my($role_name, $args) = @{$role_spec};
+sub get_before_method_modifiers;
+sub get_around_method_modifiers;
+sub get_after_method_modifiers;
 
-        my $role = $role_name->meta;
+sub add_override_method_modifier{
+    my($self, $method_name, $method) = @_;
 
-        $role->_check_required_methods($class, $args, @roles);
-        $role->_apply_methods($class, $args);
-        $role->_apply_attributes($class, $args);
-        $role->_apply_modifiers($class, $args);
-        $role->_append_roles($class, $args);
+    if($self->has_method($method_name)){
+        # This error happens in the override keyword or during role composition,
+        # so I added a message, "A local method of ...", only for compatibility (gfx)
+        $self->throw_error("Cannot add an override of method '$method_name' "
+                   . "because there is a local version of '$method_name'"
+                   . "(A local method of the same name as been found)");
     }
-    return;
+
+    $self->{override_method_modifiers}->{$method_name} = $method;
 }
 
-for my $modifier_type (qw/before after around override/) {
-
-    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 get_override_method_modifier {
+    my ($self, $method_name) = @_;
+    return $self->{override_method_modifiers}->{$method_name};
 }
 
-# This is currently not passing all the Moose tests.
 sub does_role {
     my ($self, $role_name) = @_;
 
     (defined $role_name)
         || $self->throw_error("You must supply a role name to look for");
 
+    $role_name = $role_name->name if ref $role_name;
+
     # if we are it,.. then return true
     return 1 if $role_name eq $self->name;
     # otherwise.. check our children
@@ -228,6 +122,24 @@ sub does_role {
     return 0;
 }
 
-
 1;
+__END__
+
+=head1 NAME
+
+Mouse::Meta::Role - The Mouse Role metaclass
+
+=head1 VERSION
+
+This document describes Mouse version 0.92
+
+=head1 DESCRIPTION
+
+This class is a meta object protocol for Mouse roles,
+which is a subset of Moose::Meta:::Role.
+
+=head1 SEE ALSO
+
+L<Moose::Meta::Role>
 
+=cut