X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=192a664343bfb734eb34a80933fad26e06b97c90;hb=bc2c41b4129a05d2cd4aa6729de6529d49dd89f2;hp=6af88f1ca228ed6e5a45a541dd895fdfaabdfe8c;hpb=7fe03d203ea938d46cfb8f546181ef271d5a81bd;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 6af88f1..192a664 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -6,46 +6,44 @@ use warnings;
 
 use Carp         'confess';
 use Scalar::Util 'blessed';
+use Try::Tiny;
 
-our $VERSION   = '0.64';
+our $VERSION   = '1.09';
+$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 $should_install_meta = !delete $options{no_meta};
+    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/ 
-                        } keys %options) {
-        Class::MOP::load_class($options{$class})
+    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
     my $meta = $metaclass->initialize($package => %options);
-    $meta->add_method('meta' => sub {
-        # we must re-initialize so that it
-        # works as expected in subclasses,
-        # since metaclass instances are
-        # singletons, this is not really a
-        # big deal anyway.
-        $metaclass->initialize((blessed($_[0]) || $_[0]) => %options)
-    });
+    $meta->_add_meta_method if $should_install_meta;
 }
 
 1;
@@ -84,11 +82,15 @@ metaclass - a pragma for installing and using Class::MOP metaclasses
       'method_metaclass'    => 'MyMethodMetaClass',
   );
 
+  # if we'd rather not install a 'meta' method, we can do this
+  use metaclass no_meta => 1;
+
 =head1 DESCRIPTION
 
 This is a pragma to make it easier to use a specific metaclass
 and a set of custom attribute and method metaclasses. It also
-installs a C<meta> method to your class as well.
+installs a C<meta> method to your class as well, if the
+C<no_meta> option is not specified.
 
 =head1 AUTHORS
 
@@ -96,7 +98,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>