Removed Elasticsearch::Adapter and its usage

With all queries having switched to using API endpoints, we no longer need the method single_valued_arrayref_to_scalar (in WEB) and the module hosting it.
metacpan · Jul 4, 2017 · 074686f · 074686f
1 parent b2f653c
commit 074686f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 168 deletions.
diff --git a/lib/MetaCPAN/Web/Elasticsearch/Adapter.pm b/lib/MetaCPAN/Web/Elasticsearch/Adapter.pm
diff --git a/lib/MetaCPAN/Web/Role/ReleaseInfo.pm b/lib/MetaCPAN/Web/Role/ReleaseInfo.pm
@@ -3,9 +3,6 @@ package MetaCPAN::Web::Role::ReleaseInfo;
 use Moose::Role;
 use Future;
 
-use Importer 'MetaCPAN::Web::Elasticsearch::Adapter' =>
-    qw/ single_valued_arrayref_to_scalar /;
-
 # TODO: are there other controllers that do (or should) include this?
 
 # TODO: should some of this be in a separate (instantiable) model
@@ -62,21 +59,15 @@ sub api_requests {
 # organize the api results into simple variables for the template
 sub stash_api_results {
     my ( $self, $c, $reqs, $data ) = @_;
-
-    my %to_stash = (
-        author       => $reqs->{author},
-        distribution => $reqs->{distribution},
-        rating       => $reqs->{rating}->{ratings}->{ $data->{distribution} },
-        versions     => $reqs->{versions}{releases},
+    $c->stash(
+        {
+            author       => $reqs->{author},
+            distribution => $reqs->{distribution},
+            rating       => $reqs->{rating}{ratings}{ $data->{distribution} },
+            versions     => $reqs->{versions}{releases},
+            contributors => $reqs->{contributors},
+        }
     );
-
-    my %stash
-        = map { $_ => single_valued_arrayref_to_scalar( $to_stash{$_} ) }
-        ( 'rating', 'distribution', 'versions' );
-
-    $stash{contributors} = $reqs->{contributors};
-
-    $c->stash( \%stash );
 }
 
 1;
diff --git a/t/elasticsearch_adapter.t b/t/elasticsearch_adapter.t
diff --git a/t/model/release.t b/t/model/release.t
@@ -5,9 +5,6 @@ use Test::More;
 use Cpanel::JSON::XS qw( decode_json );
 use MetaCPAN::Web;
 
-use Importer 'MetaCPAN::Web::Elasticsearch::Adapter' =>
-    qw/ single_valued_arrayref_to_scalar /;
-
 my ( $true, $false ) = @{ decode_json('[true, false]') };
 
 # Explicitly test that we get a boolean.
@@ -27,7 +24,6 @@ subtest modules => sub {
     ok( scalar @files, 'found files with modules' );
 
     foreach my $file (@files) {
-        single_valued_arrayref_to_scalar($file);
 
         # this is a hack for the later sort check:
         # 1. fix to both 'undefined value' warnings