X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=f7febbf407bf621c1c7dbb2c6729c77af01597da;hb=5f90deee7aaaa91b691b9bee49ed681daa311b69;hp=b3f66b873491c10e9bdc4e91f4c3da3529d486a0;hpb=1550e0820d345fd483382e2b912ba683da3bdc1d;p=gitmo%2FClass-MOP.git
diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index b3f66b8..f7febbf 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.78_02';
+our $VERSION = '1.11';
$VERSION = eval $VERSION;
our $AUTHORITY = 'cpan:STEVAN';
@@ -19,6 +20,7 @@ sub import {
unshift @args, "metaclass" if @args % 2 == 1;
my %options = @args;
+ my $meta_name = exists $options{meta_name} ? $options{meta_name} : 'meta';
my $metaclass = delete $options{metaclass};
unless ( defined $metaclass ) {
@@ -41,14 +43,8 @@ sub import {
# 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($meta_name)
+ if defined $meta_name;
}
1;
@@ -87,11 +83,17 @@ 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 meta_name => undef;
+ # or if we'd like it to have a different name,
+ use metaclass meta_name => 'my_meta';
+
=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 method to your class as well.
+installs a C method to your class as well, unless C
+is passed to the C option.
=head1 AUTHORS
@@ -99,7 +101,7 @@ Stevan Little Estevan@iinteractive.comE
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L