X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=2dee906244ba4e385bdbe47ea2c5d1aec85a4261;hb=8af039cd0ec8983c598c4a5d4a76744a43254c52;hp=39cc877d97f0a0d7a7d0ca4db1cdfe87555824a5;hpb=a023763e73adf287a985e063744227abd8c8ece7;p=gitmo%2FClass-MOP.git
diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 39cc877..2dee906 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -6,46 +6,45 @@ use warnings;
use Carp 'confess';
use Scalar::Util 'blessed';
+use Try::Tiny;
-our $VERSION = '0.61';
+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 $meta_name = exists $options{meta_name} ? $options{meta_name} : '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($meta_name)
+ if defined $meta_name;
}
1;
@@ -84,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
@@ -96,7 +101,7 @@ Stevan Little Estevan@iinteractive.comE
=head1 COPYRIGHT AND LICENSE
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
L