From: Stevan Little Date: Tue, 29 Aug 2006 14:04:12 +0000 (+0000) Subject: no more _role_meta crapsvk status! X-Git-Tag: 0_12~3 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=68efb0148447f7c638d4278e2d002bc3bb13cfbb;hp=3279ab4afa0c9be0568f48142b96d34548a5840e;p=gitmo%2FMoose.git no more _role_meta crapsvk status! --- diff --git a/Changes b/Changes index f826452..5a89f1b 100644 --- a/Changes +++ b/Changes @@ -8,15 +8,24 @@ Revision history for Perl extension Moose - fixed "bad meta" error message to be more descriptive - fixed &unimport to not remove the &inner and &super keywords because we need to localize them. + - fixed number of spelling/grammer issues, thanks Theory :) + *~~ experimental feature ~~* + - added the method and self keywords, they are basically + just sugar, and they may not stay around. * Moose::Object - - added &dump method, cause it makes all out lives - easier really. + - added &dump method to easily Data::Dumper + an object * Moose::Meta::TypeConstraint - added the &is_a_type_of method to check both the current and the subtype of a method (similar to &isa with classes) + * Moose::Meta::Role + - this is now a subclass of Class::MOP::Module, and no longer + creates the _role_meta ugliness of before. + - fixed tests to reflect this change + 0.11 Wed. July 12, 2006 * Moose - added an &unimport method to remove all the keywords diff --git a/lib/Moose.pm b/lib/Moose.pm index 0412fd9..794719d 100644 --- a/lib/Moose.pm +++ b/lib/Moose.pm @@ -140,6 +140,8 @@ use Moose::Util::TypeConstraints; }; }, + # NOTE: + # this is experimental for now ... self => sub { return subname 'Moose::self' => sub {}; }, @@ -294,7 +296,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. @@ -307,36 +309,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. @@ -353,12 +355,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 @@ -383,13 +385,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. @@ -406,17 +408,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> @@ -424,7 +427,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 ]> @@ -440,44 +443,44 @@ 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. @@ -509,7 +512,7 @@ to work. Here is an example: =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 @@ -536,17 +539,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 @@ -568,6 +571,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 diff --git a/lib/Moose/Meta/Class.pm b/lib/Moose/Meta/Class.pm index 7445129..88e9b55 100644 --- a/lib/Moose/Meta/Class.pm +++ b/lib/Moose/Meta/Class.pm @@ -101,6 +101,9 @@ sub has_method { my $sub_name = ($self->name . '::' . $method_name); + # FIXME: + # this should use the ::Package code + # and not turn off strict refs no strict 'refs'; return 0 if !defined(&{$sub_name}); my $method = \&{$sub_name}; @@ -174,8 +177,7 @@ sub add_augment_method_modifier { 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'); } @@ -226,6 +228,10 @@ sub _apply_all_roles { $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); @@ -318,7 +324,7 @@ and type coercion features. =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. diff --git a/lib/Moose/Meta/Role.pm b/lib/Moose/Meta/Role.pm index 3343dbd..3669b87 100644 --- a/lib/Moose/Meta/Role.pm +++ b/lib/Moose/Meta/Role.pm @@ -13,14 +13,9 @@ use Moose::Meta::Class; our $VERSION = '0.04'; -## Attributes - -## the meta for the role package +use base 'Class::MOP::Module'; -__PACKAGE__->meta->add_attribute('_role_meta' => ( - reader => '_role_meta', - init_arg => ':role_meta' -)); +## Attributes ## roles @@ -52,17 +47,7 @@ __PACKAGE__->meta->add_attribute('required_methods' => ( ## Methods -sub new { - my $class = shift; - my %options = @_; - $options{':role_meta'} = Moose::Meta::Class->initialize( - $options{role_name}, - ':method_metaclass' => 'Moose::Meta::Role::Method' - ) unless defined $options{':role_meta'} && - $options{':role_meta'}->isa('Moose::Meta::Class'); - my $self = $class->meta->new_object(%options); - return $self; -} +sub method_metaclass { 'Moose::Meta::Role::Method' } ## subroles @@ -141,19 +126,10 @@ sub _clean_up_required_methods { ## methods -# NOTE: -# we delegate to some role_meta methods for convience here -# the Moose::Meta::Role is meant to be a read-only interface -# to the underlying role package, if you want to manipulate -# that, just use ->role_meta - -sub name { (shift)->_role_meta->name } -sub version { (shift)->_role_meta->version } - -sub get_method { (shift)->_role_meta->get_method(@_) } -sub find_method_by_name { (shift)->_role_meta->find_method_by_name(@_) } -sub has_method { (shift)->_role_meta->has_method(@_) } -sub alias_method { (shift)->_role_meta->alias_method(@_) } +sub get_method { (shift)->Moose::Meta::Class::get_method(@_) } +sub find_method_by_name { (shift)->Moose::Meta::Class::find_method_by_name(@_) } +sub has_method { (shift)->Moose::Meta::Class::has_method(@_) } +sub alias_method { (shift)->Moose::Meta::Class::alias_method(@_) } sub get_method_list { my ($self) = @_; grep { @@ -163,7 +139,7 @@ sub get_method_list { # but they do, so we need to switch Moose::Role # and Moose to use Sub::Exporter to prevent this !/^(meta|has|extends|blessed|confess|augment|inner|override|super|before|after|around|with|requires)$/ - } $self->_role_meta->get_method_list; + } $self->Moose::Meta::Class::get_method_list; } # ... however the items in statis (attributes & method modifiers) @@ -298,8 +274,8 @@ sub _apply_methods { # is probably fairly safe to assume that # anon classes will only be used internally # or by people who know what they are doing - $other->_role_meta->remove_method($method_name) - if $other->_role_meta->name =~ /__ANON__/; + $other->Moose::Meta::Class::remove_method($method_name) + if $other->name =~ /__ANON__/; } else { next; @@ -330,12 +306,16 @@ sub apply { $other->add_role($self); } +my $anon_counter = 0; + sub combine { my ($class, @roles) = @_; - my $combined = $class->new( - ':role_meta' => Moose::Meta::Class->create_anon_class() - ); + my $pkg_name = __PACKAGE__ . "::__ANON__::" . $anon_counter++; + eval "package " . $pkg_name . "; our \$VERSION = '0.00';"; + die $@ if $@; + + my $combined = $class->initialize($pkg_name); foreach my $role (@roles) { $role->apply($combined); @@ -422,6 +402,8 @@ probably not that much really). =over 4 +=item B + =item B =item B diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm index 58d2b4b..a1e51b8 100644 --- a/lib/Moose/Role.pm +++ b/lib/Moose/Role.pm @@ -35,11 +35,11 @@ use Moose::Util::TypeConstraints; if ($role->can('meta')) { $meta = $role->meta(); (blessed($meta) && $meta->isa('Moose::Meta::Role')) - || confess "Whoops, not møøsey enough"; + || confess "You already have a &meta function, but it does not return a Moose::Meta::Role"; } else { - $meta = Moose::Meta::Role->new(role_name => $role); - $meta->_role_meta->add_method('meta' => sub { $meta }) + $meta = Moose::Meta::Role->initialize($role); + $meta->Moose::Meta::Class::add_method('meta' => sub { $meta }) } return $METAS{$role} = $meta; diff --git a/t/040_meta_role.t b/t/040_meta_role.t index a972b20..df706f3 100644 --- a/t/040_meta_role.t +++ b/t/040_meta_role.t @@ -18,12 +18,9 @@ BEGIN { sub foo { 'FooRole::foo' } } -my $foo_role = Moose::Meta::Role->new( - role_name => 'FooRole' -); +my $foo_role = Moose::Meta::Role->initialize('FooRole'); isa_ok($foo_role, 'Moose::Meta::Role'); - -isa_ok($foo_role->_role_meta, 'Class::MOP::Class'); +isa_ok($foo_role, 'Class::MOP::Module'); is($foo_role->name, 'FooRole', '... got the right name of FooRole'); is($foo_role->version, '0.01', '... got the right version of FooRole'); diff --git a/t/041_role.t b/t/041_role.t index 5d1195e..b4937e9 100644 --- a/t/041_role.t +++ b/t/041_role.t @@ -44,8 +44,7 @@ words, should 'has_method' return true for them? my $foo_role = FooRole->meta; isa_ok($foo_role, 'Moose::Meta::Role'); - -isa_ok($foo_role->_role_meta, 'Class::MOP::Class'); +isa_ok($foo_role, 'Class::MOP::Module'); is($foo_role->name, 'FooRole', '... got the right name of FooRole'); is($foo_role->version, '0.01', '... got the right version of FooRole'); diff --git a/t/045_role_exclusion.t b/t/045_role_exclusion.t index eee5539..2f99164 100644 --- a/t/045_role_exclusion.t +++ b/t/045_role_exclusion.t @@ -67,7 +67,7 @@ the roles into the same class ::throws_ok { with 'Molecule::Organic', 'Molecule::Inorganic'; - } qr/Conflict detected: Class::MOP::Class::__ANON__::SERIAL::1 excludes role \'Molecule::Inorganic\'/, + } qr/Conflict detected: .+ excludes role \'Molecule::Inorganic\'/, '... adding the role w/ excluded role conflict dies okay'; package My::Test3;