Merge branch 'stable'

[gitmo/Class-MOP.git] / lib / Class / MOP / Module.pm

diff --git a/lib/Class/MOP/Module.pm b/lib/Class/MOP/Module.pm
index 8ff573c..f8d22b2 100644 (file)
--- a/lib/Class/MOP/Module.pm
+++ b/lib/Class/MOP/Module.pm
@@ -7,20 +7,38 @@ use warnings;
 use Carp         'confess';
 use Scalar::Util 'blessed';
 
-our $VERSION   = '0.78';
+our $VERSION   = '1.12';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Package';
 
+sub _new {
+    my $class = shift;
+    return Class::MOP::Class->initialize($class)->new_object(@_)
+        if $class ne __PACKAGE__;
+
+    my $params = @_ == 1 ? $_[0] : {@_};
+    return bless {
+
+        # from Class::MOP::Package
+        package   => $params->{package},
+        namespace => \undef,
+
+        # attributes
+        version   => \undef,
+        authority => \undef
+    } => $class;
+}
+
 sub version {  
     my $self = shift;
-    ${$self->get_package_symbol({ sigil => '$', type => 'SCALAR', name => 'VERSION' })};
+    ${$self->get_or_add_package_symbol('$VERSION')};
 }
 
 sub authority {  
     my $self = shift;
-    ${$self->get_package_symbol({ sigil => '$', type => 'SCALAR', name => 'AUTHORITY' })};
+    ${$self->get_or_add_package_symbol('$AUTHORITY')};
 }
 
 sub identifier {
@@ -33,23 +51,22 @@ sub identifier {
 }
 
 sub create {
-    my ( $class, %options ) = @_;
-
-    my $package_name = $options{package};
+    confess "The Class::MOP::Module->create method has been made a private object method.\n";
+}
 
-    (defined $package_name && $package_name)
-        || confess "You must pass a package name";
+sub _instantiate_module {
+    my($self, $version, $authority) = @_;
+    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};
+    Class::MOP::_is_valid_class_name($package_name)
+        || confess "creation of $package_name failed: invalid package name";
 
-    eval $code;
-    confess "creation of $package_name failed : $@" if $@;
+    no strict 'refs';
+    scalar %{ $package_name . '::' };    # touch the stash
+    ${ $package_name . '::VERSION' }   = $version   if defined $version;
+    ${ $package_name . '::AUTHORITY' } = $authority if defined $authority;
 
-    return; # XXX: should this return some kind of meta object? ~sartak
+    return;
 }
 
 1;
@@ -102,7 +119,7 @@ Stevan Little E<lt>stevan@iinteractive.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2006-2009 by Infinity Interactive, Inc.
+Copyright 2006-2010 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>