X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=bfed1fae2a55c7d2a84c7e3812f4324c62cb3c47;hb=92e250b0af746085306392cd25e053f3000ca3d3;hp=80e10aa63f8f09ab622a6a750957c759dd107999;hpb=9c8cda9011b019e4876183222b8793b66bab7546;p=gitmo%2FClass-MOP.git
diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index 80e10aa..bfed1fa 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -7,32 +7,45 @@ use warnings;
use Carp 'confess';
use Scalar::Util 'blessed';
-our $VERSION = '0.03';
+our $VERSION = '0.69_01';
+$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';
+ 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);
}
- else {
- $metaclass = shift;
- ($metaclass->isa('Class::MOP::Class'))
- || confess "The metaclass ($metaclass) must be derived from Class::MOP::Class";
+
+ ($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 %options = @_;
+
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
+ # 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)
});
@@ -53,17 +66,17 @@ metaclass - a pragma for installing and using Class::MOP metaclasses
package MyClass;
# use Class::MOP::Class
- use metaclass;
+ use metaclass;
# ... or use a custom metaclass
use metaclass 'MyMetaClass';
-
- # ... or use a custom metaclass
+
+ # ... or use a custom metaclass
# and custom attribute and method
# metaclasses
use metaclass 'MyMetaClass' => (
'attribute_metaclass' => 'MyAttributeMetaClass',
- 'method_metaclass' => 'MyMethodMetaClass',
+ 'method_metaclass' => 'MyMethodMetaClass',
);
# ... or just specify custom attribute
@@ -71,14 +84,14 @@ metaclass - a pragma for installing and using Class::MOP metaclasses
# is the assumed metaclass
use metaclass (
'attribute_metaclass' => 'MyAttributeMetaClass',
- 'method_metaclass' => 'MyMethodMetaClass',
+ 'method_metaclass' => 'MyMethodMetaClass',
);
=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.
+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.
=head1 AUTHORS
@@ -86,11 +99,11 @@ Stevan Little Estevan@iinteractive.comE
=head1 COPYRIGHT AND LICENSE
-Copyright 2006, 2007 by Infinity Interactive, Inc.
+Copyright 2006-2008 by Infinity Interactive, Inc.
L
This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
+it under the same terms as Perl itself.
=cut