bump version and update Changes for 0.64_04 release

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

diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm
index e5c270b..490ecc9 100644 (file)
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@ -7,7 +7,8 @@ use warnings;
 use Scalar::Util 'blessed';
 use Carp         'confess';
 
-our $VERSION   = '0.65';
+our $VERSION   = '0.64_04';
+$VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
 use base 'Class::MOP::Object';
@@ -15,14 +16,20 @@ use base 'Class::MOP::Object';
 # creation ...
 
 sub initialize {
-    my $class        = shift;
-    my $package_name = shift;
+    my ( $class, @args ) = @_;
+
+    unshift @args, "package" if @args % 2;
+
+    my %options = @args;
+    my $package_name = $options{package};
+
+
     # we hand-construct the class 
     # until we can bootstrap it
     if ( my $meta = Class::MOP::get_metaclass_by_name($package_name) ) {
        return $meta;
     } else {
-       my $meta = $class->_new({
+       my $meta = ( ref $class || $class )->_new({
            'package'   => $package_name,
        });
 
@@ -33,12 +40,19 @@ sub initialize {
 }
 
 sub reinitialize {
-    my $class        = shift;
-    my $package_name = shift;
+    my ( $class, @args ) = @_;
+
+    unshift @args, "package" if @args % 2;
+
+    my %options = @args;
+    my $package_name = delete $options{package};
+
     (defined $package_name && $package_name && !blessed($package_name))
         || confess "You must pass a package name and it cannot be blessed";
+
     Class::MOP::remove_metaclass_by_name($package_name);
-    $class->initialize('package' => $package_name, @_);
+
+    $class->initialize($package_name, %options); # call with first arg form for compat
 }
 
 sub _new {
@@ -273,9 +287,9 @@ sub get_all_package_symbols {
         return map {
             (ref($namespace->{$_})
                 ? ( $_ => \&{$pkg ||= $self->name . "::$_"} )
-                : ( *{$namespace->{$_}}{CODE}
-                    ? ( $_ => *{$namespace->{$_}}{$type_filter} )
-                    : ()))
+                : ( (*{$namespace->{$_}}{CODE}) # the extra parents prevent breakage on 5.8.2
+                    ? ( $_ => *{$namespace->{$_}}{CODE} )
+                    : () ) )
         } keys %$namespace;
     } else {
         return map {