accept fully named args to Class::MOP::Method::wrap

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

diff --git a/lib/Class/MOP/Method.pm b/lib/Class/MOP/Method.pm
index 0c8fd12..76167fe 100644 (file)
--- 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 'reftype', 'blessed';
+use Scalar::Util 'blessed';
 
-our $VERSION   = '0.08';
+our $VERSION   = '0.65';
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
@@ -29,24 +29,29 @@ before spending too much time chasing this one down.
 # construction
 
 sub wrap {
-    my ( $class, $code, %params ) = @_;
+    my ( $class, @args ) = @_;
 
-    ('CODE' eq (reftype($code) || ''))
+    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 $UPGRADE_ERROR_TEXT";
 
     bless {
-        '&!body'         => $code,
-        '$!package_name' => $params{package_name},
-        '$!name'         => $params{name},
+        '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
 
@@ -54,12 +59,12 @@ sub body { (shift)->{'&!body'} }
 
 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 {
     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 {