Merge pull request metacpan#2475 from metacpan/haarg/always-distnameinfo

always provide distnameinfo with release data, and use it in templates

Author: oalders

lib/MetaCPAN/Web/Model/API/Release.pm

@@ -40,20 +40,20 @@ sub coverage {
 
 sub get {
     my ( $self, $author, $release ) = @_;
-    $self->request("/release/$author/$release");
+    $self->request("/release/$author/$release")->then( \&_with_distnameinfo );
 }
 
 sub latest_by_author {
     my ( $self, $pauseid ) = @_;
     $self->request("/release/latest_by_author/$pauseid")
-        ->then( $self->add_river );
+        ->then( \&_with_distnameinfo )->then( $self->add_river );
 }
 
 sub all_by_author {
     my ( $self, $pauseid, $page, $page_size ) = @_;
     $self->request( "/release/all_by_author/$pauseid",
         undef, { page => $page, page_size => $page_size } )
-        ->then( $self->add_river );
+        ->then( \&_with_distnameinfo )->then( $self->add_river );
 }
 
 sub recent {
@@ -66,7 +66,7 @@ sub recent {
             page_size => $page_size,
             type      => $type,
         }
-    )->then( $self->add_river );
+    )->then( \&_with_distnameinfo )->then( $self->add_river );
 }
 
 sub modules {
@@ -82,7 +82,8 @@ sub modules {
 
 sub find {
     my ( $self, $distribution ) = @_;
-    $self->request("/release/latest_by_distribution/$distribution");
+    $self->request("/release/latest_by_distribution/$distribution")
+        ->then( \&_with_distnameinfo );
 }
 
 # stolen from Module/requires
@@ -108,7 +109,7 @@ sub reverse_dependencies {
             $data->{took}     ||= 0;
             return $data;
         }
-    )->then( $self->add_river );
+    )->then( \&_with_distnameinfo )->then( $self->add_river );
 }
 
 sub interesting_files {
@@ -118,17 +119,12 @@ sub interesting_files {
 
 sub versions {
     my ( $self, $dist ) = @_;
-    $self->request("/release/versions/$dist")->then( sub {
+    $self->request("/release/versions/$dist")->then( \&_with_distnameinfo )
+        ->then( sub {
         my ($data) = @_;
-        my $releases = delete $data->{releases};
-        for my $release (@$releases) {
-            $release->{distname_version}
-                = CPAN::DistnameInfo->new( $release->{download_url} )
-                ->version;
-        }
-        $data->{versions} = $releases;
+        $data->{versions} = delete $data->{releases};
         Future->done($data);
-    } );
+        } );
 }
 
 sub topuploaders {
@@ -137,6 +133,18 @@ sub topuploaders {
     $self->request( '/release/top_uploaders', undef, $param );
 }
 
+sub _with_distnameinfo {
+    my ($data) = @_;
+    my $releases
+        = $data->{releases} ? $data->{releases} : [ $data->{release} || () ];
+    for my $release (@$releases) {
+        if ( my $url = $release->{download_url} ) {
+            $release->{distnameinfo} = CPAN::DistnameInfo->new($url);
+        }
+    }
+    Future->done($data);
+}
+
 __PACKAGE__->meta->make_immutable;
 
 1;

root/inc/breadcrumbs.html

@@ -6,7 +6,7 @@
   selected = release.author == version.author && release.name == version.name ? "selected" : ""; %>
 <%# FIXME: This link should point to /pod (or /source?) %>
   <option <% selected %> value="/<% [(module ? 'module' : 'release'), version.author, version.name].join('/'); IF module; "/"; module.path; END %>">
-    <% version.distname_version _ (version.maturity == 'developer' ? ' DEV' : '') %>
+    <% version.distnameinfo.version _ (version.maturity == 'developer' ? ' DEV' : '') %>
       (<%version.author %> on <% datetime(version.date).to_ymd %>)
       <% IF mark_unauthorized_releases && NOT version.authorized %>UNAUTHORIZED<% END %>
   </option>

root/inc/release-info.html

@@ -27,9 +27,8 @@
 </li>
 <li>
     <%
-    testers_version = release.name.remove('^' _ release.distribution.quotemeta _ '-?');
-    cpantesters_base = "https://www.cpantesters.org/distro/" _ release.distribution.chunk(1).0.uc _ "/" _ release.distribution _ ".html?oncpan=1&distmat=1&version=" _ (testers_version | uri) %>
-    <a rel="noopener nofollow" href="http://matrix.cpantesters.org/?dist=<% release.distribution | uri %>+<% testers_version | uri %>" title="Matrix"><i class="fa fa-fw fa-check-circle black"></i>Testers</a>
+    cpantesters_base = "https://www.cpantesters.org/distro/" _ release.distribution.chunk(1).0.uc _ "/" _ release.distribution _ ".html?oncpan=1&distmat=1&version=" _ (release.distnameinfo.version | uri) %>
+    <a rel="noopener nofollow" href="http://matrix.cpantesters.org/?dist=<% release.distribution | uri %>+<% release.distnameinfo.version | uri %>" title="Matrix"><i class="fa fa-fw fa-check-circle black"></i>Testers</a>
     <% IF release.tests.size %><span title="(pass / fail / na)">(<a rel="noopener nofollow" href="<% cpantesters_base %>&amp;grade=2" style="color: #090"><% release.tests.pass %></a> / <a rel="noopener nofollow" href="<% cpantesters_base %>&amp;grade=3" style="color: #900"><% release.tests.fail %></a> / <a rel="noopener nofollow" href="<% cpantesters_base %>&amp;grade=4"><% release.tests.na %></a>)</span><% END %>
 </li>
 <li>
@@ -65,11 +64,11 @@
             backpan.push(version);
             NEXT;
         END %>
-    <option value="<% version.author; '/'; version.name; IF module; '/'; module.path; END %>"><% version.distname_version _ (version.maturity == 'developer' ? ' DEV' : '') %> (<% version.author %> on <% datetime(version.date).to_ymd %>)</option>
+    <option value="<% version.author; '/'; version.name; IF module; '/'; module.path; END %>"><% version.distnameinfo.version _ (version.maturity == 'developer' ? ' DEV' : '') %> (<% version.author %> on <% datetime(version.date).to_ymd %>)</option>
 <% END; IF backpan.size %>
 <optgroup label="BackPAN"></optgroup>
 <% FOREACH version IN backpan %>
-    <option value="<% version.author; '/'; version.name; IF module; '/'; module.path; END %>"><% version.distname_version _ (version.maturity == 'developer' ? ' DEV' : '') %> (<%version.author %> on <% datetime(version.date).to_ymd %>)
+    <option value="<% version.author; '/'; version.name; IF module; '/'; module.path; END %>"><% version.distnameinfo.version _ (version.maturity == 'developer' ? ' DEV' : '') %> (<%version.author %> on <% datetime(version.date).to_ymd %>)
     </option>
 <% END %>
 <% END; END %>