Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/controllers/stories_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ class Stringer < Sinatra::Base
erb :index
end

get "/feed/:feed_id" do
@feed = FeedRepository.fetch(params[:feed_id])

@stories = StoryRepository.feed(params[:feed_id])
@unread_stories = @stories.find_all {|story| !story.is_read }

erb :feed
end

get "/archive" do
@read_stories = StoryRepository.read(params[:page])

Expand Down
8 changes: 8 additions & 0 deletions app/models/feed.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ def status_bubble
status
end

def unread_stories
stories.where('is_read = ?', false)
end

def has_unread_stories
unread_stories.any?
end

def as_fever_json
{
id: self.id,
Expand Down
10 changes: 10 additions & 0 deletions app/public/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,10 @@ li.feed .feed-title a {
text-decoration: none;
}

li.feed .feed-unread {
font-weight: bold;
}

li.feed .feed-title a:hover {
color: #7F8281;
}
Expand Down Expand Up @@ -564,3 +568,9 @@ li.blank {
text-decoration: none;
margin: 0 7px;
}

#feed-title {
margin-bottom: 10px;
font-size: 28px;
text-align: center;
}
6 changes: 5 additions & 1 deletion app/public/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ var StoryView = Backbone.View.extend({
},

render: function() {
this.$el.html(this.template(this.model.toJSON()));
var jsonModel = this.model.toJSON();
this.$el.html(this.template(jsonModel));
if (jsonModel.is_read) {
this.$el.addClass('read');
}
return this;
},

Expand Down
4 changes: 4 additions & 0 deletions app/repositories/feed_repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,9 @@ def self.set_status(status, feed)
def self.list
Feed.order('lower(name)')
end

def self.fetch(id)
Feed.find(id)
end
end

4 changes: 4 additions & 0 deletions app/repositories/story_repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ def self.unread_since_id(since_id)
unread.where('id > ?', since_id)
end

def self.feed(feed_id)
Story.where('feed_id = ?', feed_id).order("published desc").includes(:feed)
end

def self.read(page = 1)
Story.where(is_read: true).includes(:feed)
.order("published desc").page(page).per_page(20)
Expand Down
20 changes: 20 additions & 0 deletions app/views/feed.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<% content_for :title do %>
<% unless @unread_stories.empty? %>
<%= "(#{@unread_stories.count})" %>
<% end %>
<% end %>

<div id="action-bar">
<%= render_partial :action_bar, { stories: @unread_stories } %>
</div>

<div id="feed-title">
<%= @feed.name %>
</div>

<%= render_js :stories, { stories: @stories } %>

<div id="stories">
<ul id="story-list">
</ul>
</div>
12 changes: 10 additions & 2 deletions app/views/partials/_feed.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<li class="feed" id="feed-<%= feed.id%>" data-id="<%= feed.id %>">
<div class="row-fluid feed-line">
<div class="span7 feed-title-container">
<p class="feed-title">
<p class="feed-title <%= feed.has_unread_stories ? "feed-unread" : "" %>">
<i class="icon-circle status <%= feed.status_bubble %>" data-toggle="tooltip" title="<%= t("partials.feed.status_bubble.#{feed.status_bubble}") if feed.status_bubble %>" data-placement="left"></i>
<a href="<%= feed.url %>"><%= feed.name %></a>
<a href="/feed/<%= feed.id %>">
<% if feed.has_unread_stories %>
(<%= feed.unread_stories.count %>)
<% end %>
<%= feed.name %>
</a>
</p>
</div>
<div class="span4 feed-last-updated">
Expand All @@ -17,6 +22,9 @@
</span>
</div>
<div class="span1">
<span class="read-feed">
<a class="icon-external-link" href="<%= feed.url %>"></a>
<span/>
<span class="remove-feed">
<a class="icon-remove"></a>
<span/>
Expand Down
31 changes: 31 additions & 0 deletions spec/controllers/stories_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,35 @@
URI::parse(last_response.location).path.should eq "/news"
end
end

describe "GET /feed/:feed_id" do
it "looks for a particular feed" do
FeedRepository.should_receive(:fetch).with(story_one.feed.id.to_s).and_return(story_one.feed)
StoryRepository.should_receive(:feed).with(story_one.feed.id.to_s).and_return([story_one])

get "/feed/#{story_one.feed.id}"
end

it "displays a list of stories" do
FeedRepository.stub(:fetch).and_return(story_one.feed)
StoryRepository.stub(:feed).and_return(stories)

get "/feed/#{story_one.feed.id}"

last_response.body.should have_tag("#stories")
end

it "differentiates between read and unread" do
FeedRepository.stub(:fetch).and_return(story_one.feed)
StoryRepository.stub(:feed).and_return(stories)

story_one.is_read = false
story_two.is_read = true

get "/feed/#{story_one.feed.id}"

last_response.body.should have_tag('li', :class => 'story')
last_response.body.should have_tag('li', :class => 'unread')
end
end
end
1 change: 1 addition & 0 deletions spec/factories/feed_factory.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class FakeFeed < OpenStruct; end;

def self.build(params = {})
FakeFeed.new(
id: rand(100),
name: params[:name] || Faker::Name.name + " on Software",
url: params[:url] || Faker::Internet.url,
last_fetched: params[:last_fetched] || Time.now,
Expand Down
17 changes: 17 additions & 0 deletions spec/repositories/feed_repository_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,21 @@
feed.last_fetched.should eq timestamp
end
end

describe "fetch" do
let(:feed) { Feed.new(id: 1) }

it "finds by id" do
Feed.should_receive(:find).with(feed.id).and_return(feed)
FeedRepository.fetch(feed.id)
end

it "returns found feed" do
Feed.stub(:find).with(feed.id).and_return(feed)

result = FeedRepository.fetch(feed.id)

result.should eq feed
end
end
end