X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=abc8a2595208922c701015010577ca25436459fb;hb=eb05b8be3e00193d58bb9a448397dd7f1375faa7;hp=f4a94e42c5adc787cf7cf09826bf40d0051e6693;hpb=616d0d647c262785d52e0cef6bbac65ca9e65e49;p=gitmo%2FMouse.git diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm index f4a94e4..abc8a25 100644 --- a/lib/Mouse/Meta/Class.pm +++ b/lib/Mouse/Meta/Class.pm @@ -4,46 +4,29 @@ use warnings; use Mouse::Meta::Method::Constructor; use Mouse::Meta::Method::Destructor; -use Scalar::Util qw/blessed/; -use Mouse::Util qw/get_linear_isa version authority identifier/; +use Scalar::Util qw/blessed weaken/; +use Mouse::Util qw/get_linear_isa/; use Carp 'confess'; -do { - my %METACLASS_CACHE; +use base qw(Mouse::Meta::Module); - # because Mouse doesn't introspect existing classes, we're forced to - # only pay attention to other Mouse classes - sub _metaclass_cache { - my $class = shift; - my $name = shift; - return $METACLASS_CACHE{$name}; - } - - sub initialize { - my $class = blessed($_[0]) || $_[0]; - my $name = $_[1]; - $METACLASS_CACHE{$name} = $class->new(name => $name) - if !exists($METACLASS_CACHE{$name}); - return $METACLASS_CACHE{$name}; - } -}; +sub _new { + my($class, %args) = @_; -sub new { - my $class = shift; - my %args = @_; + $args{attributes} ||= {}; + $args{methods} ||= {}; + $args{roles} ||= []; - $args{attributes} = {}; $args{superclasses} = do { no strict 'refs'; - \@{ $args{name} . '::ISA' }; + \@{ $args{package} . '::ISA' }; }; - $args{roles} ||= []; bless \%args, $class; } -sub name { $_[0]->{name} } +sub roles { $_[0]->{roles} } sub superclasses { my $self = shift; @@ -56,50 +39,11 @@ sub superclasses { @{ $self->{superclasses} }; } -sub add_method { - my $self = shift; - my $name = shift; - my $code = shift; - - my $pkg = $self->name; - - no strict 'refs'; - no warnings 'redefine'; - $self->{'methods'}->{$name}++; # Moose stores meta object here. - *{ $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; - my $name = shift; - - no strict 'refs'; - # Get all the CODE symbol table entries - my @functions = - 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; - wantarray ? @functions : \@functions; -}; - -sub get_method_list { - my $self = shift; - $get_methods_for_class->($self, $self->name); -} - sub get_all_method_names { my $self = shift; my %uniq; return grep { $uniq{$_}++ == 0 } - map { $get_methods_for_class->(undef, $_) } + map { Mouse::Meta::Class->initialize($_)->get_method_list() } $self->linearized_isa; } @@ -136,7 +80,8 @@ sub add_attribute { } } -sub compute_all_applicable_attributes { +sub compute_all_applicable_attributes { shift->get_all_attributes(@_) } +sub get_all_attributes { my $self = shift; my (@attr, %seen); @@ -153,12 +98,61 @@ sub compute_all_applicable_attributes { return @attr; } -sub get_attribute_map { $_[0]->{attributes} } -sub has_attribute { exists $_[0]->{attributes}->{$_[1]} } -sub get_attribute { $_[0]->{attributes}->{$_[1]} } - sub linearized_isa { @{ get_linear_isa($_[0]->name) } } +sub new_object { + my $self = shift; + my $args = (@_ == 1) ? $_[0] : { @_ }; + + foreach my $attribute ($self->meta->get_all_attributes) { + my $from = $attribute->init_arg; + my $key = $attribute->name; + + if (defined($from) && exists($args->{$from})) { + $args->{$from} = $attribute->coerce_constraint($args->{$from}) + if $attribute->should_coerce; + $attribute->verify_against_type_constraint($args->{$from}); + + $instance->{$key} = $args->{$from}; + + weaken($instance->{$key}) + if $attribute->is_weak_ref; + + if ($attribute->has_trigger) { + $attribute->trigger->($instance, $args->{$from}); + } + } + else { + if ($attribute->has_default || $attribute->has_builder) { + unless ($attribute->is_lazy) { + my $default = $attribute->default; + my $builder = $attribute->builder; + my $value = $attribute->has_builder + ? $instance->$builder + : ref($default) eq 'CODE' + ? $default->($instance) + : $default; + + $value = $attribute->coerce_constraint($value) + if $attribute->should_coerce; + $attribute->verify_against_type_constraint($value); + + $instance->{$key} = $value; + + weaken($instance->{$key}) + if $attribute->is_weak_ref; + } + } + else { + if ($attribute->is_required) { + confess "Attribute (".$attribute->name.") is required"; + } + } + } + } + return $instance; +} + sub clone_object { my $class = shift; my $instance = shift; @@ -177,7 +171,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}; @@ -193,6 +187,7 @@ sub make_immutable { my $self = shift; my %args = ( inline_constructor => 1, + inline_destructor => 1, @_, ); @@ -282,24 +277,26 @@ sub add_override_method_modifier { *$method = sub { $code->($pkg, $body, @_) }; } - -sub roles { $_[0]->{roles} } - sub does_role { my ($self, $role_name) = @_; (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) { + my $meta = Mouse::class_of($class); + next unless $meta && $meta->can('roles'); + + for my $role (@{ $meta->roles }) { + return 1 if $role->does_role($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" @@ -336,11 +333,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}}) @@ -405,7 +402,7 @@ Gets (or sets) the list of superclasses of the owner class. 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. @@ -415,6 +412,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. @@ -434,7 +437,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