X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole.pm;h=640cb84d203a4e0a036fb8a5ac076f63b5fb8231;hb=a94188ac85b86f501de86f25496e821e31d74cac;hp=c35f7cd08a79e9079555669663394f22b7c25173;hpb=ac0ece3dc42ae7e0402a46eb25dbdc57f6cbcc9b;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index c35f7cd..640cb84 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -7,74 +7,247 @@ use metaclass; use Carp 'confess'; use Scalar::Util 'blessed'; -use B 'svref_2object'; -our $VERSION = '0.07'; +our $VERSION = '0.56'; our $AUTHORITY = 'cpan:STEVAN'; use Moose::Meta::Class; use Moose::Meta::Role::Method; +use Moose::Meta::Role::Method::Required; use base 'Class::MOP::Module'; -## Attributes +## ------------------------------------------------------------------ +## 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; + +## ------------------------------------------------------------------ +## attributes ... + +# 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 +# using a little of that meta-programmin' magic +# 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 ( + { + name => 'excluded_roles_map', + attr_reader => 'get_excluded_roles_map' , + methods => { + 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', + 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', + get_list => 'get_attribute_list', + existence => 'has_attribute', + remove => 'remove_attribute', + } + } +) { -## roles + my $attr_reader = $action->{attr_reader}; + my $methods = $action->{methods}; -__PACKAGE__->meta->add_attribute('roles' => ( - reader => 'get_roles', - default => sub { [] } -)); + # create the attribute + $META->add_attribute($action->{name} => ( + reader => $attr_reader, + default => sub { {} } + )); -## excluded roles + # create some helper methods + $META->add_method($methods->{add} => sub { + my ($self, @values) = @_; + $self->$attr_reader->{$_} = undef foreach @values; + }) if exists $methods->{add}; -__PACKAGE__->meta->add_attribute('excluded_roles_map' => ( - reader => 'get_excluded_roles_map', - default => sub { {} } -)); + $META->add_method($methods->{get_list} => sub { + my ($self) = @_; + keys %{$self->$attr_reader}; + }) if exists $methods->{get_list}; -## attributes + $META->add_method($methods->{get} => sub { + my ($self, $name) = @_; + $self->$attr_reader->{$name} + }) if exists $methods->{get}; -__PACKAGE__->meta->add_attribute('attribute_map' => ( - reader => 'get_attribute_map', - default => sub { {} } -)); + $META->add_method($methods->{existence} => sub { + my ($self, $name) = @_; + exists $self->$attr_reader->{$name} ? 1 : 0; + }) if exists $methods->{existence}; -## required methods + $META->add_method($methods->{remove} => sub { + my ($self, @values) = @_; + delete $self->$attr_reader->{$_} foreach @values; + }) if exists $methods->{remove}; +} -__PACKAGE__->meta->add_attribute('required_methods' => ( - reader => 'get_required_methods_map', - default => sub { {} } -)); +## some things don't always fit, so they go here ... +sub add_attribute { + my $self = shift; + my $name = shift; + my $attr_desc; + if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { + $attr_desc = $_[0]; + } + else { + $attr_desc = { @_ }; + } + $self->get_attribute_map->{$name} = $attr_desc; +} + +# 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 -__PACKAGE__->meta->add_attribute('before_method_modifiers' => ( - reader => 'get_before_method_modifiers_map', - default => sub { {} } # ( => [ (CODE) ]) -)); +# NOTE: +# 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 +# meta-programmin' and save some time. +# - SL -__PACKAGE__->meta->add_attribute('after_method_modifiers' => ( - reader => 'get_after_method_modifiers_map', - default => sub { {} } # ( => [ (CODE) ]) -)); +foreach my $modifier_type (qw[ before around after ]) { -__PACKAGE__->meta->add_attribute('around_method_modifiers' => ( - reader => 'get_around_method_modifiers_map', - default => sub { {} } # ( => [ (CODE) ]) -)); + 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,.. + # 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} = [] + 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 + # first on here, this may not be as expected + foreach my $modifier (@{$modifiers}) { + return if $modifier == $method; + } + + push @{$modifiers} => $method; + }); + +} -__PACKAGE__->meta->add_attribute('override_method_modifiers' => ( +## ------------------------------------------------------------------ +## override method mofidiers + +$META->add_attribute('override_method_modifiers' => ( reader => 'get_override_method_modifiers_map', - default => sub { {} } # ( => CODE) + default => sub { {} } )); -## Methods +# NOTE: +# these are a little different because there +# can only be one per name, whereas the other +# method modifiers can have multiples. +# - SL -sub method_metaclass { 'Moose::Meta::Role::Method' } +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; +} +sub has_override_method_modifier { + my ($self, $method_name) = @_; + # NOTE: + # 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; +} + +sub get_override_method_modifier { + my ($self, $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"; + keys %{$self->$accessor}; +} + +## ------------------------------------------------------------------ ## subroles +__PACKAGE__->meta->add_attribute('roles' => ( + reader => 'get_roles', + default => sub { [] } +)); + sub add_role { my ($self, $role) = @_; (blessed($role) && $role->isa('Moose::Meta::Role')) @@ -85,7 +258,11 @@ sub add_role { 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 { @@ -101,456 +278,260 @@ sub does_role { return 0; } -## excluded roles - -sub add_excluded_roles { - my ($self, @excluded_role_names) = @_; - $self->get_excluded_roles_map->{$_} = undef foreach @excluded_role_names; -} - -sub get_excluded_roles_list { - my ($self) = @_; - keys %{$self->get_excluded_roles_map}; -} - -sub excludes_role { - my ($self, $role_name) = @_; - exists $self->get_excluded_roles_map->{$role_name} ? 1 : 0; -} - -## required methods - -sub add_required_methods { - my ($self, @methods) = @_; - $self->get_required_methods_map->{$_} = undef foreach @methods; -} - -sub remove_required_methods { - my ($self, @methods) = @_; - delete $self->get_required_methods_map->{$_} foreach @methods; -} - -sub get_required_method_list { - my ($self) = @_; - keys %{$self->get_required_methods_map}; -} - -sub requires_method { - my ($self, $method_name) = @_; - exists $self->get_required_methods_map->{$method_name} ? 1 : 0; -} - -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); - } -} - +## ------------------------------------------------------------------ ## methods -# FIXME: -# this is an UGLY hack -sub get_method_map { - my $self = shift; - $self->{'%!methods'} ||= {}; - $self->Moose::Meta::Class::get_method_map() -} +sub method_metaclass { 'Moose::Meta::Role::Method' } -# 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_map { + my $self = shift; + my $map = {}; -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(@_) -} + my $role_name = $self->name; + my $method_metaclass = $self->method_metaclass; -sub find_method_by_name { (shift)->has_method(@_) } + my %all_code = $self->get_all_package_symbols('CODE'); -# ... however the items in statis (attributes & method modifiers) -# can be removed and added to through this API + foreach my $symbol (keys %all_code) { + my $code = $all_code{$symbol}; -# attributes + my ($pkg, $name) = Class::MOP::get_code_info($code); -sub add_attribute { - my $self = shift; - my $name = shift; - my $attr_desc; - if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { - $attr_desc = $_[0]; - } - else { - $attr_desc = { @_ }; + 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) } + && $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 + ); } - $self->get_attribute_map->{$name} = $attr_desc; -} -sub has_attribute { - my ($self, $name) = @_; - exists $self->get_attribute_map->{$name} ? 1 : 0; + return $map; } -sub get_attribute { +sub get_method { my ($self, $name) = @_; - $self->get_attribute_map->{$name} + $self->get_method_map->{$name}; } -sub remove_attribute { +sub has_method { my ($self, $name) = @_; - delete $self->get_attribute_map->{$name} + exists $self->get_method_map->{$name} ? 1 : 0 } -sub get_attribute_list { - my ($self) = @_; - keys %{$self->get_attribute_map}; -} - -# method modifiers - -# mimic the metaclass API -sub add_before_method_modifier { (shift)->_add_method_modifier('before', @_) } -sub add_around_method_modifier { (shift)->_add_method_modifier('around', @_) } -sub add_after_method_modifier { (shift)->_add_method_modifier('after', @_) } +sub find_method_by_name { (shift)->get_method(@_) } -sub _add_method_modifier { - my ($self, $modifier_type, $method_name, $method) = @_; - my $accessor = "get_${modifier_type}_method_modifiers_map"; - $self->$accessor->{$method_name} = [] - unless exists $self->$accessor->{$method_name}; - my $modifiers = $self->$accessor->{$method_name}; - # NOTE: - # 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; +sub get_method_list { + my $self = shift; + grep { !/^meta$/ } keys %{$self->get_method_map}; } -sub add_override_method_modifier { +sub alias_method { 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; -} - -sub has_before_method_modifiers { (shift)->_has_method_modifiers('before', @_) } -sub has_around_method_modifiers { (shift)->_has_method_modifiers('around', @_) } -sub has_after_method_modifiers { (shift)->_has_method_modifiers('after', @_) } - -# override just checks for one,.. -# but we can still re-use stuff -sub has_override_method_modifier { (shift)->_has_method_modifiers('override', @_) } - -sub _has_method_modifiers { - my ($self, $modifier_type, $method_name) = @_; - my $accessor = "get_${modifier_type}_method_modifiers_map"; - # NOTE: - # for now we assume that if it exists,.. - # it has at least one modifier in it - (exists $self->$accessor->{$method_name}) ? 1 : 0; -} - -sub get_before_method_modifiers { (shift)->_get_method_modifiers('before', @_) } -sub get_around_method_modifiers { (shift)->_get_method_modifiers('around', @_) } -sub get_after_method_modifiers { (shift)->_get_method_modifiers('after', @_) } - -sub _get_method_modifiers { - my ($self, $modifier_type, $method_name) = @_; - my $accessor = "get_${modifier_type}_method_modifiers_map"; - @{$self->$accessor->{$method_name}}; -} - -sub get_override_method_modifier { - my ($self, $method_name) = @_; - $self->get_override_method_modifiers_map->{$method_name}; -} - -sub get_method_modifier_list { - my ($self, $modifier_type) = @_; - my $accessor = "get_${modifier_type}_method_modifiers_map"; - keys %{$self->$accessor}; -} - -## applying a role to a class ... - -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'"; - } - else { - if ($other->isa('Moose::Meta::Role')) { - $other->add_excluded_roles($excluded_role_name); - } - # else -> ignore it :) - } - } -} - -sub _check_required_methods { - my ($self, $other) = @_; - # 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->get_method($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"; - } - } - } -} - -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) - ); - } - } - } -} - -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) - ); - } - } -} + (defined $method_name && $method_name) + || confess "You must define a method name"; -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); - } - } - } -} + my $body = (blessed($method) ? $method->body : $method); + ('CODE' eq ref($body)) + || confess "Your code block must be a CODE reference"; -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); - } + $self->add_package_symbol( + { sigil => '&', type => 'CODE', name => $method_name }, + $body + ); } -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' => @_) } - -my $anon_counter = 0; +## ------------------------------------------------------------------ +## role construction +## ------------------------------------------------------------------ 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)) + || confess "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 ($class, @role_specs) = @_; - my $pkg_name = __PACKAGE__ . "::__COMPOSITE_ROLE_SANDBOX__::" . $anon_counter++; - eval "package " . $pkg_name . "; our \$VERSION = '0.00';"; - die $@ if $@; + require Moose::Meta::Role::Application::RoleSummation; + require Moose::Meta::Role::Composite; - my $combined = $class->initialize($pkg_name); - - 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; +} + +##################################################################### +## 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 .. +# } +# ); +# +##################################################################### + 1; @@ -564,9 +545,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 @@ -633,6 +614,10 @@ probably not that much really). =item B +=item B + +=item B + =back =over 4 @@ -717,7 +702,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. @@ -727,11 +712,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