On Thu Oct 17 07:50:47 2013, STEVAN wrote:
Show quoted text> Renee,
>
> A patch would be wonderful, thank you.
>
> - Stevan
>
> On Oct 17, 2013, at 6:08 AM, "Renée Bäcker via RT" <bug-
> Forest@rt.cpan.org> wrote:
>
> > Thu Oct 17 06:08:09 2013: Request 89582 was acted upon.
> > Transaction: Ticket created by reb@perl-services.de
> > Queue: Forest
> > Subject: Dependency MooseX::AttributeHelpers is deprecated and
> > leads to FAIL for Forest on newer Perls
> > Broken in: (no value)
> > Severity: (no value)
> > Owner: Nobody
> > Requestors: reb@perl-services.de
> > Status: new
> > Ticket <URL:
https://rt.cpan.org/Ticket/Display.html?id=89582 >
> >
> >
> > .. as the MX::AH has a bug triggered by the Hash randomisations in
> > newer
> > Perl.
> > There is already a bugreport for that module
> > (
https://rt.cpan.org/Public/Bug/Display.html?id=81564), but
> > it is mentioned that MX::AH is deprecated now.
> >
> > Please upgrade the minimum version of Moose in your prereq list and
> > use
> > the features of Moose. Then you can
> > can remove MX::AH from the prereq list.
> >
> > If you agree, I can prepare a patch to do this...
> >
> > Kind regards,
> > Renee
> >
> >
Here's a patch.
-Rob
diff -Naur ./lib/Forest/Tree/Indexer.pm ../../1385485074.30333/Forest-0.09/lib/Forest/Tree/Indexer.pm
--- ./lib/Forest/Tree/Indexer.pm 2010-09-27 21:47:39.000000000 +0200
+++ ../../1385485074.30333/Forest-0.09/lib/Forest/Tree/Indexer.pm 2013-11-26 17:58:08.959015449 +0100
@@ -1,6 +1,5 @@
package Forest::Tree::Indexer;
use Moose::Role;
-use MooseX::AttributeHelpers;
our $VERSION = '0.09';
our $AUTHORITY = 'cpan:STEVAN';
@@ -11,16 +10,16 @@
);
has 'index' => (
- metaclass => 'Collection::Hash',
- is => 'rw',
- isa => 'HashRef[Forest::Tree::Pure]',
- lazy => 1,
- default => sub { {} },
- provides => {
- 'get' => 'get_tree_at',
- 'exists' => 'has_tree_at',
- 'clear' => 'clear_index',
- 'keys' => 'get_index_keys',
+ traits => [qw(Hash)],
+ is => 'rw',
+ isa => 'HashRef[Forest::Tree::Pure]',
+ lazy => 1,
+ default => sub { {} },
+ handles => {
+ 'get_tree_at' => 'get',
+ 'has_tree_at' => 'exists',
+ 'clear_index' => 'clear',
+ 'get_index_keys' => 'keys',
}
);
diff -Naur ./lib/Forest/Tree/Pure.pm ../../1385485074.30333/Forest-0.09/lib/Forest/Tree/Pure.pm
--- ./lib/Forest/Tree/Pure.pm 2010-09-27 21:47:39.000000000 +0200
+++ ../../1385485074.30333/Forest-0.09/lib/Forest/Tree/Pure.pm 2013-11-26 17:58:08.959015449 +0100
@@ -1,6 +1,5 @@
package Forest::Tree::Pure;
use Moose;
-use MooseX::AttributeHelpers;
our $VERSION = '0.09';
our $AUTHORITY = 'cpan:STEVAN';
@@ -24,14 +23,14 @@
);
has 'children' => (
- metaclass => 'Collection::Array',
- is => 'ro',
- isa => 'ArrayRef[Forest::Tree::Pure]',
- lazy => 1,
- default => sub { [] },
- provides => {
- 'get' => 'get_child_at',
- 'count' => 'child_count',
+ traits => [qw(Array)],
+ is => 'ro',
+ isa => 'ArrayRef[Forest::Tree::Pure]',
+ lazy => 1,
+ default => sub { [] },
+ handles => {
+ 'get_child_at' => 'get',
+ 'child_count' => 'count',
},
);
diff -Naur ./lib/Forest/Tree.pm ../../1385485074.30333/Forest-0.09/lib/Forest/Tree.pm
--- ./lib/Forest/Tree.pm 2010-09-27 21:47:39.000000000 +0200
+++ ../../1385485074.30333/Forest-0.09/lib/Forest/Tree.pm 2013-11-26 17:58:08.959015449 +0100
@@ -1,6 +1,5 @@
package Forest::Tree;
use Moose;
-use MooseX::AttributeHelpers;
use Scalar::Util 'reftype', 'refaddr';
use List::Util 'sum', 'max';
@@ -41,15 +40,14 @@
#has '+children' => (
# is => 'rw',
has 'children' => (
- traits => [qw(Clone)],
- metaclass => 'Collection::Array',
- is => 'rw',
- isa => 'ArrayRef[Forest::Tree]',
- lazy => 1,
- default => sub { [] },
- provides => {
- 'get' => 'get_child_at',
- 'count' => 'child_count',
+ traits => [qw(Clone Array)],
+ is => 'rw',
+ isa => 'ArrayRef[Forest::Tree]',
+ lazy => 1,
+ default => sub { [] },
+ handles => {
+ 'get_child_at' => 'get',
+ 'child_count' => 'count',
},
trigger => sub {
my ($self, $children) = @_;
diff -Naur ./Makefile.PL ../../1385485074.30333/Forest-0.09/Makefile.PL
--- ./Makefile.PL 2010-09-27 21:47:39.000000000 +0200
+++ ../../1385485074.30333/Forest-0.09/Makefile.PL 2013-11-26 17:58:08.959015449 +0100
@@ -7,11 +7,10 @@
license 'perl';
# prereqs
-requires 'Moose' => '0.90';
-requires 'MooseX::Clone' => '0.05';
-requires 'MooseX::AttributeHelpers' => '0.17';
-requires 'Scalar::Util' => '1.17';
-requires 'List::Util' => '1.17';
+requires 'Moose' => '2.00';
+requires 'MooseX::Clone' => '0.05';
+requires 'Scalar::Util' => '1.17';
+requires 'List::Util' => '1.17';
# things the tests need
build_requires 'Test::More';
diff -Naur ./README ../../1385485074.30333/Forest-0.09/README
--- ./README 2010-01-13 19:19:01.000000000 +0100
+++ ../../1385485074.30333/Forest-0.09/README 2013-11-26 17:58:08.959015449 +0100
@@ -18,7 +18,6 @@
Moose
MooseX::Clone
- MooseX::AttributeHelpers
List::Util
Scalar::Util