Merge pull request #1915 from metacpan/haarg/prereq-cleanup

prerequisite cleanup
metacpan · Jun 12, 2017 · 7dd8420 · 7dd8420
2 parents 84ed618 + ac687e0
commit 7dd8420
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 38 deletions.
diff --git a/cpanfile b/cpanfile
@@ -15,25 +15,23 @@ 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';
 requires 'Data::Dumper';
 requires 'Data::Pageset';
-requires 'Data::Printer', '0.38';
 requires 'DateTime', '1.24';
 requires 'DateTime::Format::HTTP';
 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';
@@ -47,41 +45,39 @@ requires 'Hash::AsObject';
 requires 'Hash::Merge';
 requires 'Importer';
 requires 'JavaScript::Minifier::XS';
-requires 'List::AllUtils';
-requires 'List::MoreUtils';
-requires 'List::Util';
-requires 'Log::Log4perl::Catalyst';
+requires 'List::Util', '1.45';
 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';
 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';
 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 +89,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';

diff --git 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/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) {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;
             }
         }