bump version and update changes for 0.65_05

[gitmo/Class-MOP.git] / lib / Class / MOP / Method.pm

diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index bbacdcf..c5058d8 100644 (file)
--- a/lib/Class/MOP/Method.pm
+++ b/lib/Class/MOP/Method.pm
@@ -5,52 +5,88 @@ use strict;
 use warnings;
 
 use Carp         'confess';
-use Scalar::Util 'reftype', 'blessed';
+use Scalar::Util 'weaken';
 
-our $VERSION   = '0.07';
+our $VERSION   = '0.64_05';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
 
 # NOTE:
-# if poked in the right way, 
+# if poked in the right way,
 # 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 { 
-    my ( $class, $code, %params ) = @_;
-    
-    ('CODE' eq (reftype($code) || ''))
+sub wrap {
+    my ( $class, @args ) = @_;
+
+    unshift @args, 'body' if @args % 2 == 1;
+
+    my %params = @args;
+    my $code = $params{body};
+
+    ('CODE' eq ref($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";
-    
-    bless { 
-        '&!body'         => $code,
-        '$!package_name' => $params{package_name},
-        '$!name'         => $params{name}, 
-    } => blessed($class) || $class;
+        || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT";
+
+    my $self = (ref($class) || $class)->_new(\%params);
+
+    weaken($self->{associated_metaclass}) if $self->{associated_metaclass};
+
+    return $self;
+}
+
+sub _new {
+    my $class = shift;
+    my $params = @_ == 1 ? $_[0] : {@_};
+
+    my $self = bless {
+        'body'                 => $params->{body},
+        'associated_metaclass' => $params->{associated_metaclass},
+        'package_name'         => $params->{package_name},
+        'name'                 => $params->{name},
+    } => $class;
 }
 
 ## accessors
 
-sub body { (shift)->{'&!body'} }
+sub body { (shift)->{'body'} }
+
+sub associated_metaclass { shift->{'associated_metaclass'} }
 
-# TODO - add associated_class
+sub attach_to_class {
+    my ( $self, $class ) = @_;
+    $self->{associated_metaclass} = $class;
+    weaken($self->{associated_metaclass});
+}
 
-# informational
+sub detach_from_class {
+    my $self = shift;
+    delete $self->{associated_metaclass};
+}
 
-sub package_name { 
+sub package_name {
     my $self = shift;
-    $self->{'$!package_name'} ||= (Class::MOP::get_code_info($self->body))[0];
+    $self->{'package_name'} ||= (Class::MOP::get_code_info($self->body))[0];
 }
 
-sub name { 
+sub name {
     my $self = shift;
-    $self->{'$!name'} ||= (Class::MOP::get_code_info($self->body))[1];
+    $self->{'name'} ||= (Class::MOP::get_code_info($self->body))[1];
 }
 
 sub fully_qualified_name {
@@ -70,14 +106,14 @@ __END__
 
 =pod
 
-=head1 NAME 
+=head1 NAME
 
 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 
+The Method Protocol is very small, since methods in Perl 5 are just
+subroutines within the particular package. We provide a very basic
 introspection interface.
 
 =head1 METHODS
@@ -88,7 +124,7 @@ introspection interface.
 
 =item B<meta>
 
-This will return a B<Class::MOP::Class> instance which is related 
+This will return a B<Class::MOP::Class> instance which is related
 to this class.
 
 =back
@@ -99,15 +135,15 @@ to this class.
 
 =item B<wrap ($code, %params)>
 
-This is the basic constructor, it returns a B<Class::MOP::Method> 
-instance which wraps the given C<$code> reference. You can also 
+This is the basic constructor, it returns a B<Class::MOP::Method>
+instance which wraps the given C<$code> reference. You can also
 set the C<package_name> and C<name> attributes using the C<%params>.
-If these are not set, then thier accessors will attempt to figure 
+If these are not set, then thier accessors will attempt to figure
 it out using the C<Class::MOP::get_code_info> function.
 
 =item B<clone (%params)>
 
-This will make a copy of the object, allowing you to override 
+This will make a copy of the object, allowing you to override
 any values by stuffing them in C<%params>.
 
 =back
@@ -124,6 +160,10 @@ This returns the actual CODE reference of the particular instance.
 
 This returns the name of the CODE reference.
 
+=item B<associated_metaclass>
+
+The metaclass of the method
+
 =item B<package_name>
 
 This returns the package name that the CODE reference is attached to.
@@ -134,6 +174,20 @@ This returns the fully qualified name of the CODE reference.
 
 =back
 
+=head2 Metaclass
+
+=over 4
+
+=item B<attach_to_class>
+
+Sets the associated metaclass
+
+=item B<detach_from_class>
+
+Disassociates the method from the metaclass
+
+=back
+
 =head1 AUTHORS
 
 Stevan Little E<lt>stevan@iinteractive.comE<gt>
@@ -145,7 +199,7 @@ Copyright 2006-2008 by Infinity Interactive, Inc.
 L<http://www.iinteractive.com>
 
 This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself. 
+it under the same terms as Perl itself.
 
 =cut