X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmetaclass.pm;h=56d8475699b6aa9bf45775059cbf46cba8eed1e9;hb=2367814a108bbb85efbf76b57fc58bf464d68455;hp=f9f0b75877655d5be19c43b015382b2627010287;hpb=677eb1584b6e27c6079daed35110cb4192153db4;p=gitmo%2FClass-MOP.git

diff --git a/lib/metaclass.pm b/lib/metaclass.pm
index f9f0b75..56d8475 100644
--- a/lib/metaclass.pm
+++ b/lib/metaclass.pm
@@ -4,20 +4,27 @@ package metaclass;
 use strict;
 use warnings;
 
-use Carp 'confess';
+use Carp         'confess';
+use Scalar::Util 'blessed';
 
-our $VERSION = '0.01';
+our $VERSION   = '0.03';
+our $AUTHORITY = 'cpan:STEVAN';
 
 use Class::MOP;
 
 sub import {
     shift;
-    my $metaclass = shift;
-    my %options   = @_;
-    my $package   = caller();
-    
-    ($metaclass->isa('Class::MOP::Class'))
-        || confess 'The metaclass must be derived from Class::MOP::Class';
+    my $metaclass;
+    if (!defined($_[0]) || $_[0] =~ /^(attribute|method|instance)_metaclass/) {
+        $metaclass = 'Class::MOP::Class';
+    }
+    else {
+        $metaclass = shift;
+        ($metaclass->isa('Class::MOP::Class'))
+            || confess "The metaclass ($metaclass) must be derived from Class::MOP::Class";
+    }
+    my %options = @_;
+    my $package = caller();
     
     # create a meta object so we can install &meta
     my $meta = $metaclass->initialize($package => %options);
@@ -27,7 +34,7 @@ sub import {
         # since metaclass instances are 
         # singletons, this is not really a 
         # big deal anyway.
-        $metaclass->initialize($_[0] => %options)
+        $metaclass->initialize((blessed($_[0]) || $_[0]) => %options)
     });
 }
 
@@ -39,30 +46,53 @@ __END__
 
 =head1 NAME
 
-metaclass - a pragma for installing using Class::MOP metaclasses
+metaclass - a pragma for installing and using Class::MOP metaclasses
 
 =head1 SYNOPSIS
 
+  package MyClass;
+
+  # use Class::MOP::Class
+  use metaclass; 
+
+  # ... or use a custom metaclass
   use metaclass 'MyMetaClass';
   
+  # ... or use a custom metaclass  
+  # and custom attribute and method
+  # metaclasses
   use metaclass 'MyMetaClass' => (
-      ':attribute_metaclass' => 'MyAttributeMetaClass',
-      ':method_metaclass'    => 'MyMethodMetaClass',    
+      'attribute_metaclass' => 'MyAttributeMetaClass',
+      'method_metaclass'    => 'MyMethodMetaClass',    
+  );
+
+  # ... or just specify custom attribute
+  # and method classes, and Class::MOP::Class
+  # is the assumed metaclass
+  use metaclass (
+      'attribute_metaclass' => 'MyAttributeMetaClass',
+      'method_metaclass'    => 'MyMethodMetaClass',    
   );
 
 =head1 DESCRIPTION
 
-=head1 AUTHOR
+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. 
+
+=head1 AUTHORS
 
 Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
+Yuval Kogman E<lt>nothingmuch@woobling.comE<gt>
+
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006 by Infinity Interactive, Inc.
+Copyright 2006, 2007 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself. 
 
-=cut
\ No newline at end of file
+=cut