use Carp 'confess';
use Scalar::Util 'weaken', 'blessed', 'reftype';
-our $VERSION = '0.06';
+our $VERSION = '0.10';
+our $AUTHORITY = 'cpan:STEVAN';
+
+use Moose::Meta::Method::Overriden;
use base 'Class::MOP::Class';
my $class = shift;
my $pkg = shift;
$class->SUPER::initialize($pkg,
- ':attribute_metaclass' => 'Moose::Meta::Attribute',
- ':instance_metaclass' => 'Moose::Meta::Instance',
+ 'attribute_metaclass' => 'Moose::Meta::Attribute',
+ 'method_metaclass' => 'Moose::Meta::Method',
+ 'instance_metaclass' => 'Moose::Meta::Instance',
@_);
-}
+}
sub add_role {
my ($self, $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)
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);
}
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);
+ my $class_name = $self->name;
+ my $method_metaclass = $self->method_metaclass;
+
+ 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__';
+ }
+
+ $map->{$symbol} = $method_metaclass->wrap($code);
+ }
+
+ return $map;
}
+### ---------------------------------------------
+
sub add_attribute {
my $self = shift;
my $name = shift;
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 {
});
}
+## 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');
+ # get the name, make sure we take
+ # immutable classes into account
+ my $super_meta_name = ($super->meta->is_immutable
+ ? $super->meta->get_mutable_metaclass_name
+ : blessed($super->meta));
+ # if it's meta is a vanilla Moose,
+ # then we can safely ignore it.
+ next if $super_meta_name 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($super_meta_name) &&
+ # 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);
+ }
+}
+
+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}) {
+ Class::MOP::load_class($options{metaclass});
+ $self->add_attribute($options{metaclass}->new($name, %options));
+ }
+ else {
+ $self->add_attribute($name, %options);
+ }
+ }
+}
-our $VERSION = '0.01';
+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;
+}
-use base 'Class::MOP::Method';
+## -------------------------------------------------
+
+use Moose::Meta::Method::Constructor;
+use Moose::Meta::Method::Destructor;
+
+{
+ # NOTE:
+ # the immutable version of a
+ # particular metaclass is
+ # really class-level data so
+ # we don't want to regenerate
+ # it any more than we need to
+ my $IMMUTABLE_METACLASS;
+ sub make_immutable {
+ my $self = shift;
+
+ $IMMUTABLE_METACLASS ||= Class::MOP::Immutable->new($self, {
+ read_only => [qw/superclasses/],
+ cannot_call => [qw/
+ add_method
+ alias_method
+ remove_method
+ add_attribute
+ remove_attribute
+ add_package_symbol
+ remove_package_symbol
+ add_role
+ /],
+ memoize => {
+ class_precedence_list => 'ARRAY',
+ compute_all_applicable_attributes => 'ARRAY',
+ get_meta_instance => 'SCALAR',
+ get_method_map => 'SCALAR',
+ # maybe ....
+ calculate_all_roles => 'ARRAY',
+ }
+ });
+
+ $IMMUTABLE_METACLASS->make_metaclass_immutable(
+ $self,
+ constructor_class => 'Moose::Meta::Method::Constructor',
+ destructor_class => 'Moose::Meta::Method::Destructor',
+ inline_destructor => 1,
+ # NOTE:
+ # no need to do this,
+ # Moose always does it
+ inline_accessors => 0,
+ @_,
+ )
+ }
+}
1;
=item B<initialize>
+=item B<make_immutable>
+
=item B<new_object>
We override this method to support the C<trigger> attribute option.
This method makes sure to handle the moose weak-ref, type-constraint
and type coercion features.
-=item B<has_method ($name)>
+=item B<get_method_map>
-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.
This will create an C<augment> method modifier for you, and install
it in the package.
+=item B<calculate_all_roles>
+
=item B<roles>
This will return an array of C<Moose::Meta::Role> instances which are
not only check it's local roles, but ask them as well in order to
cascade down the role hierarchy.
-=item B<add_attribute $attr_name, %params>
-
-This method does the same thing as L<Class::MOP::Class/add_attribute>, but adds
-suport for delegation.
-
-=back
-
-=head1 INTERNAL METHODS
-
-=over 4
-
-=item compute_delegation
-
-=item generate_delegation_list
-
-=item generate_delgate_method
-
-=item get_delegatable_methods
+=item B<add_attribute ($attr_name, %params|$params)>
-=item filter_delegations
+This method does the same thing as L<Class::MOP::Class::add_attribute>, but adds
+support for taking the C<$params> as a HASH ref.
=back
=head1 COPYRIGHT AND LICENSE
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006, 2007 by Infinity Interactive, Inc.
L<http://www.iinteractive.com>
projects / gitmo/Moose.git / blobdiff