X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=f45769d37610f52983dba2a303a73ac9c2c5dc66;hb=ec21cb136b8d96f67395c0db77c408e8366f1a8a;hp=49f57b10a02b8ebce769c2d602f1668232833b8c;hpb=caab0eaaa67d626df9e0113822d95fcfa0968022;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 49f57b1..f45769d 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -13,20 +13,22 @@ 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 = @_;
-    
+
+    ($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 $class (grep { 
                             /^(attribute|method|instance)_metaclass/