Bump everything to 0.61

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

diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index 247b333..0d618f4 100644 (file)
--- a/lib/Class/MOP/Method.pm
+++ b/lib/Class/MOP/Method.pm
@@ -5,89 +5,88 @@ use strict;
 use warnings;
 
 use Carp         'confess';
-use Scalar::Util 'reftype', 'blessed';
-use B            'svref_2object';
+use Scalar::Util 'blessed';
 
-our $VERSION   = '0.04';
+our $VERSION   = '0.61';
 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;
+use overload '&{}' => sub { $_[0]->body }, fallback => 1;
 
-# introspection
-
-sub meta { 
-    require Class::MOP::Class;
-    Class::MOP::Class->initialize(blessed($_[0]) || $_[0]);
-}
+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 = shift;
-    my $code  = shift;
-    ('CODE' eq (reftype($code) || ''))
+sub wrap {
+    my ( $class, $code, %params ) = @_;
+
+    ('CODE' eq ref($code))
         || confess "You must supply a CODE reference to bless, not (" . ($code || 'undef') . ")";
-    bless { 
-        body => $code 
+
+    ($params{package_name} && $params{name})
+        || confess "You must supply the package_name and name parameters $UPGRADE_ERROR_TEXT";
+
+    bless {
+        '&!body'         => $code,
+        '$!package_name' => $params{package_name},
+        '$!name'         => $params{name},
     } => blessed($class) || $class;
 }
 
 ## accessors
 
-sub body { (shift)->{body} }
+sub body { (shift)->{'&!body'} }
 
 # TODO - add associated_class
 
 # informational
 
-# NOTE: 
-# this may not be the same name 
-# as the class you got it from
-# This gets the package stash name 
-# associated with the actual CODE-ref
-sub package_name { 
-       my $code = (shift)->{body};
-       svref_2object($code)->GV->STASH->NAME;
+sub package_name {
+    my $self = shift;
+    $self->{'$!package_name'} ||= (Class::MOP::get_code_info($self->body))[0];
 }
 
-# NOTE: 
-# this may not be the same name 
-# as the method name it is stored
-# with. This gets the name associated
-# with the actual CODE-ref
-sub name { 
-       my $code = (shift)->{body};
-       svref_2object($code)->GV->NAME;
+sub name {
+    my $self = shift;
+    $self->{'$!name'} ||= (Class::MOP::get_code_info($self->body))[1];
 }
 
 sub fully_qualified_name {
-       my $code = shift;
-       $code->package_name . '::' . $code->name;               
+    my $code = shift;
+    $code->package_name . '::' . $code->name;
 }
 
+# NOTE:
+# the Class::MOP bootstrap
+# will create this for us
+# - SL
+# sub clone { ... }
+
 1;
 
 __END__
 
 =pod
 
-=head1 NAME 
+=head1 NAME
 
 Class::MOP::Method - Method Meta Object
 
-=head1 SYNOPSIS
-
-  # ... more to come later maybe
-
 =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
@@ -98,7 +97,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
@@ -107,7 +106,18 @@ to this class.
 
 =over 4
 
-=item B<wrap (&code)>
+=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
+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
+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
+any values by stuffing them in C<%params>.
 
 =back
 
@@ -117,28 +127,34 @@ to this class.
 
 =item B<body>
 
+This returns the actual CODE reference of the particular instance.
+
 =item B<name>
 
+This returns the name of the CODE reference.
+
 =item B<package_name>
 
+This returns the package name that the CODE reference is attached to.
+
 =item B<fully_qualified_name>
 
+This returns the fully qualified name of the CODE reference.
+
 =back
 
 =head1 AUTHORS
 
 Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
-Yuval Kogman E<lt>nothingmuch@woobling.comE<gt>
-
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+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