From: Stevan Little <stevan.little@iinteractive.com>
Date: Sat, 18 Mar 2006 16:47:05 +0000 (+0000)
Subject: removing the mixins entirely
X-Git-Tag: 0_05~91
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5e030bec812e8bc7fd23b563d977529725096f14;p=gitmo%2FMoose.git

removing the mixins entirely
---

diff --git a/Build.PL b/Build.PL
index 8f83fe4..cf0a0cb 100644
--- a/Build.PL
+++ b/Build.PL
@@ -8,7 +8,7 @@ my $build = Module::Build->new(
     requires => {
         'Scalar::Util'       => '1.18',
         'Carp'               => '0',
-        'Class::MOP'         => '0.21',
+        'Class::MOP'         => '0.22',
         'Sub::Name'          => '0.02',
         'UNIVERSAL::require' => '0'
     },
diff --git a/Changes b/Changes
index 9ec9a68..7a3f770 100644
--- a/Changes
+++ b/Changes
@@ -2,10 +2,16 @@ Revision history for Perl extension Moose
 
 0.02 
     * Moose
-      - added &with keyword to support class mixins
-      
-    * Moose::Meta::SafeMixin
-      - added support for mixins, see docs for info
+        - many more tests, fixing some bugs/edge 
+          and cases, general development work
+        - &extends now loads the base module with
+          UNIVERSAL::require 
+            - added UNIVERSAL::require to the 
+              dependencies list
+    
+    * Moose::Object
+        - BUILDALL and DEMOLISHALL were broken 
+          because of a mis-named hash key, Whoops :)
 
 0.01 Wed. March 15, 2006
     - Moooooooooooooooooose!!!
\ No newline at end of file
diff --git a/lib/Moose.pm b/lib/Moose.pm
index f279bb8..3c0b696 100644
--- a/lib/Moose.pm
+++ b/lib/Moose.pm
@@ -17,15 +17,11 @@ use UNIVERSAL::require;
 use Class::MOP;
 
 use Moose::Meta::Class;
-use Moose::Meta::SafeMixin;
 use Moose::Meta::Attribute;
 
 use Moose::Object;
 use Moose::Util::TypeConstraints ':no_export';
 
-# bootstrap the mixin module
-Moose::Meta::SafeMixin::mixin(Moose::Meta::Class->meta, 'Moose::Meta::SafeMixin');
-
 sub import {
 	shift;
 	my $pkg = caller();
@@ -61,10 +57,7 @@ sub import {
 	$meta->alias_method('extends' => subname 'Moose::extends' => sub { 
 	    $_->require for @_;
 	    $meta->superclasses(@_) 
-	});
-	
-	# handle mixins
-	$meta->alias_method('with' => subname 'Moose::with' => sub { $meta->mixin($_[0]) });	
+	});	
 	
 	# handle attributes
 	$meta->alias_method('has' => subname 'Moose::has' => sub {