Skip to content

Commit d215987

Browse files
authored
Merge pull request #1316 from metacpan/haarg/misc-cleanups
Miscellaneous cleanups
2 parents 2633bba + 7d091e7 commit d215987

File tree

5 files changed

+20
-33
lines changed

5 files changed

+20
-33
lines changed

lib/MetaCPAN/ESConfig.pm

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
use v5.20;
22
use warnings;
3-
use experimental qw(signatures postderef);
3+
use experimental qw( signatures postderef );
44

55
package MetaCPAN::ESConfig;
66

7-
use Carp qw(croak);
8-
use Const::Fast qw(const);
9-
use Exporter qw(import);
10-
use MetaCPAN::Util qw(root_dir);
11-
use Module::Runtime qw(require_module $module_name_rx);
7+
use Carp qw( croak );
8+
use Const::Fast qw( const );
129
use Cpanel::JSON::XS ();
13-
use Hash::Merge::Simple qw(merge);
10+
use Exporter qw( import );
11+
use Hash::Merge::Simple qw( merge );
1412
use MetaCPAN::Server::Config ();
15-
use MetaCPAN::Types::TypeTiny qw(HashRef Defined);
16-
use Const::Fast qw(const);
13+
use MetaCPAN::Types::TypeTiny qw( Defined HashRef );
14+
use MetaCPAN::Util qw( root_dir );
15+
use Module::Runtime qw( $module_name_rx require_module );
1716

1817
const my %config => merge(
1918
{

lib/MetaCPAN/Query/Release.pm

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ sub _activity_filters {
285285
if ( $new_dists and $new_dists eq 'n' ) {
286286
push @filters,
287287
(
288-
+{ term => { first => 1 } },
288+
+{ term => { first => true } },
289289
+{ terms => { status => [qw( cpan latest )] } },
290290
);
291291
}
@@ -824,29 +824,19 @@ sub recent {
824824
my $query;
825825
if ( $type eq 'n' ) {
826826
$query = {
827-
constant_score => {
828-
filter => {
829-
bool => {
830-
must => [
831-
{ term => { first => 1 } },
832-
{ terms => { status => [qw< cpan latest >] } },
833-
]
834-
}
835-
}
827+
bool => {
828+
must => [
829+
{ term => { first => true } },
830+
{ terms => { status => [qw< cpan latest >] } },
831+
]
836832
}
837833
};
838834
}
839835
elsif ( $type eq 'a' ) {
840836
$query = { match_all => {} };
841837
}
842838
else {
843-
$query = {
844-
constant_score => {
845-
filter => {
846-
terms => { status => [qw< cpan latest >] }
847-
}
848-
}
849-
};
839+
$query = { terms => { status => [qw< cpan latest >] } };
850840
}
851841

852842
my $body = {

lib/MetaCPAN/Util.pm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ sub fix_version {
9494

9595
sub author_dir {
9696
my $pauseid = shift;
97-
my $dir = 'id/'
98-
. sprintf( "%s/%s/%s",
99-
substr( $pauseid, 0, 1 ),
100-
substr( $pauseid, 0, 2 ), $pauseid );
101-
return $dir;
97+
return sprintf( 'id/%1$.1s/%1$.2s/%1$s', $pauseid );
10298
}
10399

104100
sub hit_total {

t/release/documentation-not-readme.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ use warnings;
33
use lib 't/lib';
44

55
use MetaCPAN::TestHelpers qw( test_release );
6+
use MetaCPAN::Util qw( true false );
67
use Test::More;
78

89
test_release(
910
'RWSTAUNER/Documentation-Not-Readme-0.01',
1011
{
11-
first => 1,
12+
first => true,
1213
extra_tests => \&test_modules,
1314
main_module => 'Documentation::Not::Readme',
1415
}

t/release/pod-examples.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ use warnings;
33
use lib 't/lib';
44

55
use MetaCPAN::TestHelpers qw( test_release );
6+
use MetaCPAN::Util qw( true false );
67
use Test::More;
78

89
test_release(
910
'RWSTAUNER/Pod-Examples-99',
1011
{
11-
first => 1,
12+
first => true,
1213
extra_tests => \&test_pod_examples,
1314
main_module => 'Pod::Examples',
1415
changes_file => 'Changes',

0 commit comments

Comments
 (0)