X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=82adf76a178c11b69c30eb735794999471512720;hb=bf26e705ee212b31786d7d9a264830041936c3ba;hp=cf74e9b5fea201dc844a74955c8fd2bd13398435;hpb=d67145edcc2653d4936d9395e5d63405332b4c1b;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index cf74e9b..82adf76 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -5,11 +5,11 @@ use strict; use warnings; use metaclass; -use Carp 'confess'; use Scalar::Util 'blessed'; -use B 'svref_2object'; +use Carp 'confess'; -our $VERSION = '0.09'; +our $VERSION = '0.61'; +$VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Class; @@ -18,12 +18,17 @@ use Moose::Meta::Role::Method::Required; use base 'Class::MOP::Module'; - -# NOTE: -# I normally don't do this, but I am doing -# a whole bunch of meta-programmin in this -# module, so it just makes sense. -# - SL +## ------------------------------------------------------------------ +## NOTE: +## I normally don't do this, but I am doing +## a whole bunch of meta-programmin in this +## module, so it just makes sense. For a clearer +## picture of what is going on in the next +## several lines of code, look at the really +## big comment at the end of this file (right +## before the POD). +## - SL +## ------------------------------------------------------------------ my $META = __PACKAGE__->meta; @@ -32,49 +37,40 @@ my $META = __PACKAGE__->meta; # NOTE: # since roles are lazy, we hold all the attributes -# of the individual role in 'statis' until which -# time when it is applied to a class. This means -# keeping a lot of things in hash maps, so we are +# of the individual role in 'statis' until which +# time when it is applied to a class. This means +# keeping a lot of things in hash maps, so we are # using a little of that meta-programmin' magic -# here an saving lots of extra typin. -# - SL - -$META->add_attribute($_->{name} => ( - reader => $_->{reader}, - default => sub { {} } -)) for ( - { name => 'excluded_roles_map', reader => 'get_excluded_roles_map' }, - { name => 'attribute_map', reader => 'get_attribute_map' }, - { name => 'required_methods', reader => 'get_required_methods_map' }, -); - -# NOTE: -# many of these attributes above require similar -# functionality to support them, so we again use -# the wonders of meta-programmin' to deliver a +# here an saving lots of extra typin. And since +# many of these attributes above require similar +# functionality to support them, so we again use +# the wonders of meta-programmin' to deliver a # very compact solution to this normally verbose # problem. # - SL foreach my $action ( - { - attr_reader => 'get_excluded_roles_map' , + { + name => 'excluded_roles_map', + attr_reader => 'get_excluded_roles_map' , methods => { - add => 'add_excluded_roles', - get_list => 'get_excluded_roles_list', - existence => 'excludes_role', + add => 'add_excluded_roles', + get_list => 'get_excluded_roles_list', + existence => 'excludes_role', } }, - { + { + name => 'required_methods', attr_reader => 'get_required_methods_map', methods => { - add => 'add_required_methods', + add => 'add_required_methods', remove => 'remove_required_methods', get_list => 'get_required_method_list', existence => 'requires_method', } - }, + }, { + name => 'attribute_map', attr_reader => 'get_attribute_map', methods => { get => 'get_attribute', @@ -84,34 +80,41 @@ foreach my $action ( } } ) { - + my $attr_reader = $action->{attr_reader}; my $methods = $action->{methods}; - + + # create the attribute + $META->add_attribute($action->{name} => ( + reader => $attr_reader, + default => sub { {} } + )); + + # create some helper methods $META->add_method($methods->{add} => sub { my ($self, @values) = @_; - $self->$attr_reader->{$_} = undef foreach @values; + $self->$attr_reader->{$_} = undef foreach @values; }) if exists $methods->{add}; - + $META->add_method($methods->{get_list} => sub { my ($self) = @_; - keys %{$self->$attr_reader}; - }) if exists $methods->{get_list}; - + keys %{$self->$attr_reader}; + }) if exists $methods->{get_list}; + $META->add_method($methods->{get} => sub { my ($self, $name) = @_; - $self->$attr_reader->{$name} - }) if exists $methods->{get}; - + $self->$attr_reader->{$name} + }) if exists $methods->{get}; + $META->add_method($methods->{existence} => sub { my ($self, $name) = @_; - exists $self->$attr_reader->{$name} ? 1 : 0; - }) if exists $methods->{existence}; - + exists $self->$attr_reader->{$name} ? 1 : 0; + }) if exists $methods->{existence}; + $META->add_method($methods->{remove} => sub { my ($self, @values) = @_; delete $self->$attr_reader->{$_} foreach @values; - }) if exists $methods->{remove}; + }) if exists $methods->{remove}; } ## some things don't always fit, so they go here ... @@ -119,6 +122,8 @@ foreach my $action ( sub add_attribute { my $self = shift; my $name = shift; + (defined $name && $name) + || Moose->throw_error("You must provide a name for the attribute"); my $attr_desc; if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { $attr_desc = $_[0]; @@ -129,29 +134,20 @@ sub add_attribute { $self->get_attribute_map->{$name} = $attr_desc; } -sub _clean_up_required_methods { - my $self = shift; - foreach my $method ($self->get_required_method_list) { - $self->remove_required_methods($method) - if $self->has_method($method); - } -} +# DEPRECATED +# sub _clean_up_required_methods { +# my $self = shift; +# foreach my $method ($self->get_required_method_list) { +# $self->remove_required_methods($method) +# if $self->has_method($method); +# } +# } ## ------------------------------------------------------------------ ## method modifiers -$META->add_attribute($_->{name} => ( - reader => $_->{reader}, - default => sub { {} } -)) for ( - { name => 'before_method_modifiers', reader => 'get_before_method_modifiers_map' }, - { name => 'after_method_modifiers', reader => 'get_after_method_modifiers_map' }, - { name => 'around_method_modifiers', reader => 'get_around_method_modifiers_map' }, - { name => 'override_method_modifiers', reader => 'get_override_method_modifiers_map' }, -); - # NOTE: -# the before/around/after method modifiers are +# the before/around/after method modifiers are # stored by name, but there can be many methods # then associated with that name. So again we have # lots of similar functionality, so we can do some @@ -159,48 +155,61 @@ $META->add_attribute($_->{name} => ( # - SL foreach my $modifier_type (qw[ before around after ]) { + + my $attr_reader = "get_${modifier_type}_method_modifiers_map"; - my $attr_reader = "get_${modifier_type}_method_modifiers_map"; - + # create the attribute ... + $META->add_attribute("${modifier_type}_method_modifiers" => ( + reader => $attr_reader, + default => sub { {} } + )); + + # and some helper methods ... $META->add_method("get_${modifier_type}_method_modifiers" => sub { my ($self, $method_name) = @_; + #return () unless exists $self->$attr_reader->{$method_name}; @{$self->$attr_reader->{$method_name}}; }); - + $META->add_method("has_${modifier_type}_method_modifiers" => sub { my ($self, $method_name) = @_; # NOTE: - # for now we assume that if it exists,.. + # for now we assume that if it exists,.. # it has at least one modifier in it (exists $self->$attr_reader->{$method_name}) ? 1 : 0; - }); - + }); + $META->add_method("add_${modifier_type}_method_modifier" => sub { my ($self, $method_name, $method) = @_; - - $self->$attr_reader->{$method_name} = [] + + $self->$attr_reader->{$method_name} = [] unless exists $self->$attr_reader->{$method_name}; - + my $modifiers = $self->$attr_reader->{$method_name}; - + # NOTE: - # check to see that we aren't adding the - # same code twice. We err in favor of the + # check to see that we aren't adding the + # same code twice. We err in favor of the # first on here, this may not be as expected foreach my $modifier (@{$modifiers}) { return if $modifier == $method; } - + push @{$modifiers} => $method; }); - + } ## ------------------------------------------------------------------ ## override method mofidiers +$META->add_attribute('override_method_modifiers' => ( + reader => 'get_override_method_modifiers_map', + default => sub { {} } +)); + # NOTE: -# these are a little different because there +# these are a little different because there # can only be one per name, whereas the other # method modifiers can have multiples. # - SL @@ -208,32 +217,40 @@ foreach my $modifier_type (qw[ before around after ]) { sub add_override_method_modifier { my ($self, $method_name, $method) = @_; (!$self->has_method($method_name)) - || confess "Cannot add an override of method '$method_name' " . - "because there is a local version of '$method_name'"; - $self->get_override_method_modifiers_map->{$method_name} = $method; + || Moose->throw_error("Cannot add an override of method '$method_name' " . + "because there is a local version of '$method_name'"); + $self->get_override_method_modifiers_map->{$method_name} = $method; } sub has_override_method_modifier { my ($self, $method_name) = @_; # NOTE: - # for now we assume that if it exists,.. + # for now we assume that if it exists,.. # it has at least one modifier in it - (exists $self->get_override_method_modifiers_map->{$method_name}) ? 1 : 0; + (exists $self->get_override_method_modifiers_map->{$method_name}) ? 1 : 0; } sub get_override_method_modifier { my ($self, $method_name) = @_; - $self->get_override_method_modifiers_map->{$method_name}; + $self->get_override_method_modifiers_map->{$method_name}; } ## general list accessor ... sub get_method_modifier_list { my ($self, $modifier_type) = @_; - my $accessor = "get_${modifier_type}_method_modifiers_map"; + my $accessor = "get_${modifier_type}_method_modifiers_map"; keys %{$self->$accessor}; } +sub reset_package_cache_flag { (shift)->{'_package_cache_flag'} = undef } +sub update_package_cache_flag { + my $self = shift; + $self->{'_package_cache_flag'} = Class::MOP::check_package_cache_flag($self->name); +} + + + ## ------------------------------------------------------------------ ## subroles @@ -245,25 +262,25 @@ __PACKAGE__->meta->add_attribute('roles' => ( sub add_role { my ($self, $role) = @_; (blessed($role) && $role->isa('Moose::Meta::Role')) - || confess "Roles must be instances of Moose::Meta::Role"; + || Moose->throw_error("Roles must be instances of Moose::Meta::Role"); push @{$self->get_roles} => $role; + $self->reset_package_cache_flag; } sub calculate_all_roles { my $self = shift; my %seen; - grep { - !$seen{$_->name}++ - } ($self, - map { - $_->calculate_all_roles - } @{ $self->get_roles }); + grep { + !$seen{$_->name}++ + } ($self, map { + $_->calculate_all_roles + } @{ $self->get_roles }); } sub does_role { my ($self, $role_name) = @_; (defined $role_name) - || confess "You must supply a role name to look for"; + || Moose->throw_error("You must supply a role name to look for"); # if we are it,.. then return true return 1 if $role_name eq $self->name; # otherwise.. check our children @@ -274,310 +291,423 @@ sub does_role { } ## ------------------------------------------------------------------ -## methods +## methods sub method_metaclass { 'Moose::Meta::Role::Method' } -# FIXME: -# this is an UGLY hack -sub get_method_map { +sub get_method_map { my $self = shift; - $self->{'%!methods'} ||= {}; - $self->Moose::Meta::Class::get_method_map() + + my $current = Class::MOP::check_package_cache_flag($self->name); + + if (defined $self->{'_package_cache_flag'} && $self->{'_package_cache_flag'} == $current) { + return $self->{'methods'} ||= {}; + } + + $self->{_package_cache_flag} = $current; + + my $map = $self->{'methods'} ||= {}; + + my $role_name = $self->name; + my $method_metaclass = $self->method_metaclass; + + my %all_code = $self->get_all_package_symbols('CODE'); + + foreach my $symbol (keys %all_code) { + my $code = $all_code{$symbol}; + + next if exists $map->{$symbol} && + defined $map->{$symbol} && + $map->{$symbol}->body == $code; + + my ($pkg, $name) = Class::MOP::get_code_info($code); + + if ($pkg->can('meta') + # NOTE: + # we don't know what ->meta we are calling + # here, so we need to be careful cause it + # just might blow up at us, or just complain + # loudly (in the case of Curses.pm) so we + # just be a little overly cautious here. + # - SL + && eval { no warnings; blessed($pkg->meta) } # FIXME calls meta + && $pkg->meta->isa('Moose::Meta::Role')) { + my $role = $pkg->meta->name; + next unless $self->does_role($role); + } + else { + # NOTE: + # in 5.10 constant.pm the constants show up + # as being in the right package, but in pre-5.10 + # they show up as constant::__ANON__ so we + # make an exception here to be sure that things + # work as expected in both. + # - SL + unless ($pkg eq 'constant' && $name eq '__ANON__') { + next if ($pkg || '') ne $role_name || + (($name || '') ne '__ANON__' && ($pkg || '') ne $role_name); + } + } + + $map->{$symbol} = $method_metaclass->wrap( + $code, + package_name => $role_name, + name => $name + ); + } + + return $map; } -# FIXME: -# Yes, this is a really really UGLY hack -# but it works, and until I can figure -# out a better way, this is gonna be it. +sub get_method { + my ($self, $name) = @_; + $self->get_method_map->{$name}; +} -sub get_method { (shift)->Moose::Meta::Class::get_method(@_) } -sub has_method { (shift)->Moose::Meta::Class::has_method(@_) } -sub alias_method { (shift)->Moose::Meta::Class::alias_method(@_) } -sub get_method_list { - grep { - !/^meta$/ - } (shift)->Moose::Meta::Class::get_method_list(@_) +sub has_method { + my ($self, $name) = @_; + exists $self->get_method_map->{$name} ? 1 : 0 +} + +# FIXME this is copy-pasted from Class::MOP::Class +# refactor to inherit from some common base +sub wrap_method_body { + my ( $self, %args ) = @_; + + ('CODE' eq ref $args{body}) + || Moose->throw_error("Your code block must be a CODE reference"); + + $self->method_metaclass->wrap( + package_name => $self->name, + %args, + ); +} + +sub add_method { + my ($self, $method_name, $method) = @_; + (defined $method_name && $method_name) + || Moose->throw_error("You must define a method name"); + + my $body; + if (blessed($method)) { + $body = $method->body; + if ($method->package_name ne $self->name) { + $method = $method->clone( + package_name => $self->name, + name => $method_name + ) if $method->can('clone'); + } + } + else { + $body = $method; + $method = $self->wrap_method_body( body => $body, name => $method_name ); + } + + $method->attach_to_class($self); + + $self->get_method_map->{$method_name} = $method; + + my $full_method_name = ($self->name . '::' . $method_name); + $self->add_package_symbol( + { sigil => '&', type => 'CODE', name => $method_name }, + Class::MOP::subname($full_method_name => $body) + ); + + $self->update_package_cache_flag; # still valid, since we just added the method to the map, and if it was invalid before that then get_method_map updated it } sub find_method_by_name { (shift)->get_method(@_) } +sub get_method_list { + my $self = shift; + grep { !/^meta$/ } keys %{$self->get_method_map}; +} + +sub alias_method { + my $self = shift; + + $self->add_method(@_); +} + ## ------------------------------------------------------------------ -## role construction +## role construction ## ------------------------------------------------------------------ -my $anon_counter = 0; - sub apply { - my ($self, $other) = @_; - - unless ($other->isa('Moose::Meta::Class') || $other->isa('Moose::Meta::Role')) { - - # Runtime Role mixins - - # FIXME: - # We really should do this better, and - # cache the results of our efforts so - # that we don't need to repeat them. - - my $pkg_name = __PACKAGE__ . "::__RUNTIME_ROLE_ANON_CLASS__::" . $anon_counter++; - eval "package " . $pkg_name . "; our \$VERSION = '0.00';"; - die $@ if $@; + my ($self, $other, @args) = @_; - my $object = $other; - - $other = Moose::Meta::Class->initialize($pkg_name); - $other->superclasses(blessed($object)); + (blessed($other)) + || Moose->throw_error("You must pass in an blessed instance"); - bless $object => $pkg_name; + if ($other->isa('Moose::Meta::Role')) { + require Moose::Meta::Role::Application::ToRole; + return Moose::Meta::Role::Application::ToRole->new(@args)->apply($self, $other); } - - $self->_check_excluded_roles($other); - $self->_check_required_methods($other); - - $self->_apply_attributes($other); - $self->_apply_methods($other); - - $self->_apply_override_method_modifiers($other); - $self->_apply_before_method_modifiers($other); - $self->_apply_around_method_modifiers($other); - $self->_apply_after_method_modifiers($other); - - $other->add_role($self); + elsif ($other->isa('Moose::Meta::Class')) { + require Moose::Meta::Role::Application::ToClass; + return Moose::Meta::Role::Application::ToClass->new(@args)->apply($self, $other); + } + else { + require Moose::Meta::Role::Application::ToInstance; + return Moose::Meta::Role::Application::ToInstance->new(@args)->apply($self, $other); + } } sub combine { - my ($class, @roles) = @_; - - my $pkg_name = __PACKAGE__ . "::__COMPOSITE_ROLE_SANDBOX__::" . $anon_counter++; - eval "package " . $pkg_name . "; our \$VERSION = '0.00';"; - die $@ if $@; + my ($class, @role_specs) = @_; - my $combined = $class->initialize($pkg_name); + require Moose::Meta::Role::Application::RoleSummation; + require Moose::Meta::Role::Composite; - foreach my $role (@roles) { - $role->apply($combined); + my (@roles, %role_params); + while (@role_specs) { + my ($role, $params) = @{ splice @role_specs, 0, 1 }; + push @roles => $role->meta; + next unless defined $params; + $role_params{$role} = $params; } - $combined->_clean_up_required_methods; + my $c = Moose::Meta::Role::Composite->new(roles => \@roles); + Moose::Meta::Role::Application::RoleSummation->new( + role_params => \%role_params + )->apply($c); - return $combined; + return $c; } -## ------------------------------------------------------------------ +sub create { + my ( $role, @args ) = @_; -## applying a role to a class ... + unshift @args, 'package' if @args % 2 == 1; -sub _check_excluded_roles { - my ($self, $other) = @_; - if ($other->excludes_role($self->name)) { - confess "Conflict detected: " . $other->name . " excludes role '" . $self->name . "'"; - } - foreach my $excluded_role_name ($self->get_excluded_roles_list) { - if ($other->does_role($excluded_role_name)) { - confess "The class " . $other->name . " does the excluded role '$excluded_role_name'"; + my (%options) = @args; + my $package_name = $options{package}; + + (ref $options{attributes} eq 'HASH') + || confess "You must pass a HASH ref of attributes" + if exists $options{attributes}; + + (ref $options{methods} eq 'HASH') + || confess "You must pass a HASH ref of methods" + if exists $options{methods}; + + $role->SUPER::create(%options); + + my (%initialize_options) = @args; + delete @initialize_options{qw( + package + attributes + methods + version + authority + )}; + + my $meta = $role->initialize( $package_name => %initialize_options ); + + # FIXME totally lame + $meta->add_method('meta' => sub { + $role->initialize(ref($_[0]) || $_[0]); + }); + + if (exists $options{attributes}) { + foreach my $attribute_name (keys %{$options{attributes}}) { + my $attr = $options{attributes}->{$attribute_name}; + $meta->add_attribute($attribute_name => $attr); } - else { - if ($other->isa('Moose::Meta::Role')) { - $other->add_excluded_roles($excluded_role_name); - } - # else -> ignore it :) + } + + if (exists $options{methods}) { + foreach my $method_name (keys %{$options{methods}}) { + $meta->add_method($method_name, $options{methods}->{$method_name}); } - } + } + + return $meta; } -sub _check_required_methods { - my ($self, $other) = @_; +# anonymous roles. most of it is copied straight out of Class::MOP::Class. +# an intrepid hacker might find great riches if he unifies this code with that +# code in Class::MOP::Module or Class::MOP::Package +{ # NOTE: - # we might need to move this down below the - # the attributes so that we can require any - # attribute accessors. However I am thinking - # that maybe those are somehow exempt from - # the require methods stuff. - foreach my $required_method_name ($self->get_required_method_list) { - - unless ($other->find_method_by_name($required_method_name)) { - if ($other->isa('Moose::Meta::Role')) { - $other->add_required_methods($required_method_name); - } - else { - confess "'" . $self->name . "' requires the method '$required_method_name' " . - "to be implemented by '" . $other->name . "'"; - } - } - else { - # NOTE: - # we need to make sure that the method is - # not a method modifier, because those do - # not satisfy the requirements ... - my $method = $other->find_method_by_name($required_method_name); - # check if it is an override or a generated accessor .. - (!$method->isa('Moose::Meta::Method::Overriden') && - !$method->isa('Class::MOP::Method::Accessor')) - || confess "'" . $self->name . "' requires the method '$required_method_name' " . - "to be implemented by '" . $other->name . "', the method is only a method modifier"; - # before/after/around methods are a little trickier - # since we wrap the original local method (if applicable) - # so we need to check if the original wrapped method is - # from the same package, and not a wrap of the super method - if ($method->isa('Class::MOP::Method::Wrapped')) { - ($method->get_original_method->package_name eq $other->name) - || confess "'" . $self->name . "' requires the method '$required_method_name' " . - "to be implemented by '" . $other->name . "', the method is only a method modifier"; - } - } - } -} + # this should be sufficient, if you have a + # use case where it is not, write a test and + # I will change it. + my $ANON_ROLE_SERIAL = 0; -sub _apply_attributes { - my ($self, $other) = @_; - foreach my $attribute_name ($self->get_attribute_list) { - # it if it has one already - if ($other->has_attribute($attribute_name) && - # make sure we haven't seen this one already too - $other->get_attribute($attribute_name) != $self->get_attribute($attribute_name)) { - # see if we are being composed - # into a role or not - if ($other->isa('Moose::Meta::Role')) { - # all attribute conflicts between roles - # result in an immediate fatal error - confess "Role '" . $self->name . "' has encountered an attribute conflict " . - "during composition. This is fatal error and cannot be disambiguated."; - } - else { - # but if this is a class, we - # can safely skip adding the - # attribute to the class - next; - } - } - else { - # NOTE: - # this is kinda ugly ... - if ($other->isa('Moose::Meta::Class')) { - $other->_process_attribute( - $attribute_name, - %{$self->get_attribute($attribute_name)} - ); - } - else { - $other->add_attribute( - $attribute_name, - $self->get_attribute($attribute_name) - ); - } - } - } -} + # NOTE: + # we need a sufficiently annoying prefix + # this should suffice for now, this is + # used in a couple of places below, so + # need to put it up here for now. + my $ANON_ROLE_PREFIX = 'Moose::Meta::Role::__ANON__::SERIAL::'; + + sub is_anon_role { + my $self = shift; + no warnings 'uninitialized'; + $self->name =~ /^$ANON_ROLE_PREFIX/; + } -sub _apply_methods { - my ($self, $other) = @_; - foreach my $method_name ($self->get_method_list) { - # it if it has one already - if ($other->has_method($method_name) && - # and if they are not the same thing ... - $other->get_method($method_name)->body != $self->get_method($method_name)->body) { - # see if we are composing into a role - if ($other->isa('Moose::Meta::Role')) { - # method conflicts between roles result - # in the method becoming a requirement - $other->add_required_methods($method_name); - # NOTE: - # we have to remove the method from our - # role, if this is being called from combine() - # which means the meta is an anon class - # this *may* cause problems later, but it - # is probably fairly safe to assume that - # anon classes will only be used internally - # or by people who know what they are doing - $other->Moose::Meta::Class::remove_method($method_name) - if $other->name =~ /__COMPOSITE_ROLE_SANDBOX__/; - } - else { - next; - } - } - else { - # add it, although it could be overriden - $other->alias_method( - $method_name, - $self->get_method($method_name) - ); - } - } -} + sub create_anon_role { + my ($role, %options) = @_; + my $package_name = $ANON_ROLE_PREFIX . ++$ANON_ROLE_SERIAL; + return $role->create($package_name, %options); + } -sub _apply_override_method_modifiers { - my ($self, $other) = @_; - foreach my $method_name ($self->get_method_modifier_list('override')) { - # it if it has one already then ... - if ($other->has_method($method_name)) { - # if it is being composed into another role - # we have a conflict here, because you cannot - # combine an overriden method with a locally - # defined one - if ($other->isa('Moose::Meta::Role')) { - confess "Role '" . $self->name . "' has encountered an 'override' method conflict " . - "during composition (A local method of the same name as been found). This " . - "is fatal error."; - } - else { - # if it is a class, then we - # just ignore this here ... - next; - } - } - else { - # if no local method is found, then we - # must check if we are a role or class - if ($other->isa('Moose::Meta::Role')) { - # if we are a role, we need to make sure - # we dont have a conflict with the role - # we are composing into - if ($other->has_override_method_modifier($method_name) && - $other->get_override_method_modifier($method_name) != $self->get_override_method_modifier($method_name)) { - confess "Role '" . $self->name . "' has encountered an 'override' method conflict " . - "during composition (Two 'override' methods of the same name encountered). " . - "This is fatal error."; - } - else { - # if there is no conflict, - # just add it to the role - $other->add_override_method_modifier( - $method_name, - $self->get_override_method_modifier($method_name) - ); - } - } - else { - # if this is not a role, then we need to - # find the original package of the method - # so that we can tell the class were to - # find the right super() method - my $method = $self->get_override_method_modifier($method_name); - my $package = svref_2object($method)->GV->STASH->NAME; - # if it is a class, we just add it - $other->add_override_method_modifier($method_name, $method, $package); - } + # NOTE: + # this will only get called for + # anon-roles, all other calls + # are assumed to occur during + # global destruction and so don't + # really need to be handled explicitly + sub DESTROY { + my $self = shift; + + return if Class::MOP::in_global_destruction(); # it'll happen soon anyway and this just makes things more complicated + + no warnings 'uninitialized'; + return unless $self->name =~ /^$ANON_ROLE_PREFIX/; + + # XXX: is this necessary for us? I don't understand what it's doing + # -sartak + + # Moose does a weird thing where it replaces the metaclass for + # class when fixing metaclass incompatibility. In that case, + # we don't want to clean out the namespace now. We can detect + # that because Moose will explicitly update the singleton + # cache in Class::MOP. + #my $current_meta = Class::MOP::get_metaclass_by_name($self->name); + #return if $current_meta ne $self; + + my ($serial_id) = ($self->name =~ /^$ANON_ROLE_PREFIX(\d+)/); + no strict 'refs'; + foreach my $key (keys %{$ANON_ROLE_PREFIX . $serial_id}) { + delete ${$ANON_ROLE_PREFIX . $serial_id}{$key}; } - } + delete ${'main::' . $ANON_ROLE_PREFIX}{$serial_id . '::'}; + } } -sub _apply_method_modifiers { - my ($self, $modifier_type, $other) = @_; - my $add = "add_${modifier_type}_method_modifier"; - my $get = "get_${modifier_type}_method_modifiers"; - foreach my $method_name ($self->get_method_modifier_list($modifier_type)) { - $other->$add( - $method_name, - $_ - ) foreach $self->$get($method_name); - } -} +##################################################################### +## NOTE: +## This is Moose::Meta::Role as defined by Moose (plus the use of +## MooseX::AttributeHelpers module). It is here as a reference to +## make it easier to see what is happening above with all the meta +## programming. - SL +##################################################################### +# +# has 'roles' => ( +# metaclass => 'Collection::Array', +# reader => 'get_roles', +# isa => 'ArrayRef[Moose::Meta::Roles]', +# default => sub { [] }, +# provides => { +# 'push' => 'add_role', +# } +# ); +# +# has 'excluded_roles_map' => ( +# metaclass => 'Collection::Hash', +# reader => 'get_excluded_roles_map', +# isa => 'HashRef[Str]', +# provides => { +# # Not exactly set, cause it sets multiple +# 'set' => 'add_excluded_roles', +# 'keys' => 'get_excluded_roles_list', +# 'exists' => 'excludes_role', +# } +# ); +# +# has 'attribute_map' => ( +# metaclass => 'Collection::Hash', +# reader => 'get_attribute_map', +# isa => 'HashRef[Str]', +# provides => { +# # 'set' => 'add_attribute' # has some special crap in it +# 'get' => 'get_attribute', +# 'keys' => 'get_attribute_list', +# 'exists' => 'has_attribute', +# # Not exactly delete, cause it sets multiple +# 'delete' => 'remove_attribute', +# } +# ); +# +# has 'required_methods' => ( +# metaclass => 'Collection::Hash', +# reader => 'get_required_methods_map', +# isa => 'HashRef[Str]', +# provides => { +# # not exactly set, or delete since it works for multiple +# 'set' => 'add_required_methods', +# 'delete' => 'remove_required_methods', +# 'keys' => 'get_required_method_list', +# 'exists' => 'requires_method', +# } +# ); +# +# # the before, around and after modifiers are +# # HASH keyed by method-name, with ARRAY of +# # CODE refs to apply in that order +# +# has 'before_method_modifiers' => ( +# metaclass => 'Collection::Hash', +# reader => 'get_before_method_modifiers_map', +# isa => 'HashRef[ArrayRef[CodeRef]]', +# provides => { +# 'keys' => 'get_before_method_modifiers', +# 'exists' => 'has_before_method_modifiers', +# # This actually makes sure there is an +# # ARRAY at the given key, and pushed onto +# # it. It also checks for duplicates as well +# # 'add' => 'add_before_method_modifier' +# } +# ); +# +# has 'after_method_modifiers' => ( +# metaclass => 'Collection::Hash', +# reader =>'get_after_method_modifiers_map', +# isa => 'HashRef[ArrayRef[CodeRef]]', +# provides => { +# 'keys' => 'get_after_method_modifiers', +# 'exists' => 'has_after_method_modifiers', +# # This actually makes sure there is an +# # ARRAY at the given key, and pushed onto +# # it. It also checks for duplicates as well +# # 'add' => 'add_after_method_modifier' +# } +# ); +# +# has 'around_method_modifiers' => ( +# metaclass => 'Collection::Hash', +# reader =>'get_around_method_modifiers_map', +# isa => 'HashRef[ArrayRef[CodeRef]]', +# provides => { +# 'keys' => 'get_around_method_modifiers', +# 'exists' => 'has_around_method_modifiers', +# # This actually makes sure there is an +# # ARRAY at the given key, and pushed onto +# # it. It also checks for duplicates as well +# # 'add' => 'add_around_method_modifier' +# } +# ); +# +# # override is similar to the other modifiers +# # except that it is not an ARRAY of code refs +# # but instead just a single name->code mapping +# +# has 'override_method_modifiers' => ( +# metaclass => 'Collection::Hash', +# reader =>'get_override_method_modifiers_map', +# isa => 'HashRef[CodeRef]', +# provides => { +# 'keys' => 'get_override_method_modifier', +# 'exists' => 'has_override_method_modifier', +# 'add' => 'add_override_method_modifier', # checks for local method .. +# } +# ); +# +##################################################################### -sub _apply_before_method_modifiers { (shift)->_apply_method_modifiers('before' => @_) } -sub _apply_around_method_modifiers { (shift)->_apply_method_modifiers('around' => @_) } -sub _apply_after_method_modifiers { (shift)->_apply_method_modifiers('after' => @_) } 1; @@ -591,9 +721,9 @@ Moose::Meta::Role - The Moose Role metaclass =head1 DESCRIPTION -Please see L for more information about roles. +Please see L for more information about roles. For the most part, this has no user-serviceable parts inside -this module. It's API is still subject to some change (although +this module. It's API is still subject to some change (although probably not that much really). =head1 METHODS @@ -606,6 +736,8 @@ probably not that much really). =item B +=item B + =item B =back @@ -654,12 +786,20 @@ probably not that much really). =item B +=item B + +=item B + =item B =item B =item B +=item B + +=item B + =back =over 4 @@ -744,7 +884,7 @@ probably not that much really). =head1 BUGS -All complex software has bugs lurking in it, and this module is no +All complex software has bugs lurking in it, and this module is no exception. If you find a bug please either email me, or add the bug to cpan-RT. @@ -754,11 +894,11 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006, 2007 by Infinity Interactive, Inc. +Copyright 2006-2008 by Infinity Interactive, Inc. L This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. +it under the same terms as Perl itself. =cut