Merge pull request #889 from omega/omega/release-changes

Add last release changes on release page
metacpan · Jul 31, 2013 · 69f6d46 · 69f6d46
2 parents a3d56a4 + 79e2efd
commit 69f6d46
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 1 deletion.
diff --git a/Makefile.PL b/Makefile.PL
@@ -46,6 +46,7 @@ my %WriteMakefileArgs = (
     "Catalyst::View::TT::Alloy" => 0,
     "CatalystX::RoleApplicator" => 0,
     "Config::General" => 0,
+    "CPAN::Changes" => 0.21,
     "Data::Dumper" => 0,
     "DateTime" => 0,
     "DateTime::Format::HTTP" => 0,

diff --git a/cpanfile b/cpanfile
@@ -17,6 +17,7 @@ requires 'Catalyst::View::JSON';
 requires 'Catalyst::View::TT::Alloy';
 requires 'CatalystX::RoleApplicator';
 requires 'Config::General';
+requires 'CPAN::Changes', '0.21';
 requires 'Data::Dumper';
 requires 'DateTime';
 requires 'DateTime::Format::HTTP';

diff --git a/lib/MetaCPAN/Web/Model/API/Changes.pm b/lib/MetaCPAN/Web/Model/API/Changes.pm
@@ -2,9 +2,30 @@ package MetaCPAN::Web::Model::API::Changes;
 use Moose;
 extends 'MetaCPAN::Web::Model::API';
 
+use CPAN::Changes;
+use Try::Tiny;
+
 sub get {
     my ( $self, @path ) = @_;
     $self->request( '/changes/' . join( '/', @path ) );
 }
 
+sub last_version {
+    my ( $self, $response ) = @_;
+    my $changes;
+    if ( !exists $response->{content} or $response->{documentation} ) {
+    } else {
+        # I guess we have a propper changes file? :P
+        try {
+            $changes = CPAN::Changes->load_string($response->{content});
+        } catch {
+            # we don't really care?
+            warn "Error parsing changes: $_" if $ENV{CATALYST_DEBUG};
+        };
+    }
+    return unless $changes;
+    my @releases = $changes->releases;
+    return unless scalar @releases;
+    return $releases[-1];
+}
 1;
diff --git a/lib/MetaCPAN/Web/Role/ReleaseInfo.pm b/lib/MetaCPAN/Web/Role/ReleaseInfo.pm
@@ -34,6 +34,7 @@ sub api_requests {
 
         versions   => $c->model('API::Release')->versions( $data->{distribution} ),
         distribution => $c->model('API::Release')->distribution( $data->{distribution} ),
+        changes    => $c->model('API::Changes')->get( $data->{author}, $data->{name} ),
         %$reqs,
     };
 }
@@ -42,13 +43,16 @@ sub api_requests {
 sub stash_api_results {
     my ( $self, $c, $reqs, $data ) = @_;
 
+    my $changes = $c->model('API::Changes')->last_version( $reqs->{changes} );
+
     $c->stash({
         author     => $reqs->{author},
         #release    => $release->{hits}->{hits}->[0]->{_source},
         rating     => $reqs->{rating}->{ratings}->{ $data->{distribution} },
         distribution => $reqs->{distribution},
         versions   =>
             [ map { $_->{fields} } @{ $reqs->{versions}->{hits}->{hits} } ],
+        ( $changes ? (last_version_changes => $changes) : () ),
     });
 }
 

diff --git a/root/release.html b/root/release.html
@@ -142,6 +142,24 @@
 <% IF root.size %><strong>Other files</strong>
 <% FOREACH file IN root %>
 <div><strong><a href="/<% file.documentation ? "module" : "source" %>/<% release.author; '/'; release.name; '/'; file.name %>"><% file.name %></a></strong></div>
-<% END; END %>
+<% END %><br><% END %>
 
+<% IF last_version_changes; SET v = last_version_changes; %>
+<strong>Changes for version <% v.version %></strong>
+<div class="last-changes">
+    <% IF v.note %><div class="note"><% v.note %></div><% END %>
+    <ul>
+    <% FOREACH group IN v.groups; SET changes = v.changes(group) %>
+    <li><span class="group-header"><% group %></span>
+            <ul class="changes">
+                <% FOREACH change IN changes %>
+                <li><% change %></li>
+                <% END %>
+            </ul>
+        </li>
+
+    <% END %>
+</ul>
+</div>
+<% END %>
 </div>
diff --git a/root/static/css/style.css b/root/static/css/style.css
@@ -1039,3 +1039,16 @@ div.qtip-github table th {
 #contributors .contributor * {
     vertical-align: top;
 }
+
+
+/* Changes in release page
+ * See /release/CPAN-Changes for example
+ */
+.last-changes .group-header {
+    font-weight: bold;
+}
+.last-changes .changes {
+    margin-left: 1em;
+    padding-left: 1em;
+    list-style: square;
+}
diff --git a/t/controller/release.t b/t/controller/release.t
@@ -24,8 +24,14 @@ test_psgi app, sub {
     ok( $tx->find_value('//a[@href="/release/Moose"]'),
         'contains permalink to resource' );
 
+    # Figure out version for Changes test
+    my ($author, $module) = split m|/|, $tx->find_value('//strong/big');
+    $module =~ s/[^\d\w_.-]//g;
+    my ($version) = (reverse split /-/, $module);
+
     # Confirm that the headings in the content div are in the expected order.
     my @headings = ( 'Documentation', 'Modules', 'Provides', 'Examples', 'Other files' );
+    push @headings, 'Changes for version ' . $version ;
     my $heading  = 0;
 
     $tx->ok( '//div[@class="content"]/strong', sub {