Merge gh-1230 to add more feed data

Author: rwstauner

lib/MetaCPAN/Web/Controller/Feed.pm

@@ -72,15 +72,21 @@ sub author : Chained('index') PathPart Args(1) {
 
     my $author_cv   = $c->model('API::Author')->get($author);
     my $releases_cv = $c->model('API::Release')->latest_by_author($author);
-    my $data        = {
-        author => $author_cv->recv,
-        releases =>
-            [ map { $_->{fields} } @{ $releases_cv->recv->{hits}{hits} } ],
-    };
+    my $release_data
+        = [ map { $_->{fields} } @{ $releases_cv->recv->{hits}{hits} } ];
+    my $author_info = $author_cv->recv;
+    my $faves_cv
+        = $c->model('API::Favorite')->by_user( $author_info->{user} );
+    my $faves_data
+        = [ map { $_->{fields} } @{ $faves_cv->recv->{hits}{hits} } ];
 
     $c->stash->{feed} = $self->build_feed(
-        title => "Recent CPAN uploads by $data->{author}->{name} - MetaCPAN",
-        entries => $data->{releases}
+        title   => "Recent CPAN activity of $author - MetaCPAN",
+        entries => [
+            sort { $b->{date} cmp $a->{date} }
+                @{ $self->_format_release_entries($release_data) },
+            @{ $self->_format_favorite_entries( $author, $faves_data ) }
+        ],
     );
 }
 
@@ -98,7 +104,7 @@ sub build_entry {
     my $e = XML::Feed::Entry->new('RSS');
     $e->title( $entry->{name} );
     $e->link(
-        $entry->{link} // join( '/',
+        $entry->{link} ||= join( '/',
             'http://metacpan.org', 'release',
             $entry->{author},      $entry->{name} )
     );
@@ -120,6 +126,34 @@ sub build_feed {
     return $feed->as_xml;
 }
 
+sub _format_release_entries {
+    my ( $self, $releases ) = @_;
+    my @release_data;
+    foreach my $item ( @{$releases} ) {
+        $item->{link} = join( '/',
+            'https://metacpan.org', 'release',
+            $item->{author},        $item->{name} );
+        $item->{name} = "$item->{author} has released $item->{name}";
+        push( @release_data, $item );
+    }
+    return \@release_data;
+}
+
+sub _format_favorite_entries {
+    my ( $self, $author, $data ) = @_;
+    my @fav_data;
+    foreach my $fav ( @{$data} ) {
+        $fav->{abstract}
+            = "$author ++ed $fav->{distribution} from $fav->{author}";
+        $fav->{author} = $author;
+        $fav->{link}   = join( '/',
+            'https://metacpan.org', 'release', $fav->{distribution} );
+        $fav->{name} = "$author ++ed $fav->{distribution}";
+        push( @fav_data, $fav );
+    }
+    return \@fav_data;
+}
+
 sub end : Private {
     my ( $self, $c ) = @_;
     $c->res->content_type('application/rss+xml; charset=UTF-8');

root/author.html

@@ -146,6 +146,12 @@
 <!-- End left content -->
 
 <div class="content">
+    <div id="feed_subscription" class="page-header">
+        <p>Activity for <% author.name %> (<% author.pauseid %>)</p>
+        <i class="fa fa-rss fa-2x">
+            <a href="/feed/author/<% author.pauseid %>"></a>
+        </i>
+    </div>
     <div class="visible-xs inline-author-pic"><% INCLUDE inc/author-pic.html author = author %></div>
 <% IF releases.0 %>
     <% INCLUDE inc/release-table.html releases = aggregated, header = 1, tablesorter = 1, table_id = "author_releases" %>

root/inc/release-tools.html

@@ -19,6 +19,11 @@
     <span class="glyphicon glyphicon-star black"></span>Rate this distribution
     </a>
 </li>
+<li>
+    <a href="/feed/distribution/<% release.distribution %>">
+    <i class="fa fa-rss-square fa-fw black" id="rss-subscription"></i>Subscribe this distribution
+    </a>
+</li>
 <li>
     <form action="/search">
         <input type="hidden" name="q" value="dist:<% release.distribution %>">

root/pod.html

@@ -5,7 +5,7 @@
 
 <% INCLUDE inc/breadcrumbs.html plussers_div = plusser_authors%>
 
-<ul class="nav nav-list slidepanel" id="pod-navlist" itemscope itemtype="http://schema.org/SoftwareApplication">
+<ul class="nav nav-list slidepanel" itemscope itemtype="http://schema.org/SoftwareApplication">
   <li class="visible-xs">
     <% INCLUDE mobile/toolbar-search-form.html %>
   </li>

root/recent.html

@@ -5,6 +5,12 @@
 %>
 
 <div class="content">
+  <div id="feed_subscription" class="page-header">
+    <p>Recent Uploads</p>
+    <i class="fa fa-rss fa-2x">
+      <a href="/feed/recent"></a>
+    </i>
+  </div>
 <%-
 MoY = [undef, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
 DoW = [undef, "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"];

root/static/css/style.css

@@ -338,4 +338,8 @@ div.qtip-github table th {
 
 .news_feed {
     float: right;  
+}
+
+#icon-rss {
+    background: url('/static/icons/icon-rss.png');
 }

root/static/icons/icon-rss.png

@@ -9,7 +9,6 @@
     padding-left: 0px !important;
 }
 
-
 #account-profile { 
     .form-group:after {
         clear: both !important;

root/static/icons/rss_feed.png

@@ -64,3 +64,29 @@
         }
     }
 }
+
+#feed_subscription {
+    &.page-header {
+        margin: 0 0 5px;
+        font-weight: bold;
+        margin-left: 5px;
+    }
+
+    p {
+        font-size: 16px;
+        display: inline;
+    }
+
+    a {
+        display: inline;
+        width: 20px;
+        height: 20px;
+        padding-right: 20px;
+        float: right;
+    }
+
+    .fa {
+    	float: right;
+    	margin-right: -15px;
+    }    
+}