X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FClass%2FMOP%2FModule.pm;h=abbcbf050ca05fff0bbca6375b9e60ab0097bb1c;hb=19b79c194a6ef0d4ba79a6be03ee3124b0a54b62;hp=afaacc10764849e5f2a1f9c072ab41c23f72c9cb;hpb=121991f6e830657c08bc5bef9fdbb27a534c0411;p=gitmo%2FClass-MOP.git

diff --git a/lib/Class/MOP/Module.pm b/lib/Class/MOP/Module.pm
index afaacc1..abbcbf0 100644
--- a/lib/Class/MOP/Module.pm
+++ b/lib/Class/MOP/Module.pm
@@ -7,7 +7,7 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '0.72';
+our $VERSION   = '0.88';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -33,23 +33,30 @@ sub identifier {
 }
 
 sub create {
-    my ( $class, %options ) = @_;
+    confess "The Class::MOP::Module->create method has been made a private object method.\n";
+}
 
-    my $package_name = $options{package};
+sub _instantiate_module {
+    my $self      = shift;
+    my $version   = shift;
+    my $authority = shift;
 
-    (defined $package_name && $package_name)
-        || confess "You must pass a package name";
+    my $package_name = $self->name;
 
     my $code = "package $package_name;";
-    $code .= "\$$package_name\:\:VERSION = '" . $options{version} . "';"
-        if exists $options{version};
-    $code .= "\$$package_name\:\:AUTHORITY = '" . $options{authority} . "';"
-        if exists $options{authority};
-
-    eval $code;
-    confess "creation of $package_name failed : $@" if $@;
 
-    return; # XXX: should this return some kind of meta object? ~sartak
+    $code .= "\$$package_name\:\:VERSION = '" . $version . "';"
+        if defined $version;
+    $code .= "\$$package_name\:\:AUTHORITY = '" . $authority . "';"
+        if defined $authority;
+
+    my $e = do {
+        local $@;
+        local $SIG{__DIE__};
+        eval $code;
+        $@;
+    };
+    confess "creation of $package_name failed : $e" if $e;
 }
 
 1;
@@ -64,44 +71,35 @@ Class::MOP::Module - Module Meta Object
 
 =head1 DESCRIPTION
 
-This is an abstraction of a Perl 5 module, it is a superclass of
-L<Class::MOP::Class>. A module essentially a package with metadata, 
-in our case the version and authority. 
+A module is essentially a L<Class::MOP::Package> with metadata, in our
+case the version and authority.
 
 =head1 INHERITANCE
 
-B<Class::MOP::Module> is a subclass of L<Class::MOP::Package>
+B<Class::MOP::Module> is a subclass of L<Class::MOP::Package>.
 
 =head1 METHODS
 
 =over 4
 
-=item B<meta>
-
-Returns a metaclass for this package.
-
-=item B<initialize ($package_name)>
-
-This will initialize a Class::MOP::Module instance which represents 
-the module of C<$package_name>.
-
-=item B<version>
+=item B<< $metamodule->version >>
 
-This is a read-only attribute which returns the C<$VERSION> of the 
-package for the given instance.
+This is a read-only attribute which returns the C<$VERSION> of the
+package, if one exists.
 
-=item B<authority>
+=item B<< $metamodule->authority >>
 
-This is a read-only attribute which returns the C<$AUTHORITY> of the 
-package for the given instance.
+This is a read-only attribute which returns the C<$AUTHORITY> of the
+package, if one exists.
 
-=item B<identifier>
+=item B<< $metamodule->identifier >>
 
-This constructs a string of the name, version and authority.
+This constructs a string which combines the name, version and
+authority.
 
-=item B<create>
+=item B<< Class::MOP::Module->meta >>
 
-This creates the module; it does not return a useful result.
+This will return a L<Class::MOP::Class> instance for this class.
 
 =back
 
@@ -111,7 +109,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2008 by Infinity Interactive, Inc.
+Copyright 2006-2009 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>