X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose.pm;h=8f6d75e1d98048f1f9528a0cf9fa0ff4ef456955;hb=3c2bc5e2dc448e36704a71f25d66503cef8831fb;hp=2da321af6857c2aa9f334dc8d60d8c31a4cd05f3;hpb=c235cd988555d93242c6708ad021e3c439fca2db;p=gitmo%2FMoose.git diff --git a/lib/Moose.pm b/lib/Moose.pm index 2da321a..8f6d75e 100644 --- a/lib/Moose.pm +++ b/lib/Moose.pm @@ -4,13 +4,13 @@ package Moose; use strict; use warnings; -our $VERSION = '0.09_02'; +our $VERSION = '0.13'; use Scalar::Util 'blessed', 'reftype'; use Carp 'confess'; use Sub::Name 'subname'; +use B 'svref_2object'; -use UNIVERSAL::require; use Sub::Exporter; use Class::MOP; @@ -44,7 +44,7 @@ use Moose::Util::TypeConstraints; # override a specific class $meta = $class->meta(); (blessed($meta) && $meta->isa('Moose::Meta::Class')) - || confess "Whoops, not møøsey enough"; + || confess "You already have a &meta function, but it does not return a Moose::Meta::Class"; } else { # NOTE: @@ -68,91 +68,30 @@ use Moose::Util::TypeConstraints; my %exports = ( extends => sub { my $class = $CALLER; - return subname 'Moose::extends' => sub ($;@) { + return subname 'Moose::extends' => sub (@) { + confess "Must derive at least one class" unless @_; _load_all_classes(@_); - my $meta = $class->meta; - foreach my $super (@_) { - # 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 - ($meta->isa(blessed($super->meta)) && - # and see if our instance metaclass is incompatible - $meta->instance_metaclass->isa($super->meta->instance_metaclass)) && - # ... and if we are just a vanilla Moose - $meta->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 - $meta = $super_meta->reinitialize($class => ( - ':attribute_metaclass' => $super_meta->attribute_metaclass, - ':method_metaclass' => $super_meta->method_metaclass, - ':instance_metaclass' => $super_meta->instance_metaclass, - )); - } - } + # this checks the metaclass to make sure + # it is correct, sometimes it can get out + # of sync when the classes are being built + my $meta = $class->meta->_fix_metaclass_incompatability(@_); $meta->superclasses(@_); }; }, with => sub { my $class = $CALLER; - return subname 'Moose::with' => sub ($;@) { + return subname 'Moose::with' => sub (@) { my (@roles) = @_; + confess "Must specify at least one role" unless @roles; _load_all_classes(@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($class->meta); - } - else { - Moose::Meta::Role->combine( - map { $_->meta } @roles - )->apply($class->meta); - } + $class->meta->_apply_all_roles(@roles); }; }, has => sub { my $class = $CALLER; return subname 'Moose::has' => sub ($;%) { my ($name, %options) = @_; - my $meta = $class->meta; - if ($name =~ /^\+(.*)/) { - my $inherited_attr = $meta->find_attribute_by_name($1); - (defined $inherited_attr) - || confess "Could not find an attribute by the name of '$1' 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 - ); - } - $meta->add_attribute($new_attr); - } - else { - if ($options{metaclass}) { - _load_all_classes($options{metaclass}); - $meta->add_attribute($options{metaclass}->new($name, %options)); - } - else { - $meta->add_attribute($name, %options); - } - } + $class->meta->_process_attribute($name, %options); }; }, before => sub { @@ -199,12 +138,32 @@ use Moose::Util::TypeConstraints; $class->meta->add_augment_method_modifier($name => $method); }; }, + + # NOTE: + # this is experimental for now ... + self => sub { + return subname 'Moose::self' => sub {}; + }, + method => sub { + my $class = $CALLER; + return subname 'Moose::method' => sub { + my ($name, $method) = @_; + $class->meta->add_method($name, sub { + my $self = shift; + no strict 'refs'; + no warnings 'redefine'; + local *{$class->meta->name . '::self'} = sub { $self }; + $method->(@_); + }); + }; + }, + confess => sub { return \&Carp::confess; }, blessed => sub { return \&Scalar::Util::blessed; - } + }, ); my $exporter = Sub::Exporter::build_exporter({ @@ -227,6 +186,28 @@ use Moose::Util::TypeConstraints; goto $exporter; } + + sub unimport { + no strict 'refs'; + my $class = caller(); + # loop through the exports ... + foreach my $name (keys %exports) { + next if $name =~ /inner|super|self/; + + # if we find one ... + if (defined &{$class . '::' . $name}) { + my $keyword = \&{$class . '::' . $name}; + + # make sure it is from Moose + my $pkg_name = eval { svref_2object($keyword)->GV->STASH->NAME }; + next if $@; + next if $pkg_name ne 'Moose'; + + # and if it is from Moose then undef the slot + delete ${$class . '::'}{$name}; + } + } + } } ## Utility functions @@ -237,9 +218,18 @@ sub _load_all_classes { # loaded in the symbol table next if _is_class_already_loaded($super); # otherwise require it ... - ($super->require) - || confess "Could not load superclass '$super' because : " . $UNIVERSAL::require::ERROR; - } + # NOTE: + # just in case the class we are + # loading has a locally defined + # &require, we make sure that we + # use the on in UNIVERSAL + my $file = $class . '.pm'; + $file =~ s{::}{/}g; + eval { CORE::require($file) }; + confess( + "Could not load module '$super' because : $@" + ) if $@; + } } sub _is_class_already_loaded { @@ -250,7 +240,7 @@ sub _is_class_already_loaded { next if substr($_, -2, 2) eq '::'; return 1 if defined &{"${name}::$_"}; } - return 0; + return 0; } 1; @@ -261,7 +251,7 @@ __END__ =head1 NAME -Moose - Moose, it's the new Camel +Moose - A complete modern object system for Perl 5 =head1 SYNOPSIS @@ -314,7 +304,7 @@ Moose is an extension of the Perl 5 object system. =head2 Another object system!?!? Yes, I know there has been an explosion recently of new ways to -build object's in Perl 5, most of them based on inside-out objects, +build object's in Perl 5, most of them based on inside-out objects and other such things. Moose is different because it is not a new object system for Perl 5, but instead an extension of the existing object system. @@ -327,36 +317,36 @@ programming. =head2 Can I use this in production? Or is this just an experiment? Moose is I on the prototypes and experiments I did for the Perl 6 -meta-model, however Moose is B an experiment/prototype, it is +meta-model; however Moose is B an experiment/prototype, it is for B. I will be deploying Moose into production environments later -this year, and I have all intentions of using it as my de-facto class -builderfrom now on. +this year, and I have every intentions of using it as my de facto class +builder from now on. =head2 Is Moose just Perl 6 in Perl 5? -No. While Moose is very much inspired by Perl 6, it is not. Instead, it -is an OO system for Perl 5. I built Moose because I was tired or writing -the same old boring Perl 5 OO code, and drooling over Perl 6 OO. So -instead of switching to Ruby, I wrote Moose :) +No. While Moose is very much inspired by Perl 6, it is not itself Perl 6. +Instead, it is an OO system for Perl 5. I built Moose because I was tired or +writing the same old boring Perl 5 OO code, and drooling over Perl 6 OO. So +instead of switching to Ruby, I wrote Moose :) =head1 BUILDING CLASSES WITH MOOSE -Moose makes every attempt to provide as much convience during class -construction/definition, but still stay out of your way if you want -it to. Here are a few items to note when building classes with Moose. +Moose makes every attempt to provide as much convenience as possible during +class construction/definition, but still stay out of your way if you want it +to. Here are a few items to note when building classes with Moose. Unless specified with C, any class which uses Moose will inherit from L. Moose will also manage all attributes (including inherited ones) that -are defined with C. And assuming that you call C which is +are defined with C. And assuming that you call C, which is inherited from L, then this includes properly initializing -all instance slots, setting defaults where approprtiate and performing any +all instance slots, setting defaults where appropriate, and performing any type constraint checking or coercion. =head1 EXPORTED FUNCTIONS -Moose will export a number of functions into the class's namespace, which +Moose will export a number of functions into the class's namespace which can then be used to set up the class. These functions all work directly on the current class. @@ -373,12 +363,12 @@ This function will set the superclass(es) for the current class. This approach is recommended instead of C, because C actually Ces onto the class's C<@ISA>, whereas C will replace it. This is important to ensure that classes which do not have -superclasses properly inherit from L. +superclasses still properly inherit from L. =item B This will apply a given set of C<@roles> to the local class. Role support -is currently under heavy development, see L for more details. +is currently under heavy development; see L for more details. =item B @@ -403,13 +393,13 @@ I, I and I options inherited from L option uses Moose's type constraint facilities to set up runtime type checking for this attribute. Moose will perform the checks during class construction, and within any accessors. The C<$type_name> argument must be a -string. The string can be either a class name, or a type defined using -Moose's type defintion features. +string. The string can be either a class name or a type defined using +Moose's type definition features. =item I (1|0)> This will attempt to use coercion with the supplied type constraint to change -the value passed into any accessors of constructors. You B have supplied +the value passed into any accessors or constructors. You B have supplied a type constraint in order for this to work. See L for an example usage. @@ -426,17 +416,18 @@ an accessor. =item I (1|0)> -This will tell the class to strore the value of this attribute as a weakened -reference. If an attribute is a weakened reference, it can B also be coerced. +This will tell the class to store the value of this attribute as a weakened +reference. If an attribute is a weakened reference, it B also be +coerced. =item I (1|0)> -This will tell the class to not create this slot until absolutely nessecary. +This will tell the class to not create this slot until absolutely necessary. If an attribute is marked as lazy it B have a default supplied. =item I (1|0)> -This tells the accessor whether to automatically de-reference the value returned. +This tells the accessor whether to automatically dereference the value returned. This is only legal if your C option is either an C or C. =item I $code> @@ -444,7 +435,7 @@ This is only legal if your C option is either an C or C. The trigger option is a CODE reference which will be called after the value of the attribute is set. The CODE ref will be passed the instance itself, the updated value and the attribute meta-object (this is for more advanced fiddling -and can typically be ignored in most cases). You can B have a trigger on +and can typically be ignored in most cases). You B have a trigger on a read-only attribute. =item I [ @handles ]> @@ -460,72 +451,76 @@ option. More docs to come later. =item B sub { ... }> -This three items are syntactic sugar for the before, after and around method +This three items are syntactic sugar for the before, after, and around method modifier features that L provides. More information on these can be found in the L documentation for now. =item B -The keyword C is a noop when called outside of an C method. In +The keyword C is a no-op when called outside of an C method. In the context of an C method, it will call the next most appropriate superclass method with the same arguments as the original method. =item B -An C method, is a way of explictly saying "I am overriding this +An C method is a way of explicitly saying "I am overriding this method from my superclass". You can call C within this method, and it will work as expected. The same thing I be accomplished with a normal -method call and the C pseudo-package, it is really your choice. +method call and the C pseudo-package; it is really your choice. =item B The keyword C, much like C, is a no-op outside of the context of an C method. You can think of C as being the inverse of -C, the details of how C and C work is best described in +C; the details of how C and C work is best described in the L. =item B -An C method, is a way of explictly saying "I am augmenting this +An C method, is a way of explicitly saying "I am augmenting this method from my superclass". Once again, the details of how C and C work is best described in the L. =item B -This is the C function, and exported here beause I use it +This is the C function, and exported here because I use it all the time. This feature may change in the future, so you have been warned. =item B -This is the C function, it is exported here beause I +This is the C function, it is exported here because I use it all the time. It is highly recommended that this is used instead of C anywhere you need to test for an object's class name. =back -=head1 FUTURE PLANS - -Here is just a sampling of the plans we have in store for Moose: - -=over 4 - -=item * +=head1 UNEXPORTING FUNCTIONS -Compiling Moose classes/roles into C<.pmc> files for faster loading and execution. +=head2 B -=item * +Moose offers a way of removing the keywords it exports though the C +method. You simply have to say C at the bottom of your code for this +to work. Here is an example: -Supporting sealed and finalized classes in Moose. This will allow greater control -of the extensions of frameworks and such. + package Person; + use Moose; -=back + has 'first_name' => (is => 'rw', isa => 'Str'); + has 'last_name' => (is => 'rw', isa => 'Str'); + + sub full_name { + my $self = shift; + $self->first_name . ' ' . $self->last_name + } + + no Moose; # keywords are removed from the Person package =head1 MISC. =head2 What does Moose stand for?? Moose doesn't stand for one thing in particular, however, if you -want, here are a few of my favorites, feel free to contribute +want, here are a few of my favorites; feel free to contribute more :) =over 4 @@ -552,17 +547,17 @@ more :) =item * -It should be noted that C and C can B be used in the same -method. However, they can be combined together with the same class hierarchy, +It should be noted that C and C C be used in the same +method. However, they can be combined together with the same class hierarchy; see F for an example. -The reason that this is so is because C is only valid within a method +The reason for this is that C is only valid within a method with the C modifier, and C will never be valid within an C method. In fact, C will skip over any C methods -when searching for it's appropriate C. +when searching for its appropriate C. This might seem like a restriction, but I am of the opinion that keeping these -two features seperate (but interoperable) actually makes them easy to use since +two features separate (but interoperable) actually makes them easy to use, since their behavior is then easier to predict. Time will tell if I am right or not. =back @@ -584,6 +579,8 @@ originally, I just ran with it. =item Thanks to mst & chansen and the whole #moose poose for all the ideas/feature-requests/encouragement +=item Thanks to David "Theory" Wheeler for meta-discussions and spelling fixes. + =back =head1 SEE ALSO @@ -594,6 +591,8 @@ ideas/feature-requests/encouragement =item The #moose channel on irc.perl.org +=item The Moose mailing list - moose@perl.org + =item L =item L