From bf454629f998c17f75f0ee922cf5e564e80cee61 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Mon, 12 Jun 2017 14:15:19 +0200 Subject: [PATCH 1/3] sort cpanfile --- cpanfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cpanfile b/cpanfile index 32e5b280ba..e91c07fb91 100644 --- a/cpanfile +++ b/cpanfile @@ -15,8 +15,8 @@ requires 'Catalyst::Plugin::Static::Simple'; requires 'Catalyst::TraitFor::Request::REST::ForBrowsers'; requires 'Catalyst::View::JSON'; requires 'Catalyst::View::TT::Alloy'; -requires 'CatalystX::RoleApplicator'; requires 'CatalystX::Fastly::Role::Response', '0.06'; +requires 'CatalystX::RoleApplicator'; requires 'Config::General'; requires 'Config::ZOMG', '1.000000'; requires 'Cpanel::JSON::XS'; @@ -29,11 +29,10 @@ requires 'DateTime::Format::ISO8601'; requires 'Devel::Confess'; requires 'Digest::MD5'; requires 'Digest::SHA1'; -requires 'Search::Elasticsearch', '== 2.03'; requires 'Encode', '2.51'; requires 'Exporter'; -requires 'Format::Human::Bytes'; requires 'File::Path'; +requires 'Format::Human::Bytes'; requires 'Getopt::Long::Descriptive'; requires 'Gravatar::URL'; requires 'HTML::Escape'; @@ -50,26 +49,26 @@ requires 'JavaScript::Minifier::XS'; requires 'List::AllUtils'; requires 'List::MoreUtils'; requires 'List::Util'; -requires 'Log::Log4perl::Catalyst'; requires 'Locale::Country','3.28'; +requires 'Log::Log4perl::Catalyst'; +requires 'MetaCPAN::Moose'; +requires 'MetaCPAN::Role', '0.06'; requires 'Module::Build::Tiny', '0.037'; requires 'Module::Runtime'; -requires 'Moose', '2.1605'; requires 'Moo', '2.000002'; +requires 'Moose', '2.1605'; requires 'MooseX::ClassAttribute'; +requires 'MooseX::Fastly::Role', '0.03'; requires 'MooseX::Role::Parameterized', '1.02'; requires 'MooseX::StrictConstructor'; -requires 'MooseX::Fastly::Role', '0.03'; -requires 'PerlIO::gzip'; -requires 'MetaCPAN::Moose'; -requires 'MetaCPAN::Role', '0.06'; requires 'MooseX::Types::Common::Numeric'; requires 'MooseX::Types::Common::String'; requires 'MooseX::Types::Moose'; requires 'MooseX::Types::URI', '0.08'; requires 'Net::Fastly', '1.05'; -requires 'Path::Tiny', '0.076'; requires 'Params::ValidationCompiler'; +requires 'Path::Tiny', '0.076'; +requires 'PerlIO::gzip'; requires 'Plack', '1.0039'; requires 'Plack::Middleware::ReverseProxy'; requires 'Plack::Middleware::Runtime'; @@ -82,6 +81,7 @@ requires 'Plack::Test'; requires 'Ref::Util', '>= 0.008'; requires 'Regexp::Common'; requires 'Regexp::Common::time'; +requires 'Search::Elasticsearch', '== 2.03'; requires 'Starman', '>= 0.4008'; requires 'Template::Alloy'; requires 'Template::Plugin::Comma'; @@ -93,11 +93,11 @@ requires 'Template::Plugin::Number::Format'; requires 'Template::Plugin::Page'; requires 'Text::Pluralize'; requires 'Try::Tiny', '0.24'; -requires 'YAML', '1.15'; # fix dep chain issue requires 'URI', '1.71'; requires 'URI::Escape'; requires 'XML::Feed'; requires 'XML::Simple'; +requires 'YAML', '1.15'; # fix dep chain issue test_requires 'App::Prove'; test_requires 'Code::TidyAll', '>= 0.47'; From 0c149c9369b909bb3e3142e3e54ee6f1385d732a Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Sun, 11 Jun 2017 20:15:18 +0200 Subject: [PATCH 2/3] drop some unused prereqs --- cpanfile | 2 -- lib/MetaCPAN/Web/Controller/Search.pm | 1 - 2 files changed, 3 deletions(-) diff --git a/cpanfile b/cpanfile index e91c07fb91..fd751adf56 100644 --- a/cpanfile +++ b/cpanfile @@ -22,7 +22,6 @@ requires 'Config::ZOMG', '1.000000'; requires 'Cpanel::JSON::XS'; requires 'Data::Dumper'; requires 'Data::Pageset'; -requires 'Data::Printer', '0.38'; requires 'DateTime', '1.24'; requires 'DateTime::Format::HTTP'; requires 'DateTime::Format::ISO8601'; @@ -75,7 +74,6 @@ requires 'Plack::Middleware::Runtime'; requires 'Plack::Middleware::ServerStatus::Lite'; requires 'Plack::Middleware::Session', '0.22'; requires 'Plack::Middleware::Session::Cookie'; -requires 'Plack::Response'; requires 'Plack::Session'; requires 'Plack::Test'; requires 'Ref::Util', '>= 0.008'; diff --git a/lib/MetaCPAN/Web/Controller/Search.pm b/lib/MetaCPAN/Web/Controller/Search.pm index 13827eda1b..038f60f139 100644 --- a/lib/MetaCPAN/Web/Controller/Search.pm +++ b/lib/MetaCPAN/Web/Controller/Search.pm @@ -7,7 +7,6 @@ use Moose; BEGIN { extends 'MetaCPAN::Web::Controller' } -use Plack::Response; use Ref::Util qw( is_arrayref ); sub index : Path : Args(0) { From ac687e0d088ebc5a38dea7094bd790a6558241e4 Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Sun, 11 Jun 2017 20:15:54 +0200 Subject: [PATCH 3/3] drop List::MoreUtils and List::AllUtils --- cpanfile | 4 +-- lib/MetaCPAN/Web/Controller/Account.pm | 34 ++++++++++++++++---------- lib/MetaCPAN/Web/Model/API/Favorite.pm | 2 +- lib/MetaCPAN/Web/Model/API/Rating.pm | 2 +- lib/MetaCPAN/Web/Model/API/Release.pm | 3 +-- lib/MetaCPAN/Web/Model/ReleaseInfo.pm | 2 +- t/encoding.t | 5 ++-- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/cpanfile b/cpanfile index fd751adf56..08c846c458 100644 --- a/cpanfile +++ b/cpanfile @@ -45,9 +45,7 @@ requires 'Hash::AsObject'; requires 'Hash::Merge'; requires 'Importer'; requires 'JavaScript::Minifier::XS'; -requires 'List::AllUtils'; -requires 'List::MoreUtils'; -requires 'List::Util'; +requires 'List::Util', '1.45'; requires 'Locale::Country','3.28'; requires 'Log::Log4perl::Catalyst'; requires 'MetaCPAN::Moose'; diff --git a/lib/MetaCPAN/Web/Controller/Account.pm b/lib/MetaCPAN/Web/Controller/Account.pm index e729d2d724..8820924a29 100644 --- a/lib/MetaCPAN/Web/Controller/Account.pm +++ b/lib/MetaCPAN/Web/Controller/Account.pm @@ -1,7 +1,6 @@ package MetaCPAN::Web::Controller::Account; use Moose; -use List::MoreUtils qw(pairwise); use DateTime (); BEGIN { extends 'MetaCPAN::Web::Controller' } @@ -50,25 +49,34 @@ sub profile : Local : Args(0) { return unless ( $req->method eq 'POST' ); my $data = $author; - $data->{blog} = $req->param('blog.url') + + my @blog_url = $req->param('blog.url'); + my @blog_feed = $req->param('blog.feed'); + $data->{blog} + = $req->param('blog.url') ? [ - pairwise { { url => $a, feed => $b } } - @{ [ $req->param('blog.url') ] }, - @{ [ $req->param('blog.feed') ] } + map +{ url => $blog_url[$_], feed => $blog_feed[$_] }, + ( 0 .. $#blog_url ) ] : undef; - $data->{donation} = $req->param('donation.name') + + my @donation_name = $req->param('donation.name'); + my @donation_id = $req->param('donation.id'); + $data->{donation} + = $req->param('donation.name') ? [ - pairwise { { name => $a, id => $b } } - @{ [ $req->param('donation.name') ] }, - @{ [ $req->param('donation.id') ] } + map +{ name => $donation_name[$_], id => $donation_id[$_] }, + ( 0 .. $#donation_name ) ] : undef; - $data->{profile} = $req->param('profile.name') + + my @profile_name = $req->param('profile.name'); + my @profile_id = $req->param('profile.id'); + $data->{profile} + = $req->param('profile.name') ? [ - pairwise { { name => $a, id => $b } } - @{ [ $req->param('profile.name') ] }, - @{ [ $req->param('profile.id') ] } + map +{ name => $profile_name[$_], id => $profile_id[$_] }, + ( 0 .. $#profile_name ) ] : undef; diff --git a/lib/MetaCPAN/Web/Model/API/Favorite.pm b/lib/MetaCPAN/Web/Model/API/Favorite.pm index 57f33546ac..70723e2fce 100644 --- a/lib/MetaCPAN/Web/Model/API/Favorite.pm +++ b/lib/MetaCPAN/Web/Model/API/Favorite.pm @@ -4,7 +4,7 @@ use namespace::autoclean; extends 'MetaCPAN::Web::Model::API'; -use List::MoreUtils qw(uniq); +use List::Util qw(uniq); use Importer 'MetaCPAN::Web::Elasticsearch::Adapter' => qw/ single_valued_arrayref_to_scalar /; diff --git a/lib/MetaCPAN/Web/Model/API/Rating.pm b/lib/MetaCPAN/Web/Model/API/Rating.pm index 84acbea2fa..b06da355a1 100644 --- a/lib/MetaCPAN/Web/Model/API/Rating.pm +++ b/lib/MetaCPAN/Web/Model/API/Rating.pm @@ -23,7 +23,7 @@ it under the same terms as Perl itself. =cut -use List::MoreUtils qw(uniq); +use List::Util qw(uniq); sub get { my ( $self, @distributions ) = @_; diff --git a/lib/MetaCPAN/Web/Model/API/Release.pm b/lib/MetaCPAN/Web/Model/API/Release.pm index 9759e8a6a4..c19ec33415 100644 --- a/lib/MetaCPAN/Web/Model/API/Release.pm +++ b/lib/MetaCPAN/Web/Model/API/Release.pm @@ -4,8 +4,7 @@ use namespace::autoclean; extends 'MetaCPAN::Web::Model::API'; -use List::Util qw(first); -use List::MoreUtils qw(uniq); +use List::Util qw(first uniq); =head1 NAME diff --git a/lib/MetaCPAN/Web/Model/ReleaseInfo.pm b/lib/MetaCPAN/Web/Model/ReleaseInfo.pm index 96ea954c62..a22d05708c 100644 --- a/lib/MetaCPAN/Web/Model/ReleaseInfo.pm +++ b/lib/MetaCPAN/Web/Model/ReleaseInfo.pm @@ -6,7 +6,7 @@ use MetaCPAN::Moose; extends 'Catalyst::Model'; -use List::AllUtils qw( all ); +use List::Util qw( all ); use MetaCPAN::Web::Types qw( HashRef Object ); use URI; use URI::Escape qw(uri_escape uri_unescape); diff --git a/t/encoding.t b/t/encoding.t index 5e126490e2..e6760fe86c 100644 --- a/t/encoding.t +++ b/t/encoding.t @@ -3,7 +3,6 @@ use strict; use warnings; use utf8; use Test::More; -use List::MoreUtils qw(natatime); use MetaCPAN::Web::Test; use Encode qw( is_utf8 decode encode ); @@ -52,8 +51,8 @@ sub test_raw_response { } if ( my $w = $opts{warnings} ) { - my $iter = natatime 2, @$w; - while ( my ( $re, $desc ) = $iter->() ) { + for my $i ( map $_ * 2, 0 .. @$w / 2 - 1 ) { + my ( $re, $desc ) = @{$w}[ $i, $i + 1 ]; like pop(@warnings), $re, $desc; } }