X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FClass.pm;h=d0406939bf112677d15d3da81b9b9236c604083f;hb=c8cf9aaaa9bc89f8a889c3c17d163034dc59a410;hp=70ea64abb6d884cfad56bae852bb2429e0a6e025;hpb=8d82cda075db89d040002bd23247d86ff11d501c;p=gitmo%2FMoose.git diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 70ea64a..d040693 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -9,7 +9,9 @@ use Class::MOP; use Carp 'confess'; use Scalar::Util 'weaken', 'blessed', 'reftype'; -our $VERSION = '0.05'; +our $VERSION = '0.09'; + +use Moose::Meta::Method::Overriden; use base 'Class::MOP::Class'; @@ -23,9 +25,10 @@ sub initialize { my $pkg = shift; $class->SUPER::initialize($pkg, ':attribute_metaclass' => 'Moose::Meta::Attribute', + ':method_metaclass' => 'Moose::Meta::Method', ':instance_metaclass' => 'Moose::Meta::Instance', @_); -} +} sub add_role { my ($self, $role) = @_; @@ -34,12 +37,34 @@ sub add_role { push @{$self->roles} => $role; } +sub calculate_all_roles { + my $self = shift; + my %seen; + grep { !$seen{$_->name}++ } map { $_->calculate_all_roles } @{ $self->roles }; +} + sub does_role { my ($self, $role_name) = @_; (defined $role_name) || confess "You must supply a role name to look for"; - foreach my $role (@{$self->roles}) { - return 1 if $role->does_role($role_name); + foreach my $class ($self->class_precedence_list) { + next unless $class->can('meta'); + foreach my $role (@{$class->meta->roles}) { + return 1 if $role->does_role($role_name); + } + } + return 0; +} + +sub excludes_role { + my ($self, $role_name) = @_; + (defined $role_name) + || confess "You must supply a role name to look for"; + foreach my $class ($self->class_precedence_list) { + next unless $class->can('meta'); + foreach my $role (@{$class->meta->roles}) { + return 1 if $role->excludes_role($role_name); + } } return 0; } @@ -48,6 +73,10 @@ sub new_object { my ($class, %params) = @_; my $self = $class->SUPER::new_object(%params); foreach my $attr ($class->compute_all_applicable_attributes()) { + # FIXME: + # this does not accept undefined + # values, nor does it accept false + # values to be passed into the init-arg next unless $params{$attr->init_arg} && $attr->can('has_trigger') && $attr->has_trigger; $attr->trigger->($self, $params{$attr->init_arg}, $attr); } @@ -57,161 +86,93 @@ sub new_object { sub construct_instance { my ($class, %params) = @_; my $meta_instance = $class->get_meta_instance; + # FIXME: + # the code below is almost certainly incorrect + # but this is foreign inheritence, so we might + # have to kludge it in the end. my $instance = $params{'__INSTANCE__'} || $meta_instance->create_instance(); - foreach my $attr ($class->compute_all_applicable_attributes()) { + foreach my $attr ($class->compute_all_applicable_attributes()) { $attr->initialize_instance_slot($meta_instance, $instance, \%params) } return $instance; } -sub has_method { - my ($self, $method_name) = @_; - (defined $method_name && $method_name) - || confess "You must define a method name"; - my $sub_name = ($self->name . '::' . $method_name); +# FIXME: +# This is ugly +sub get_method_map { + my $self = shift; + my $map = $self->{'%:methods'}; - no strict 'refs'; - return 0 if !defined(&{$sub_name}); - my $method = \&{$sub_name}; - - return 1 if blessed($method) && $method->isa('Moose::Meta::Role::Method'); - return $self->SUPER::has_method($method_name); -} - -sub add_attribute { - my ($self, $name, %params) = @_; - - my @delegations; - if ( my $delegation = delete $params{handles} ) { - my @method_names_or_hashes = $self->compute_delegation( $name, $delegation, \%params ); - @delegations = $self->get_delegatable_methods( @method_names_or_hashes ); - } - - my $ret = $self->SUPER::add_attribute( $name, %params ); - - if ( @delegations ) { - my $attr = $self->get_attribute( $name ); - $self->generate_delgate_method( $attr, $_ ) for $self->filter_delegations( $attr, @delegations ); - } - - return $ret; -} - -sub filter_delegations { - my ( $self, $attr, @delegations ) = @_; - grep { - my $new_name = $_->{new_name} || $_->{name}; - no warnings "uninitialized"; - $_->{no_filter} or ( - !$self->name->can( $new_name ) and - $attr->accessor ne $new_name and - $attr->reader ne $new_name and - $attr->writer ne $new_name - ); - } @delegations; -} - -sub generate_delgate_method { - my ( $self, $attr, $method ) = @_; - - # FIXME like generated accessors these methods must be regenerated - # FIXME the reader may not work for subclasses with weird instances - - my $make = $method->{generator} || sub { - my ( $self, $attr, $method ) =@_; + my $class_name = $self->name; + my $method_metaclass = $self->method_metaclass; - my $method_name = $method->{name}; - my $reader = $attr->generate_reader_method(); - - return sub { - if ( Scalar::Util::blessed( my $delegate = shift->$reader ) ) { - return $delegate->$method_name( @_ ); - } - return; - }; - }; - - my $new_name = $method->{new_name} || $method->{name}; - $self->add_method( $new_name, $make->( $self, $attr, $method ) ); -} - -sub compute_delegation { - my ( $self, $attr_name, $delegation, $params ) = @_; - + foreach my $symbol ($self->list_all_package_symbols('CODE')) { + + my $code = $self->get_package_symbol('&' . $symbol); + + next if exists $map->{$symbol} && + defined $map->{$symbol} && + $map->{$symbol}->body == $code; + + my $gv = B::svref_2object($code)->GV; + + my $pkg = $gv->STASH->NAME; + if ($pkg->can('meta') && $pkg->meta && $pkg->meta->isa('Moose::Meta::Role')) { + #my $role = $pkg->meta->name; + #next unless $self->does_role($role); + } + else { + next if ($gv->STASH->NAME || '') ne $class_name && + ($gv->NAME || '') ne '__ANON__'; + } - # either it's a concrete list of method names - return $delegation unless ref $delegation; # single method name - return @$delegation if reftype($delegation) eq "ARRAY"; - - # or it's a generative api - my $delegator_meta = $self->_guess_attr_class_or_role( $attr_name, $params ); - $self->generate_delegation_list( $delegation, $delegator_meta ); -} - -sub get_delegatable_methods { - my ( $self, @names_or_hashes ) = @_; - map { ref($_) ? $_ : { name => $_ } } @names_or_hashes; -} - -sub generate_delegation_list { - my ( $self, $delegation, $delegator_meta ) = @_; - - if ( reftype($delegation) eq "CODE" ) { - return $delegation->( $self, $delegator_meta ); - } elsif ( blessed($delegation) eq "Regexp" ) { - confess "For regular expression support the delegator class/role must use a Class::MOP::Class metaclass" - unless $delegator_meta->isa( "Class::MOP::Class" ); - return grep { $_->{name} =~ /$delegation/ } $delegator_meta->compute_all_applicable_methods(); - } else { - confess "The 'handles' specification '$delegation' is not supported"; + $map->{$symbol} = $method_metaclass->wrap($code); } + + return $map; } -sub _guess_attr_class_or_role { - my ( $self, $attr, $params ) = @_; - - my ( $isa, $does ) = @{ $params }{qw/isa does/}; - - confess "Generative delegations must explicitly specify a class or a role for the attribute's type" - unless $isa || $does; +### --------------------------------------------- - for (grep { blessed($_) } $isa, $does) { - confess "You must use classes/roles, not type constraints to use delegation ($_)" - unless $_->isa( "Moose::Meta::Class" ); +sub add_attribute { + my $self = shift; + my $name = shift; + if (scalar @_ == 1 && ref($_[0]) eq 'HASH') { + # NOTE: + # if it is a HASH ref, we de-ref it. + # this will usually mean that it is + # coming from a role + $self->SUPER::add_attribute($name => %{$_[0]}); } - - confess "Cannot have an isa option and a does option if the isa does not do the does" - if $isa and $does and $isa->can("does") and !$isa->does( $does ); - - # if it's a class/role name make it into a meta object - for ($isa, $does) { - $_ = $_->meta if defined and !ref and $_->can("meta"); + else { + # otherwise we just pass the args + $self->SUPER::add_attribute($name => @_); } - - $isa = Class::MOP::Class->initialize($isa) if $isa and !ref($isa); - - return $isa || $does; } sub add_override_method_modifier { my ($self, $name, $method, $_super_package) = @_; + (!$self->has_method($name)) + || confess "Cannot add an override method if a local method is already present"; # need this for roles ... $_super_package ||= $self->name; my $super = $self->find_next_method_by_name($name); (defined $super) || confess "You cannot override '$name' because it has no super method"; - $self->add_method($name => bless sub { + $self->add_method($name => Moose::Meta::Method::Overriden->wrap(sub { my @args = @_; no strict 'refs'; no warnings 'redefine'; local *{$_super_package . '::super'} = sub { $super->(@args) }; return $method->(@args); - } => 'Moose::Meta::Method::Overriden'); + })); } sub add_augment_method_modifier { my ($self, $name, $method) = @_; + (!$self->has_method($name)) + || confess "Cannot add an augment method if a local method is already present"; my $super = $self->find_next_method_by_name($name); (defined $super) || confess "You cannot augment '$name' because it has no super method"; @@ -235,24 +196,106 @@ sub add_augment_method_modifier { }); } +## Private Utility methods ... + sub _find_next_method_by_name_which_is_not_overridden { my ($self, $name) = @_; - my @methods = $self->find_all_methods_by_name($name); - foreach my $method (@methods) { + foreach my $method ($self->find_all_methods_by_name($name)) { return $method->{code} if blessed($method->{code}) && !$method->{code}->isa('Moose::Meta::Method::Overriden'); } return undef; } -package Moose::Meta::Method::Overriden; +sub _fix_metaclass_incompatability { + my ($self, @superclasses) = @_; + foreach my $super (@superclasses) { + # don't bother if it does not have a meta. + next unless $super->can('meta'); + # if it's meta is a vanilla Moose, + # then we can safely ignore it. + next if blessed($super->meta) eq 'Moose::Meta::Class'; + # but if we have anything else, + # we need to check it out ... + unless (# see if of our metaclass is incompatible + ($self->isa(blessed($super->meta)) && + # and see if our instance metaclass is incompatible + $self->instance_metaclass->isa($super->meta->instance_metaclass)) && + # ... and if we are just a vanilla Moose + $self->isa('Moose::Meta::Class')) { + # re-initialize the meta ... + my $super_meta = $super->meta; + # NOTE: + # We might want to consider actually + # transfering any attributes from the + # original meta into this one, but in + # general you should not have any there + # at this point anyway, so it's very + # much an obscure edge case anyway + $self = $super_meta->reinitialize($self->name => ( + ':attribute_metaclass' => $super_meta->attribute_metaclass, + ':method_metaclass' => $super_meta->method_metaclass, + ':instance_metaclass' => $super_meta->instance_metaclass, + )); + } + } + return $self; +} -use strict; -use warnings; +sub _apply_all_roles { + my ($self, @roles) = @_; + ($_->can('meta') && $_->meta->isa('Moose::Meta::Role')) + || confess "You can only consume roles, $_ is not a Moose role" + foreach @roles; + if (scalar @roles == 1) { + $roles[0]->meta->apply($self); + } + else { + # FIXME + # we should make a Moose::Meta::Role::Composite + # which is a smaller version of Moose::Meta::Role + # which does not use any package stuff + Moose::Meta::Role->combine( + map { $_->meta } @roles + )->apply($self); + } +} -our $VERSION = '0.01'; +sub _process_attribute { + my ($self, $name, %options) = @_; + if ($name =~ /^\+(.*)/) { + my $new_attr = $self->_process_inherited_attribute($1, %options); + $self->add_attribute($new_attr); + } + else { + if ($options{metaclass}) { + Moose::_load_all_classes($options{metaclass}); + $self->add_attribute($options{metaclass}->new($name, %options)); + } + else { + $self->add_attribute($name, %options); + } + } +} -use base 'Class::MOP::Method'; +sub _process_inherited_attribute { + my ($self, $attr_name, %options) = @_; + my $inherited_attr = $self->find_attribute_by_name($attr_name); + (defined $inherited_attr) + || confess "Could not find an attribute by the name of '$attr_name' to inherit from"; + my $new_attr; + if ($inherited_attr->isa('Moose::Meta::Attribute')) { + $new_attr = $inherited_attr->clone_and_inherit_options(%options); + } + else { + # NOTE: + # kind of a kludge to handle Class::MOP::Attributes + $new_attr = Moose::Meta::Attribute::clone_and_inherit_options( + $inherited_attr, %options + ); + } + return $new_attr; +} 1; @@ -293,9 +336,9 @@ you are doing. This method makes sure to handle the moose weak-ref, type-constraint and type coercion features. -=item B +=item B -This accomidates Moose::Meta::Role::Method instances, which are +This accommodates Moose::Meta::Role::Method instances, which are aliased, instead of added, but still need to be counted as valid methods. @@ -309,6 +352,8 @@ it in the package. This will create an C method modifier for you, and install it in the package. +=item B + =item B This will return an array of C instances which are @@ -325,24 +370,16 @@ This will test if this class C a given C<$role_name>. It will not only check it's local roles, but ask them as well in order to cascade down the role hierarchy. -=item B - -This method does the same thing as L, but adds -suport for delegation. - -=back - -=head1 INTERNAL METHODS - -=over 4 +=item B -=item compute_delegation - -=item generate_delegation_list +This will test if this class C a given C<$role_name>. It will +not only check it's local roles, but ask them as well in order to +cascade down the role hierarchy. -=item generate_delgate_method +=item B -=item get_delegatable_methods +This method does the same thing as L, but adds +support for taking the C<$params> as a HASH ref. =back @@ -366,3 +403,4 @@ This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. =cut +