X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=05e4896e13cb5ccd935aa181c8e429da616b41e5;hb=8045bcc5951d7747ca711e09a2587dd1f5c55baf;hp=2b048db22eb497c4338cef17085526edc57ea74a;hpb=69e3ab0a5a391925610bbb917d81da8d53fd1b91;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 2b048db..05e4896 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -7,28 +7,36 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '0.04';
+our $VERSION   = '0.77';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use Class::MOP;
 
 sub import {
-    shift;
-    my $metaclass;
-    if (!defined($_[0]) || $_[0] =~ /^(attribute|method|instance)_metaclass/) {
-        $metaclass = 'Class::MOP::Class';
-    }
-    else {
-        $metaclass = shift;
-        #make sure the custom metaclass gets loaded
+    my ( $class, @args ) = @_;
+
+    unshift @args, "metaclass" if @args % 2 == 1;
+    my %options = @args;
+
+    my $metaclass = delete $options{metaclass};
+
+    unless ( defined $metaclass ) {
+        $metaclass = "Class::MOP::Class";
+    } else {
         Class::MOP::load_class($metaclass);
-        ($metaclass->isa('Class::MOP::Class'))
-            || confess "The metaclass ($metaclass) must be derived from Class::MOP::Class";
     }
-    my %options = @_;
-    #make sure the custom metaclasses get loaded
-    map{ Class::MOP::load_class($options{$_}) }
-      grep{ /^(attribute|method|instance)_metaclass/ } keys %options;
+
+    ($metaclass->isa('Class::MOP::Class'))
+        || confess "The metaclass ($metaclass) must be derived from Class::MOP::Class";
+
+    # make sure the custom metaclasses get loaded
+    foreach my $key (grep { /_(?:meta)?class$/ } keys %options) {
+        unless ( ref( my $class = $options{$key} ) ) {
+            Class::MOP::load_class($class)
+        }
+    }
+
     my $package = caller();
 
     # create a meta object so we can install &meta