X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=816efcb2e9542eea71c80831305bff4e2550f68b;hb=81b5e774319e5a9b83f09aae1b101b25ff7af350;hp=fba087451f43c46e235734f1c6c0be3d03f8faea;hpb=436d2a84bd01a0a9798178c57d89e5edbc9b5f02;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index fba0874..816efcb 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -6,8 +6,9 @@ use warnings;
 
 use Carp         'confess';
 use Scalar::Util 'blessed';
+use Try::Tiny;
 
-our $VERSION   = '0.93';
+our $VERSION   = '1.09';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -41,14 +42,23 @@ sub import {
 
     # create a meta object so we can install &meta
     my $meta = $metaclass->initialize($package => %options);
+    my $should_install = !delete $options{no_meta};
     $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.
+        if (Class::MOP::DEBUG_NO_META()) {
+            my ($self) = @_;
+            if (my $meta = try { $self->SUPER::meta }) {
+                return $meta if $meta->isa('Class::MOP::Class');
+            }
+            confess "'meta' method called by MOP internals"
+                if caller =~ /Class::MOP|metaclass/;
+        }
         $metaclass->initialize((blessed($_[0]) || $_[0]) => %options)
-    });
+    }) if $should_install;
 }
 
 1;
@@ -87,11 +97,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
 
@@ -99,7 +113,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>