r19476 - in /branches/upstream/libmoose-perl/current: Changes META.yml lib/Moose.pm lib/Moose/Meta/Attribute.pm
eloy at users.alioth.debian.org
eloy at users.alioth.debian.org
Tue May 6 08:41:19 UTC 2008
Author: eloy
Date: Tue May 6 08:41:18 2008
New Revision: 19476
URL: http://svn.debian.org/wsvn/?sc=1&rev=19476
Log:
[svn-upgrade] Integrating new upstream version, libmoose-perl (0.43)
Modified:
branches/upstream/libmoose-perl/current/Changes
branches/upstream/libmoose-perl/current/META.yml
branches/upstream/libmoose-perl/current/lib/Moose.pm
branches/upstream/libmoose-perl/current/lib/Moose/Meta/Attribute.pm
Modified: branches/upstream/libmoose-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmoose-perl/current/Changes?rev=19476&op=diff
==============================================================================
--- branches/upstream/libmoose-perl/current/Changes (original)
+++ branches/upstream/libmoose-perl/current/Changes Tue May 6 08:41:18 2008
@@ -1,4 +1,13 @@
Revision history for Perl extension Moose
+
+0.43 Wed. April, 30, 2008
+ * NOTE TO SELF:
+ drink more coffee before
+ doing release engineering
+
+ - whoops, forgot to do the smolder tests,
+ and we broke some of the custom meta-attr
+ modules. This fixes that.
0.42 Mon. April 28, 2008
- some bad tests slipped by, nothing else
Modified: branches/upstream/libmoose-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmoose-perl/current/META.yml?rev=19476&op=diff
==============================================================================
--- branches/upstream/libmoose-perl/current/META.yml (original)
+++ branches/upstream/libmoose-perl/current/META.yml Tue May 6 08:41:18 2008
@@ -25,4 +25,4 @@
Sub::Exporter: 0.972
Sub::Name: 0.02
tests: t/*.t t/*/*.t
-version: 0.42
+version: 0.43
Modified: branches/upstream/libmoose-perl/current/lib/Moose.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmoose-perl/current/lib/Moose.pm?rev=19476&op=diff
==============================================================================
--- branches/upstream/libmoose-perl/current/lib/Moose.pm (original)
+++ branches/upstream/libmoose-perl/current/lib/Moose.pm Tue May 6 08:41:18 2008
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = '0.42';
+our $VERSION = '0.43';
our $AUTHORITY = 'cpan:STEVAN';
use Scalar::Util 'blessed', 'reftype';
@@ -723,6 +723,17 @@
You are allowed to B<add> a new C<builder> definition, but you are B<not>
allowed to I<change> one.
+=item I<metaclass>
+
+You are allowed to B<add> a new C<metaclass> definition, but you are
+B<not> allowed to I<change> one.
+
+=item I<traits>
+
+You are allowed to B<add> additional traits to the C<traits> definition.
+These traits will be composed into the attribute, but pre-existing traits
+B<are not> overridden, or removed.
+
=back
=item B<before $name|@names =E<gt> sub { ... }>
Modified: branches/upstream/libmoose-perl/current/lib/Moose/Meta/Attribute.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmoose-perl/current/lib/Moose/Meta/Attribute.pm?rev=19476&op=diff
==============================================================================
--- branches/upstream/libmoose-perl/current/lib/Moose/Meta/Attribute.pm (original)
+++ branches/upstream/libmoose-perl/current/lib/Moose/Meta/Attribute.pm Tue May 6 08:41:18 2008
@@ -9,7 +9,7 @@
use Sub::Name 'subname';
use overload ();
-our $VERSION = '0.22';
+our $VERSION = '0.23';
our $AUTHORITY = 'cpan:STEVAN';
use Moose::Meta::Method::Accessor;
@@ -154,13 +154,19 @@
delete $options{does};
}
- ( $actual_options{metaclass}, my @traits ) = $self->interpolate_class(%options);
-
- my %seen;
- my @all_traits = grep { $seen{$_}++ } @{ $self->applied_traits || [] }, @traits;
- $actual_options{traits} = \@all_traits if @all_traits;
-
- delete @options{qw(metaclass traits)};
+ # NOTE:
+ # this doesn't apply to Class::MOP::Attributes,
+ # so we can ignore it for them.
+ # - SL
+ if ($self->can('interpolate_class')) {
+ ( $actual_options{metaclass}, my @traits ) = $self->interpolate_class(%options);
+
+ my %seen;
+ my @all_traits = grep { $seen{$_}++ } @{ $self->applied_traits || [] }, @traits;
+ $actual_options{traits} = \@all_traits if @all_traits;
+
+ delete @options{qw(metaclass traits)};
+ }
(scalar keys %options == 0)
|| confess "Illegal inherited options => (" . (join ', ' => keys %options) . ")";
More information about the Pkg-perl-cvs-commits
mailing list