Checking in changes prior to tagging of version 0.40_06. Changelog diff is:

[gitmo/Mouse.git] / lib / Mouse / Meta / Module.pm

diff --git a/lib/Mouse/Meta/Module.pm b/lib/Mouse/Meta/Module.pm
index 3069250..ab2fd6a 100755 (executable)
--- a/lib/Mouse/Meta/Module.pm
+++ b/lib/Mouse/Meta/Module.pm
@@ -1,11 +1,19 @@
 package Mouse::Meta::Module;
-use Mouse::Util qw/:meta get_code_package load_class not_supported/; # enables strict and warnings
+use Mouse::Util qw/:meta get_code_package get_code_ref load_class not_supported/; # enables strict and warnings
 
-use Carp ();
-use Scalar::Util qw/blessed weaken/;
+use Carp         ();
+use Scalar::Util ();
 
 my %METAS;
 
+if(Mouse::Util::_MOUSE_XS){
+    # register meta storage for performance
+    Mouse::Util::__register_metaclass_storage(\%METAS, 0);
+
+    # ensure thread safety
+    *CLONE = sub { Mouse::Util::__register_metaclass_storage(\%METAS, 1) };
+}
+
 sub _metaclass_cache { # DEPRECATED
     my($class, $name) = @_;
     return $METAS{$name};
@@ -38,9 +46,9 @@ sub get_metaclass_by_name       { $METAS{$_[0]}         }
 #sub does_metaclass_exist        { defined $METAS{$_[0]} }
 #sub remove_metaclass_by_name    { delete $METAS{$_[0]}  }
 
+sub name;
 
-
-sub name { $_[0]->{package} }
+sub namespace;
 
 # The followings are Class::MOP specific methods
 
@@ -64,88 +72,60 @@ sub get_attribute_map { # DEPRECATED
 
 sub has_attribute     { exists $_[0]->{attributes}->{$_[1]} }
 sub get_attribute     {        $_[0]->{attributes}->{$_[1]} }
-sub get_attribute_list{ keys %{$_[0]->{attributes}}         }
 sub remove_attribute  { delete $_[0]->{attributes}->{$_[1]} }
 
-sub namespace{
-    my $name = $_[0]->{package};
-    no strict 'refs';
-    return \%{ $name . '::' };
-}
-
-sub add_method {
-    my($self, $name, $code) = @_;
-
-    if(!defined $name){
-        $self->throw_error('You must pass a defined name');
-    }
-    if(!defined $code){
-        $self->throw_error('You must pass a defined code');
-    }
-
-    if(ref($code) ne 'CODE'){
-        $code = \&{$code}; # coerce
-    }
+sub get_attribute_list{ keys   %{$_[0]->{attributes}} }
 
-    $self->{methods}->{$name} = $code; # Moose stores meta object here.
-
-    my $pkg = $self->name;
-    no strict 'refs';
-    no warnings 'redefine';
-    *{ $pkg . '::' . $name } = $code;
-}
 
 # XXX: for backward compatibility
 my %foreign = map{ $_ => undef } qw(
     Mouse Mouse::Role Mouse::Util Mouse::Util::TypeConstraints
-    Carp Scalar::Util
+    Carp Scalar::Util List::Util
 );
 sub _code_is_mine{
-    my($self, $code) = @_;
-
-    my $package = get_code_package($code);
+#    my($self, $code) = @_;
 
-    return !exists $foreign{$package};
+    return !exists $foreign{ get_code_package($_[1]) };
 }
 
+sub add_method;
+
 sub has_method {
     my($self, $method_name) = @_;
 
     defined($method_name)
         or $self->throw_error('You must define a method name');
 
-    return 1 if $self->{methods}->{$method_name};
-
-    my $code = do{ no strict 'refs'; *{$self->{package} . '::' . $method_name}{CODE} };
-
-    return $code && $self->_code_is_mine($code);
+    return defined($self->{methods}{$method_name}) || do{
+        my $code = get_code_ref($self->{package}, $method_name);
+        $code && $self->_code_is_mine($code);
+    };
 }
 
-sub get_method_body{
+sub get_method_body {
     my($self, $method_name) = @_;
 
     defined($method_name)
         or $self->throw_error('You must define a method name');
 
     return $self->{methods}{$method_name} ||= do{
-        my $code = do{ no strict 'refs'; *{$self->{package} . '::' . $method_name}{CODE} };
-
-        $code && $self->_code_is_mine($code) && $code;
+        my $code = get_code_ref($self->{package}, $method_name);
+        $code && $self->_code_is_mine($code) ? $code : undef;
     };
 }
 
 sub get_method{
     my($self, $method_name) = @_;
 
-    if($self->has_method($method_name)){
+    if(my $code = $self->get_method_body($method_name)){
         my $method_metaclass = $self->method_metaclass;
         load_class($method_metaclass);
 
-        my $package = $self->name;
-        return $method_metaclass->new(
-            body    => $package->can($method_name),
-            name    => $method_name,
-            package => $package,
+        return $method_metaclass->wrap(
+            body                 => $code,
+            name                 => $method_name,
+            package              => $self->name,
+            associated_metaclass => $self,
         );
     }
 
@@ -171,7 +151,7 @@ sub get_method_list {
 
         my $superclasses;
         if(exists $options{superclasses}){
-            if($self->isa('Mouse::Meta::Role')){
+            if(Mouse::Util::is_a_metarole($self)){
                 delete $options{superclasses};
             }
             else{
@@ -224,7 +204,7 @@ sub get_method_list {
 
         my $meta = $self->initialize( $package_name, %options);
 
-        weaken $METAS{$package_name}
+        Scalar::Util::weaken $METAS{$package_name}
             if $mortal;
 
         $meta->add_method(meta => sub{
@@ -316,6 +296,10 @@ __END__
 
 Mouse::Meta::Module - The base class for Mouse::Meta::Class and Mouse::Meta::Role
 
+=head1 VERSION
+
+This document describes Mouse version 0.40_06
+
 =head1 SEE ALSO
 
 L<Class::MOP::Class>