r74411 - in /branches/upstream/libmoosex-nonmoose-perl/current: ./ lib/MooseX/ lib/MooseX/NonMoose/ lib/MooseX/NonMoose/Meta/Role/ t/

ansgar at users.alioth.debian.org ansgar at users.alioth.debian.org
Sat May 14 14:07:34 UTC 2011


Author: ansgar
Date: Sat May 14 14:07:11 2011
New Revision: 74411

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74411
Log:
[svn-upgrade] new version libmoosex-nonmoose-perl (0.22)

Added:
    branches/upstream/libmoosex-nonmoose-perl/current/t/12-reinitialize.t
Modified:
    branches/upstream/libmoosex-nonmoose-perl/current/Changes
    branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST
    branches/upstream/libmoosex-nonmoose-perl/current/META.json
    branches/upstream/libmoosex-nonmoose-perl/current/META.yml
    branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL
    branches/upstream/libmoosex-nonmoose-perl/current/README
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm
    branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm

Modified: branches/upstream/libmoosex-nonmoose-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/Changes?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/Changes (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/Changes Sat May 14 14:07:11 2011
@@ -1,4 +1,12 @@
 Revision history for MooseX-NonMoose
+
+0.22  2011-05-09
+      - Fix issues where the metaclass gets reinitialized after the call to
+        'extends' but before 'make_immutable'. This could happen if a role
+        used an extension which provided an application_to_class metarole,
+        since the role application would then apply a metarole to the class,
+        and metarole application currently causes metaclass reinitialization
+        in Moose. (ugh.)
 
 0.21  2011-04-29
       - Allow this module to work with constructors with names other than

Modified: branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/MANIFEST Sat May 14 14:07:11 2011
@@ -20,6 +20,7 @@
 t/07-extends-moose-object.t
 t/10-immutable.t
 t/11-constructor-name.t
+t/12-reinitialize.t
 t/20-BUILD.t
 t/21-BUILDARGS.t
 t/22-replaced-constructor.t

Modified: branches/upstream/libmoosex-nonmoose-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/META.json?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/META.json (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/META.json Sat May 14 14:07:11 2011
@@ -4,7 +4,7 @@
       "Jesse Luehrs <doy at tozt dot net>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.101670",
+   "generated_by" : "Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.110930",
    "license" : [
       "perl_5"
    ],
@@ -40,7 +40,7 @@
          "web" : "http://github.com/doy/moosex-nonmoose"
       }
    },
-   "version" : "0.21",
+   "version" : "0.22",
    "x_Dist_Zilla" : {
       "plugins" : [
          {

Modified: branches/upstream/libmoosex-nonmoose-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/META.yml?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/META.yml (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/META.yml Sat May 14 14:07:11 2011
@@ -8,7 +8,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.30
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.101670'
+generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.110930'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,7 +19,7 @@
   Moose: 1.15
 resources:
   repository: git://github.com/doy/moosex-nonmoose.git
-version: 0.21
+version: 0.22
 x_Dist_Zilla:
   plugins:
     -

Modified: branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/Makefile.PL Sat May 14 14:07:11 2011
@@ -26,7 +26,7 @@
     'List::MoreUtils' => '0',
     'Moose' => '1.15'
   },
-  'VERSION' => '0.21',
+  'VERSION' => '0.22',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: branches/upstream/libmoosex-nonmoose-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/README?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/README (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/README Sat May 14 14:07:11 2011
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution MooseX-NonMoose,
-version 0.21:
+version 0.22:
 
   easy subclassing of non-Moose classes
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose.pm Sat May 14 14:07:11 2011
@@ -1,6 +1,6 @@
 package MooseX::NonMoose;
 BEGIN {
-  $MooseX::NonMoose::VERSION = '0.21';
+  $MooseX::NonMoose::VERSION = '0.22';
 }
 use Moose::Exporter;
 # ABSTRACT: easy subclassing of non-Moose classes
@@ -35,7 +35,7 @@
 
 =head1 VERSION
 
-version 0.21
+version 0.22
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/InsideOut.pm Sat May 14 14:07:11 2011
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::InsideOut;
 BEGIN {
-  $MooseX::NonMoose::InsideOut::VERSION = '0.21';
+  $MooseX::NonMoose::InsideOut::VERSION = '0.22';
 }
 use Moose::Exporter;
 # ABSTRACT: easy subclassing of non-Moose non-hashref classes
@@ -36,7 +36,7 @@
 
 =head1 VERSION
 
-version 0.21
+version 0.22
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Class.pm Sat May 14 14:07:11 2011
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::Meta::Role::Class;
 BEGIN {
-  $MooseX::NonMoose::Meta::Role::Class::VERSION = '0.21';
+  $MooseX::NonMoose::Meta::Role::Class::VERSION = '0.22';
 }
 use Moose::Role;
 use List::MoreUtils qw(any);
@@ -26,6 +26,25 @@
     lazy    => 1,
     default => sub { shift->throw_error("No constructor name has been set") },
 );
+
+# XXX ugh, really need to fix this in moose
+around reinitialize => sub {
+    my $orig = shift;
+    my $class = shift;
+    my ($pkg) = @_;
+
+    my $meta = blessed($pkg) ? $pkg : Class::MOP::class_of($pkg);
+
+    $class->$orig(
+        @_,
+        (map { $_->init_arg => $_->get_value($meta) }
+             grep { $_->has_value($meta) }
+                  map { $meta->meta->find_attribute_by_name($_) }
+                      qw(has_nonmoose_constructor
+                         has_nonmoose_destructor
+                         constructor_name)),
+    );
+};
 
 sub _determine_constructor_options {
     my $self = shift;
@@ -340,7 +359,7 @@
 
 =head1 VERSION
 
-version 0.21
+version 0.22
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm?rev=74411&op=diff
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm (original)
+++ branches/upstream/libmoosex-nonmoose-perl/current/lib/MooseX/NonMoose/Meta/Role/Constructor.pm Sat May 14 14:07:11 2011
@@ -1,6 +1,6 @@
 package MooseX::NonMoose::Meta::Role::Constructor;
 BEGIN {
-  $MooseX::NonMoose::Meta::Role::Constructor::VERSION = '0.21';
+  $MooseX::NonMoose::Meta::Role::Constructor::VERSION = '0.22';
 }
 use Moose::Role;
 # ABSTRACT: constructor method trait for L<MooseX::NonMoose>
@@ -88,7 +88,7 @@
 
 =head1 VERSION
 
-version 0.21
+version 0.22
 
 =head1 SYNOPSIS
 

Added: branches/upstream/libmoosex-nonmoose-perl/current/t/12-reinitialize.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmoosex-nonmoose-perl/current/t/12-reinitialize.t?rev=74411&op=file
==============================================================================
--- branches/upstream/libmoosex-nonmoose-perl/current/t/12-reinitialize.t (added)
+++ branches/upstream/libmoosex-nonmoose-perl/current/t/12-reinitialize.t Sat May 14 14:07:11 2011
@@ -1,0 +1,32 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+use Test::Fatal;
+
+{
+    package Foo;
+    sub new { bless {}, shift }
+}
+
+{
+    package Foo::Meta::Role;
+    use Moose::Role;
+}
+
+{
+    package Foo::Sub;
+    use Moose;
+    use MooseX::NonMoose;
+    extends 'Foo';
+    Moose::Util::MetaRole::apply_metaroles(
+        for => __PACKAGE__,
+        class_metaroles => {
+            class => ['Foo::Meta::Role'],
+        },
+    );
+    ::is(::exception { __PACKAGE__->meta->make_immutable }, undef,
+         "can make_immutable after reinitialization");
+}
+
+done_testing;




More information about the Pkg-perl-cvs-commits mailing list