fixups and cleanups after code review

metacpan · Sep 9, 2016 · aef9242 · aef9242
1 parent 09c9edd
commit aef9242
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/cpanfile b/cpanfile
@@ -105,7 +105,7 @@ requires 'MooseX::ClassAttribute';
 requires 'MooseX::Getopt';
 requires 'MooseX::Getopt::Dashes';
 requires 'MooseX::Getopt::OptionTypeMap';
-requires 'MooseX::Fastly::Role';
+requires 'MooseX::Fastly::Role', '0.01';
 requires 'MooseX::StrictConstructor';
 requires 'MooseX::Types';
 requires 'MooseX::Types::Common::String';

diff --git a/lib/MetaCPAN/Role/Script.pm b/lib/MetaCPAN/Role/Script.pm
@@ -12,9 +12,8 @@ use MetaCPAN::Queue ();
 
 use Carp ();
 
-with 'MetaCPAN::Role::HasConfig';
-with 'MetaCPAN::Role::Fastly';
-with 'MetaCPAN::Role::Logger';
+with( 'MetaCPAN::Role::HasConfig', 'MetaCPAN::Role::Fastly',
+    'MetaCPAN::Role::Logger' );
 
 has 'cpan' => (
     is      => 'ro',

diff --git a/lib/MetaCPAN/Script/Release.pm b/lib/MetaCPAN/Script/Release.pm
@@ -185,7 +185,6 @@ sub run {
 
     # Call Fastly to purge
     $self->purge_cpan_distnameinfos( \@module_to_purge_dists );
-
 }
 
 sub _get_release_model {

diff --git a/lib/MetaCPAN/Server.pm b/lib/MetaCPAN/Server.pm
@@ -3,9 +3,7 @@ package MetaCPAN::Server;
 use Moose;
 
 ## no critic (Modules::RequireEndWithOne)
-use Catalyst qw/
-    +MetaCPAN::Role::Fastly::Catalyst
-    /;
+use Catalyst qw( +MetaCPAN::Role::Fastly::Catalyst );
 
 use CatalystX::RoleApplicator;
 use File::Temp qw( tempdir );

diff --git a/lib/MetaCPAN/Server/Controller/Diff.pm b/lib/MetaCPAN/Server/Controller/Diff.pm
@@ -20,7 +20,7 @@ sub diff_releases : Chained('index') : PathPart('release') : Args(4) {
     my ( $self, $c, @path ) = @_;
 
     $c->add_author_key( $path[0] );
-    $c->add_author_key( $path[2] );
+    $c->add_author_key( $path[2] ) unless $path[0] eq $path[2];
     $c->cdn_max_age('1y');
 
     # Use author/release as top dirs for diff.