From: Stevan Little <stevan.little@iinteractive.com>
Date: Thu, 4 May 2006 03:45:03 +0000 (+0000)
Subject: re-init
X-Git-Tag: 0_09_03~44
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=be33e4f353c659491ec46e90c340a493cc2136f0;p=gitmo%2FMoose.git

re-init
---

diff --git a/lib/Moose.pm b/lib/Moose.pm
index 6917896..9617342 100644
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -1,4 +1,6 @@
 
+use lib '/Users/stevan/Projects/CPAN/Class-MOP/Class-MOP/lib';
+
 package Moose;
 
 use strict;
@@ -25,13 +27,11 @@ use Moose::Object;
 use Moose::Util::TypeConstraints;
 
 {
-    my ( $CALLER, %METAS );
+    my $CALLER;
 
-    sub _find_meta {
+    sub _init_meta {
         my $class = $CALLER;
 
-        return $METAS{$class} if exists $METAS{$class};
-
         # make a subtype for each Moose class
         subtype $class
             => as 'Object'
@@ -65,30 +65,53 @@ use Moose::Util::TypeConstraints;
         # make sure they inherit from Moose::Object
         $meta->superclasses('Moose::Object')
            unless $meta->superclasses();
-
-        return $METAS{$class} = $meta;
     }
 
     my %exports = (
         extends => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::extends' => sub {
                 _load_all_classes(@_);
-                $meta->superclasses(@_)
+                my $meta = $class->meta;
+                foreach my $super (@_) {
+                    # don't bother if it does not have a meta.
+                    next unless $super->can('meta');
+                    # if it's meta is a vanilla Moose, 
+                    # then we can safely ignore it.
+                    next if blessed($super->meta) eq 'Moose::Meta::Class';
+                    # but if we have anything else, 
+                    # we need to check it out ...
+                    unless (# see if of our metaclass is incompatible
+                            $meta->isa(blessed($super->meta)) &&
+                            # see if our instance metaclass is incompatible
+                            $meta->instance_metaclass->isa($super->meta->instance_metaclass) &&
+                            # ... and if we are just a vanilla Moose
+                            $meta->isa('Moose::Meta::Class')) {
+                        # re-initialize the meta ...
+                        my $super_meta = $super->meta;
+                        $meta = $super_meta->reinitialize($class => (
+                            ':attribute_metaclass' => $super_meta->attribute_metaclass,                            
+                            ':method_metaclass'    => $super_meta->method_metaclass,
+                            ':instance_metaclass'  => $super_meta->instance_metaclass,
+                        ));
+                    }
+                }
+                $meta->superclasses(@_);
             };
         },
         with => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::with' => sub {
                 my ($role) = @_;
                 _load_all_classes($role);
-                $role->meta->apply($meta);
+                $role->meta->apply($class->meta);
             };
         },
         has => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::has' => sub {
                 my ($name, %options) = @_;
+                my $meta = $class->meta;
                 if ($name =~ /^\+(.*)/) {
                     my $inherited_attr = $meta->find_attribute_by_name($1);
                     (defined $inherited_attr)
@@ -108,46 +131,47 @@ use Moose::Util::TypeConstraints;
             };
         },
         before => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::before' => sub {
                 my $code = pop @_;
+                my $meta = $class->meta;
                 $meta->add_before_method_modifier($_, $code) for @_;
             };
         },
         after => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::after' => sub {
                 my $code = pop @_;
+                my $meta = $class->meta;
                 $meta->add_after_method_modifier($_, $code) for @_;
             };
         },
         around => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;            
             return subname 'Moose::around' => sub {
                 my $code = pop @_;
+                my $meta = $class->meta;
                 $meta->add_around_method_modifier($_, $code) for @_;
             };
         },
         super => sub {
-            my $meta = _find_meta();
             return subname 'Moose::super' => sub {};
         },
         override => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::override' => sub {
                 my ($name, $method) = @_;
-                $meta->add_override_method_modifier($name => $method);
+                $class->meta->add_override_method_modifier($name => $method);
             };
         },
         inner => sub {
-            my $meta = _find_meta();
             return subname 'Moose::inner' => sub {};
         },
         augment => sub {
-            my $meta = _find_meta();
+            my $class = $CALLER;
             return subname 'Moose::augment' => sub {
                 my ($name, $method) = @_;
-                $meta->add_augment_method_modifier($name => $method);
+                $class->meta->add_augment_method_modifier($name => $method);
             };
         },
         confess => sub {
@@ -178,7 +202,8 @@ use Moose::Util::TypeConstraints;
 
         # we should never export to main
         return if $CALLER eq 'main';
-
+    
+        _init_meta();
         goto $exporter;
     }
 }
diff --git a/t/008_basic.t b/t/008_basic.t
index 332520c..8f8cda8 100644
--- a/t/008_basic.t
+++ b/t/008_basic.t
@@ -135,10 +135,7 @@ BEGIN {
     
     package Newswriter::Author;
     use strict;
-    use warnings;
-    use metaclass 'Newswriter::Meta::Class' => (
-        ':instance_metaclass' => 'Newswriter::Meta::Instance'
-    );    
+    use warnings;   
     use Moose;
     
     extends 'Newswriter::Base';
@@ -149,9 +146,6 @@ BEGIN {
     package Newswriter::Article;    
     use strict;
     use warnings;
-    use metaclass 'Newswriter::Meta::Class' => (
-        ':instance_metaclass' => 'Newswriter::Meta::Instance'
-    );    
     use Moose;
     use Moose::Util::TypeConstraints;