X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod.pm;h=aa252281525d0c515737136a8c274f27712104eb;hb=e41d1dd685584e6461d9198a9478404025022e29;hp=fb90eda7fdbb1fbf245a6a8a17e9df32051749a9;hpb=0310d95d482349208449c86f91b5aa661d6411d4;p=gitmo%2FClass-MOP.git
diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index fb90eda..aa25228 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.65';
+our $VERSION = '1.06';
$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,13 +28,20 @@ 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 = (ref($class) || $class)->_new(\%params);
+ my $self = $class->_new(\%params);
weaken($self->{associated_metaclass}) if $self->{associated_metaclass};
@@ -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,20 +80,62 @@ sub detach_from_class {
delete $self->{associated_metaclass};
}
-sub package_name { (shift)->{'package_name'} }
+sub fully_qualified_name {
+ my $self = shift;
+ $self->package_name . '::' . $self->name;
+}
-sub name { (shift)->{'name'} }
+sub original_method { (shift)->{'original_method'} }
-sub fully_qualified_name {
- my $code = shift;
- $code->package_name . '::' . $code->name;
+sub _set_original_method { $_[0]->{'original_method'} = $_[1] }
+
+# It's possible that this could cause a loop if there is a circular
+# reference in here. That shouldn't ever happen in normal
+# circumstances, since original method only gets set when clone is
+# called. We _could_ check for such a loop, but it'd involve some sort
+# of package-lexical variable, and wouldn't be terribly subclassable.
+sub original_package_name {
+ my $self = shift;
+
+ $self->original_method
+ ? $self->original_method->original_package_name
+ : $self->package_name;
}
-# NOTE:
-# the Class::MOP bootstrap
-# will create this for us
-# - SL
-# sub clone { ... }
+sub original_name {
+ my $self = shift;
+
+ $self->original_method
+ ? $self->original_method->original_name
+ : $self->name;
+}
+
+sub original_fully_qualified_name {
+ my $self = shift;
+
+ $self->original_method
+ ? $self->original_method->original_fully_qualified_name
+ : $self->fully_qualified_name;
+}
+
+sub execute {
+ my $self = shift;
+ $self->body->(@_);
+}
+
+# We used to go through use Class::MOP::Class->clone_instance to do this, but
+# this was awfully slow. This method may be called a number of times when
+# classes are loaded (especially during Moose role application), so it is
+# worth optimizing. - DR
+sub clone {
+ my $self = shift;
+
+ my $clone = bless { %{$self}, @_ }, blessed($self);
+
+ $clone->_set_original_method($self);
+
+ return $clone;
+}
1;
@@ -107,78 +150,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
-=item B
+The method name (without a package name). This is required if C<$code>
+is a coderef.
-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.
+=item * package_name
-=item B
+The package name for the method. This is required if C<$code> is a
+coderef.
-This will make a copy of the object, allowing you to override
-any values by stuffing them in C<%params>.
+=item * associated_metaclass
+
+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.
-=item B
+When a method is cloned, the original method object will be available
+by calling C on the clone.
-This returns the actual CODE reference of the particular instance.
+=item B<< $metamethod->body >>
-=item B
+This returns a reference to the method's subroutine.
-This returns the name of the CODE reference.
+=item B<< $metamethod->name >>
-=item B
+This returns the method's name
-The metaclass of the method
+=item B<< $metamethod->package_name >>
-=item B
+This returns the method's package name.
-This returns the package name that the CODE reference is attached to.
+=item B<< $metamethod->fully_qualified_name >>
-=item B
+This returns the method's fully qualified name (package name and
+method name).
-This returns the fully qualified name of the CODE reference.
+=item B<< $metamethod->associated_metaclass >>
-=back
+This returns the L object for the method, if one
+exists.
-=head2 Metaclass
+=item B<< $metamethod->original_method >>
-=over 4
+If this method object was created as a clone of some other method
+object, this returns the object that was cloned.
+
+=item B<< $metamethod->original_name >>
+
+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<< $metamethod->original_package_name >>
+
+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<< $metamethod->original_fully_qualified_name >>
+
+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.
+
+=item B<< $metamethod->attach_to_class($metaclass) >>
+
+Given a L object, this method sets the associated
+metaclass for the method. This will overwrite any existing associated
+metaclass.
+
+=item B<< $metamethod->detach_from_class >>
+
+Removes any associated metaclass object for the method.
+
+=item B<< $metamethod->execute(...) >>
-=item B
+This executes the method. Any arguments provided will be passed on to
+the method itself.
-Sets the associated metaclass
+=item B<< Class::MOP::Method->meta >>
-=item B
+This will return a L instance for this class.
-Disassociates the method from the metaclass
+It should also be noted that L will actually bootstrap
+this module by installing a number of attribute meta-objects into its
+metaclass.
=back
@@ -188,7 +277,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