X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=199bc3bcbeb01f8aa18eb8c0ddffa3494756553b;hb=1af3d9e7321d3d561b1c6da5c943af9a64032cee;hp=a619c2b2181e88cbdb698611f20465efe97db56e;hpb=c2829bbc6f2b88e33a5854e267cca9374e611957;p=gitmo%2FClass-MOP.git diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm index a619c2b..199bc3b 100644 --- a/lib/Class/MOP/Method.pm +++ b/lib/Class/MOP/Method.pm @@ -5,9 +5,9 @@ use strict; use warnings; use Carp 'confess'; -use Scalar::Util 'weaken'; +use Scalar::Util 'weaken', 'reftype', 'blessed'; -our $VERSION = '0.71'; +our $VERSION = '1.00'; $VERSION = eval $VERSION; our $AUTHORITY = 'cpan:STEVAN'; @@ -18,15 +18,6 @@ use base 'Class::MOP::Object'; # they should act like CODE refs. use overload '&{}' => sub { $_[0]->body }, fallback => 1; -our $UPGRADE_ERROR_TEXT = q{ ---------------------------------------------------------- -NOTE: this error is likely not an error, but a regression -caused by the latest upgrade to Moose/Class::MOP. Consider -upgrading any MooseX::* modules to their latest versions -before spending too much time chasing this one down. ---------------------------------------------------------- -}; - # construction sub wrap { @@ -37,11 +28,18 @@ sub wrap { my %params = @args; my $code = $params{body}; - ('CODE' eq ref($code)) - || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; + if (blessed($code) && $code->isa(__PACKAGE__)) { + my $method = $code->clone; + delete $params{body}; + Class::MOP::class_of($class)->rebless_instance($method, %params); + return $method; + } + elsif (!ref $code || 'CODE' ne reftype($code)) { + confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")"; + } ($params{package_name} && $params{name}) - || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT"; + || confess "You must supply the package_name and name parameters"; my $self = $class->_new(\%params); @@ -52,20 +50,23 @@ sub wrap { sub _new { my $class = shift; + + return Class::MOP::Class->initialize($class)->new_object(@_) + if $class ne __PACKAGE__; + my $params = @_ == 1 ? $_[0] : {@_}; - my $self = bless { + return bless { 'body' => $params->{body}, 'associated_metaclass' => $params->{associated_metaclass}, 'package_name' => $params->{package_name}, 'name' => $params->{name}, + 'original_method' => $params->{original_method}, } => $class; } ## accessors -sub body { (shift)->{'body'} } - sub associated_metaclass { shift->{'associated_metaclass'} } sub attach_to_class { @@ -79,10 +80,6 @@ sub detach_from_class { delete $self->{associated_metaclass}; } -sub package_name { (shift)->{'package_name'} } - -sub name { (shift)->{'name'} } - sub fully_qualified_name { my $self = shift; $self->package_name . '::' . $self->name; @@ -145,120 +142,124 @@ Class::MOP::Method - Method Meta Object =head1 DESCRIPTION The Method Protocol is very small, since methods in Perl 5 are just -subroutines within the particular package. We provide a very basic +subroutines in a specific package. We provide a very basic introspection interface. =head1 METHODS -=head2 Introspection - =over 4 -=item B +=item B<< Class::MOP::Method->wrap($code, %options) >> -This will return a B instance which is related -to this class. +This is the constructor. It accepts a method body in the form of +either a code reference or a L instance, followed +by a hash of options. -=back +The options are: -=head2 Construction +=over 8 -=over 4 +=item * name + +The method name (without a package name). This is required if C<$code> +is a coderef. -=item B +=item * package_name -This is the basic constructor, it returns a B -instance which wraps the given C<$code> reference. You can also -set the C and C attributes using the C<%params>. -If these are not set, then thier accessors will attempt to figure -it out using the C function. +The package name for the method. This is required if C<$code> is a +coderef. -=item B +=item * associated_metaclass -This will make a copy of the object, allowing you to override -any values by stuffing them in C<%params>. +An optional L object. This is the metaclass for the +method's class. =back -=head2 Informational +=item B<< $metamethod->clone(%params) >> -=over 4 +This makes a shallow clone of the method object. In particular, +subroutine reference itself is shared between all clones of a given +method. + +When a method is cloned, the original method object will be available +by calling C on the clone. -=item B +=item B<< $metamethod->body >> -This returns the actual CODE reference of the particular instance. +This returns a reference to the method's subroutine. -=item B +=item B<< $metamethod->name >> -This returns the name of the CODE reference. +This returns the method's name -=item B +=item B<< $metamethod->package_name >> -The metaclass of the method +This returns the method's package name. -=item B +=item B<< $metamethod->fully_qualified_name >> -This returns the package name that the CODE reference is attached to. +This returns the method's fully qualified name (package name and +method name). -=item B +=item B<< $metamethod->associated_metaclass >> -This returns the fully qualified name of the CODE reference. +This returns the L object for the method, if one +exists. -=item B +=item B<< $metamethod->original_method >> If this method object was created as a clone of some other method object, this returns the object that was cloned. -=item B +=item B<< $metamethod->original_name >> -This returns the original name of the CODE reference, wherever it was -first defined. +This returns the method's original name, wherever it was first +defined. If this method is a clone of a clone (of a clone, etc.), this method returns the name from the I method in the chain of clones. -=item B +=item B<< $metamethod->original_package_name >> -This returns the original package name that the CODE reference is -attached to, wherever it was first defined. +This returns the method's original package name, wherever it was first +defined. If this method is a clone of a clone (of a clone, etc.), this method returns the package name from the I method in the chain of clones. -=item B +=item B<< $metamethod->original_fully_qualified_name >> -This returns the original fully qualified name of the CODE reference, -wherever it was first defined. +This returns the method's original fully qualified name, wherever it +was first defined. If this method is a clone of a clone (of a clone, etc.), this method returns the fully qualified name from the I method in the chain of clones. -=back +=item B<< $metamethod->attach_to_class($metaclass) >> -=head2 Metaclass - -=over 4 +Given a L object, this method sets the associated +metaclass for the method. This will overwrite any existing associated +metaclass. -=item B +=item B<< $metamethod->detach_from_class >> -Sets the associated metaclass +Removes any associated metaclass object for the method. -=item B +=item B<< $metamethod->execute(...) >> -Disassociates the method from the metaclass +This executes the method. Any arguments provided will be passed on to +the method itself. -=back - -=head2 Miscellaneous - -=over 4 +=item B<< Class::MOP::Method->meta >> -=item B +This will return a L instance for this class. -Executes the method. Be sure to pass in the instance, since the -method expects it. +It should also be noted that L will actually bootstrap +this module by installing a number of attribute meta-objects into its +metaclass. =back @@ -268,7 +269,7 @@ Stevan Little Estevan@iinteractive.comE =head1 COPYRIGHT AND LICENSE -Copyright 2006-2008 by Infinity Interactive, Inc. +Copyright 2006-2010 by Infinity Interactive, Inc. L