X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=d43fcd732d6e2e72f4646b90740f59d98fd3a827;hb=41ffa8a4aa857c1af10e51521b1b37c7d33826c8;hp=1d6575e129cba6ed76be98b1cf61e35e609fd661;hpb=c0fcd6ab4d6e37bb8c1b1f39f130a80ae9e419dc;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 1d6575e..d43fcd7 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.90';
+$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
@@ -91,7 +99,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>