X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=7ba56929e1674836fa028b965502eaad7d804abf;hb=88ed718958233d513d2a64db12c69ec2e2653e0c;hp=07b54e7aa211cbdc3d96202ece664a071e63b545;hpb=4f5b44a07ba66f7a5997e6531d38a5fbf2cb3593;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index 07b54e7..7ba5692 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -4,8 +4,8 @@ use warnings; use Mouse::Meta::Method::Constructor; use Mouse::Meta::Method::Destructor; -use Scalar::Util qw/blessed/; -use Mouse::Util qw/get_linear_isa/; +use Scalar::Util qw/blessed weaken/; +use Mouse::Util qw/get_linear_isa version authority identifier/; use Carp 'confess'; do { @@ -20,29 +20,41 @@ do { } sub initialize { - my $class = shift; - my $name = shift; - $METACLASS_CACHE{$name} = $class->new(name => $name) - if !exists($METACLASS_CACHE{$name}); - return $METACLASS_CACHE{$name}; + my($class, $package_name, @args) = @_; + + ($package_name && !ref($package_name)) + || confess("You must pass a package name and it cannot be blessed"); + + return $METACLASS_CACHE{$package_name} + ||= $class->_construct_class_instance(package => $package_name, @args); } + + # Means of accessing all the metaclasses that have + # been initialized thus far + sub get_all_metaclasses { %METACLASS_CACHE } + sub get_all_metaclass_instances { values %METACLASS_CACHE } + sub get_all_metaclass_names { keys %METACLASS_CACHE } + sub get_metaclass_by_name { $METACLASS_CACHE{$_[0]} } + sub store_metaclass_by_name { $METACLASS_CACHE{$_[0]} = $_[1] } + sub weaken_metaclass { weaken($METACLASS_CACHE{$_[0]}) } + sub does_metaclass_exist { exists $METACLASS_CACHE{$_[0]} && defined $METACLASS_CACHE{$_[0]} } + sub remove_metaclass_by_name { $METACLASS_CACHE{$_[0]} = undef } }; -sub new { - my $class = shift; - my %args = @_; +sub _construct_class_instance { + my($class, %args) = @_; - $args{attributes} = {}; + $args{attributes} = {}; $args{superclasses} = do { no strict 'refs'; - \@{ $args{name} . '::ISA' }; + \@{ $args{package} . '::ISA' }; }; $args{roles} ||= []; bless \%args, $class; } -sub name { $_[0]->{name} } +sub name { $_[0]->{package} } sub superclasses { my $self = shift; @@ -68,6 +80,12 @@ sub add_method { *{ $pkg . '::' . $name } = $code; } +sub has_method { + my $self = shift; + my $name = shift; + $self->name->can($name); +} + # copied from Class::Inspector my $get_methods_for_class = sub { my $self = shift; @@ -76,7 +94,7 @@ my $get_methods_for_class = sub { no strict 'refs'; # Get all the CODE symbol table entries my @functions = - grep !/^(?:has|with|around|before|after|blessed|extends|confess|override|super)$/, + grep !/^(?:has|with|around|before|after|augment|inner|blessed|extends|confess|override|super)$/, grep { defined &{"${name}::$_"} } keys %{"${name}::"}; push @functions, keys %{$self->{'methods'}->{$name}} if $self; @@ -98,12 +116,39 @@ sub get_all_method_names { sub add_attribute { my $self = shift; - my $attr = shift; - $self->{'attributes'}{$attr->name} = $attr; + if (@_ == 1 && blessed($_[0])) { + my $attr = shift @_; + $self->{'attributes'}{$attr->name} = $attr; + } else { + my $names = shift @_; + $names = [$names] if !ref($names); + my $metaclass = 'Mouse::Meta::Attribute'; + my %options = @_; + + if ( my $metaclass_name = delete $options{metaclass} ) { + my $new_class = Mouse::Util::resolve_metaclass_alias( + 'Attribute', + $metaclass_name + ); + if ( $metaclass ne $new_class ) { + $metaclass = $new_class; + } + } + + for my $name (@$names) { + if ($name =~ s/^\+//) { + $metaclass->clone_parent($self, $name, @_); + } + else { + $metaclass->create($self, $name, @_); + } + } + } } -sub compute_all_applicable_attributes { +sub compute_all_applicable_attributes { shift->get_all_attributes(@_) } +sub get_all_attributes { my $self = shift; my (@attr, %seen); @@ -123,6 +168,10 @@ sub compute_all_applicable_attributes { sub get_attribute_map { $_[0]->{attributes} } sub has_attribute { exists $_[0]->{attributes}->{$_[1]} } sub get_attribute { $_[0]->{attributes}->{$_[1]} } +sub get_attribute_list { + my $self = shift; + keys %{$self->get_attribute_map}; +} sub linearized_isa { @{ get_linear_isa($_[0]->name) } } @@ -144,7 +193,7 @@ sub clone_instance { my $clone = bless { %$instance }, ref $instance; - foreach my $attr ($class->compute_all_applicable_attributes()) { + foreach my $attr ($class->get_all_attributes()) { if ( defined( my $init_arg = $attr->init_arg ) ) { if (exists $params{$init_arg}) { $clone->{ $attr->name } = $params{$init_arg}; @@ -160,6 +209,7 @@ sub make_immutable { my $self = shift; my %args = ( inline_constructor => 1, + inline_destructor => 1, @_, ); @@ -234,6 +284,22 @@ sub add_after_method_modifier { $self->_install_modifier( $self->name, 'after', $name, $code ); } +sub add_override_method_modifier { + my ($self, $name, $code) = @_; + + my $pkg = $self->name; + my $method = "${pkg}::${name}"; + + # Class::Method::Modifiers won't do this for us, so do it ourselves + + my $body = $pkg->can($name) + or confess "You cannot override '$method' because it has no super method"; + + no strict 'refs'; + *$method = sub { $code->($pkg, $body, @_) }; +} + + sub roles { $_[0]->{roles} } sub does_role { @@ -242,15 +308,18 @@ sub does_role { (defined $role_name) || confess "You must supply a role name to look for"; - for my $role (@{ $self->{roles} }) { - return 1 if $role->name eq $role_name; + for my $class ($self->linearized_isa) { + next unless $class->can('meta') and $class->meta->can('roles'); + for my $role (@{ $class->meta->roles }) { + return 1 if $role->name eq $role_name; + } } return 0; } sub create { - my ($self, $package_name, %options) = @_; + my ($class, $package_name, %options) = @_; (ref $options{superclasses} eq 'ARRAY') || confess "You must pass an ARRAY ref of superclasses" @@ -287,11 +356,11 @@ sub create { version authority )}; - my $meta = $self->initialize( $package_name => %initialize_options ); + my $meta = $class->initialize( $package_name => %initialize_options ); # FIXME totally lame $meta->add_method('meta' => sub { - $self->initialize(ref($_[0]) || $_[0]); + Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]); }); $meta->superclasses(@{$options{superclasses}}) @@ -351,12 +420,12 @@ Returns the name of the owner class. Gets (or sets) the list of superclasses of the owner class. -=head2 add_attribute Mouse::Meta::Attribute +=head2 add_attribute (Mouse::Meta::Attribute| name => spec) Begins keeping track of the existing L for the owner class. -=head2 compute_all_applicable_attributes -> (Mouse::Meta::Attribute) +=head2 get_all_attributes -> (Mouse::Meta::Attribute) Returns the list of all L instances associated with this class and its superclasses. @@ -366,6 +435,12 @@ this class and its superclasses. Returns a mapping of attribute names to their corresponding L objects. +=head2 get_attribute_list -> { name => Mouse::Meta::Attribute } + +This returns a list of attribute names which are defined in the local +class. If you want a list of all applicable attributes for a class, +use the C method. + =head2 has_attribute Name -> Bool Returns whether we have a L with the given name. @@ -385,7 +460,8 @@ metaclass. =head2 clone_instance Instance, Parameters -> Instance -Clones the given C and sets any additional parameters. +The clone_instance method has been made private. +The public version is deprecated. =cut