X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FMethod%2FWrapped.pm;h=e988b152da8358301a63b49c3a539cd35ee5b3bb;hb=9457b59678c67b47f31e82d284ed57c10d7fc091;hp=c32b50655f64092b2b74dd335e9223ade939670f;hpb=127d39a79d936afd136ccfd8ff8271eea2bc0cbb;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Method/Wrapped.pm b/lib/Class/MOP/Method/Wrapped.pm
index c32b506..e988b15 100644
--- a/lib/Class/MOP/Method/Wrapped.pm
+++ b/lib/Class/MOP/Method/Wrapped.pm
@@ -5,10 +5,10 @@ use strict;
 use warnings;
 
 use Carp         'confess';
-use Scalar::Util 'reftype', 'blessed';
-use Sub::Name    'subname';
+use Scalar::Util 'blessed';
 
-our $VERSION   = '0.02';
+our $VERSION   = '0.64_06';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Method';
@@ -69,10 +69,11 @@ my $_build_wrapped_method = sub {
 };
 
 sub wrap {
-    my $class = shift;
-    my $code  = shift;
+    my ( $class, $code, %params ) = @_;
+    
     (blessed($code) && $code->isa('Class::MOP::Method'))
         || confess "Can only wrap blessed CODE";
+        
     my $modifier_table = {
         cache  => undef,
         orig   => $code,
@@ -84,28 +85,34 @@ sub wrap {
         },
     };
     $_build_wrapped_method->($modifier_table);
-    my $method = $class->SUPER::wrap(sub { $modifier_table->{cache}->(@_) });
-    $method->{'%!modifier_table'} = $modifier_table;
+    my $method = $class->SUPER::wrap(
+        sub { $modifier_table->{cache}->(@_) },
+        # get these from the original 
+        # unless explicitly overriden
+        package_name => $params{package_name} || $code->package_name,
+        name         => $params{name}         || $code->name,
+    );
+    $method->{'modifier_table'} = $modifier_table;
     $method;
 }
 
 sub get_original_method {
     my $code = shift;
-    $code->{'%!modifier_table'}->{orig};
+    $code->{'modifier_table'}->{orig};
 }
 
 sub add_before_modifier {
     my $code     = shift;
     my $modifier = shift;
-    unshift @{$code->{'%!modifier_table'}->{before}} => $modifier;
-    $_build_wrapped_method->($code->{'%!modifier_table'});
+    unshift @{$code->{'modifier_table'}->{before}} => $modifier;
+    $_build_wrapped_method->($code->{'modifier_table'});
 }
 
 sub add_after_modifier {
     my $code     = shift;
     my $modifier = shift;
-    push @{$code->{'%!modifier_table'}->{after}} => $modifier;
-    $_build_wrapped_method->($code->{'%!modifier_table'});
+    push @{$code->{'modifier_table'}->{after}} => $modifier;
+    $_build_wrapped_method->($code->{'modifier_table'});
 }
 
 {
@@ -126,12 +133,12 @@ sub add_after_modifier {
     sub add_around_modifier {
         my $code     = shift;
         my $modifier = shift;
-        unshift @{$code->{'%!modifier_table'}->{around}->{methods}} => $modifier;
-        $code->{'%!modifier_table'}->{around}->{cache} = $compile_around_method->(
-            @{$code->{'%!modifier_table'}->{around}->{methods}},
-            $code->{'%!modifier_table'}->{orig}->body
+        unshift @{$code->{'modifier_table'}->{around}->{methods}} => $modifier;
+        $code->{'modifier_table'}->{around}->{cache} = $compile_around_method->(
+            @{$code->{'modifier_table'}->{around}->{methods}},
+            $code->{'modifier_table'}->{orig}->body
         );
-        $_build_wrapped_method->($code->{'%!modifier_table'});
+        $_build_wrapped_method->($code->{'modifier_table'});
     }
 }