route /newest/:user to show all stories by that user

This commit is contained in:
joshua stein 2012-09-03 17:21:41 -05:00
parent e9e162167d
commit 6ae36ea492
4 changed files with 45 additions and 16 deletions

View file

@ -2,7 +2,8 @@ class HomeController < ApplicationController
STORIES_PER_PAGE = 25 STORIES_PER_PAGE = 25
def index def index
@stories = find_stories_for_user_and_tag_and_newest(@user, nil, false) @stories = find_stories_for_user_and_tag_and_newest_and_by_user(@user,
nil, false, nil)
@rss_link ||= "<link rel=\"alternate\" type=\"application/rss+xml\" " << @rss_link ||= "<link rel=\"alternate\" type=\"application/rss+xml\" " <<
"title=\"RSS 2.0\" href=\"/rss\" />" "title=\"RSS 2.0\" href=\"/rss\" />"
@ -17,7 +18,8 @@ class HomeController < ApplicationController
end end
def newest def newest
@stories = find_stories_for_user_and_tag_and_newest(@user, nil, true) @stories = find_stories_for_user_and_tag_and_newest_and_by_user(@user,
nil, true, nil)
@title = "Newest Stories" @title = "Newest Stories"
@cur_url = "/newest" @cur_url = "/newest"
@ -33,9 +35,25 @@ class HomeController < ApplicationController
end end
end end
def newest_by_user
for_user = User.find_by_username!(params[:user])
@stories = find_stories_for_user_and_tag_and_newest_and_by_user(@user,
nil, false, for_user.id)
@title = "Newest Stories by #{for_user.username}"
@cur_url = "/newest/#{for_user.username}"
@newest = true
@for_user = for_user.username
render :action => "index"
end
def tagged def tagged
@tag = Tag.find_by_tag!(params[:tag]) @tag = Tag.find_by_tag!(params[:tag])
@stories = find_stories_for_user_and_tag_and_newest(@user, @tag, false) @stories = find_stories_for_user_and_tag_and_newest_and_by_user(@user,
@tag, false, nil)
@title = @tag.description.blank?? @tag.tag : @tag.description @title = @tag.description.blank?? @tag.tag : @tag.description
@cur_url = tag_url(@tag.tag) @cur_url = tag_url(@tag.tag)
@ -52,7 +70,8 @@ class HomeController < ApplicationController
end end
private private
def find_stories_for_user_and_tag_and_newest(user, tag = nil, newest = false) def find_stories_for_user_and_tag_and_newest_and_by_user(user, tag = nil,
newest = false, by_user = nil)
@page = 1 @page = 1
if params[:page].to_i > 0 if params[:page].to_i > 0
@page = params[:page].to_i @page = params[:page].to_i
@ -60,23 +79,26 @@ private
# guest views have caching, but don't bother for logged-in users # guest views have caching, but don't bother for logged-in users
if user if user
stories, @show_more = _find_stories_for_user_and_tag_and_newest(user, stories, @show_more =
tag, newest) _find_stories_for_user_and_tag_and_newest_and_by_user(user, tag,
newest, by_user)
else else
stories, @show_more = Rails.cache.fetch("stories tag:" << stories, @show_more = Rails.cache.fetch("stories tag:" <<
"#{tag ? tag.tag : ""} new:#{newest} page:#{@page.to_i}", "#{tag ? tag.tag : ""} new:#{newest} page:#{@page.to_i} by:#{by_user}",
:expires_in => 45) do :expires_in => 45) do
_find_stories_for_user_and_tag_and_newest(user, tag, newest) _find_stories_for_user_and_tag_and_newest_and_by_user(user, tag,
newest, by_user)
end end
end end
stories stories
end end
def _find_stories_for_user_and_tag_and_newest(user, tag = nil, newest = false) def _find_stories_for_user_and_tag_and_newest_and_by_user(user, tag = nil,
newest = false, by_user = nil)
conds = [ "is_expired = 0 " ] conds = [ "is_expired = 0 " ]
if user && !newest if user && !(newest || by_user)
# exclude downvoted items # exclude downvoted items
conds[0] << "AND stories.id NOT IN (SELECT story_id FROM votes " << conds[0] << "AND stories.id NOT IN (SELECT story_id FROM votes " <<
"WHERE user_id = ? AND vote < 0 AND comment_id IS NULL) " "WHERE user_id = ? AND vote < 0 AND comment_id IS NULL) "
@ -87,6 +109,9 @@ private
conds[0] << "AND stories.id IN (SELECT taggings.story_id FROM " << conds[0] << "AND stories.id IN (SELECT taggings.story_id FROM " <<
"taggings WHERE taggings.tag_id = ?)" "taggings WHERE taggings.tag_id = ?)"
conds.push tag.id conds.push tag.id
elsif by_user
conds[0] << "AND stories.user_id = ?"
conds.push by_user
elsif user elsif user
conds[0] += " AND taggings.tag_id NOT IN (SELECT tag_id FROM " << conds[0] += " AND taggings.tag_id NOT IN (SELECT tag_id FROM " <<
"tag_filters WHERE user_id = ?)" "tag_filters WHERE user_id = ?)"

View file

@ -5,16 +5,17 @@
<div class="morelink"> <div class="morelink">
<% if @page && @page > 1 %> <% if @page && @page > 1 %>
<a href="<%= @tag ? "/t/#{@tag.tag}" : (@newest ? "/newest" : "/") <a href="<%= @tag ? "/t/#{@tag.tag}" : (@newest ? "/newest" +
%><%= @page == 2 ? "" : "page/#{@page - 1}" %>">&lt;&lt; Page (@for_user ? "/#{@for_user}" : "") : "/") %><%= @page == 2 ? "" :
<%= @page - 1 %></a> "page/#{@page - 1}" %>">&lt;&lt; Page <%= @page - 1 %></a>
<% end %> <% end %>
<% if @show_more %> <% if @show_more %>
<% if @page && @page > 1 %> <% if @page && @page > 1 %>
| |
<% end %> <% end %>
<a href="<%= @tag ? "/t/#{@tag.tag}" : (@newest ? "/newest" : "") <a href="<%= @tag ? "/t/#{@tag.tag}" : (@newest ? "/newest" +
%>/page/<%= @page + 1 %>">Page <%= @page + 1 %> &gt;&gt;</a> (@for_user ? "/#{@for_user}" : "") : "") %>/page/<%= @page + 1 %>">Page
<%= @page + 1 %> &gt;&gt;</a>
<% end %> <% end %>
</div> </div>

View file

@ -27,7 +27,8 @@
<label class="required">Stories Submitted:</label> <label class="required">Stories Submitted:</label>
<span class="d"> <span class="d">
<%= @showing_user.stories_submitted_count %> <a href="/newest/<%= @showing_user.username %>"><%=
@showing_user.stories_submitted_count %></a>
</span> </span>
<br> <br>

View file

@ -6,6 +6,8 @@ Lobsters::Application.routes.draw do
get "/newest(.format)" => "home#newest" get "/newest(.format)" => "home#newest"
get "/newest/page/:page" => "home#newest" get "/newest/page/:page" => "home#newest"
get "/newest/:user" => "home#newest_by_user"
get "/newest/:user/page/:page" => "home#newest_by_user"
get "/threads" => "comments#threads" get "/threads" => "comments#threads"
get "/threads/:user" => "comments#threads" get "/threads/:user" => "comments#threads"