Skip to content

Commit 076744e

Browse files
author
Matt Swanson
committed
implement feed adding and discovery.
1 parent 2aaf7ca commit 076744e

7 files changed

Lines changed: 101 additions & 5 deletions

File tree

‎app.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ class Stringer < Sinatra::Base
1616
enable :sessions
1717
set :session_secret, ENV["SECRET_TOKEN"] || "secret!"
1818

19+
enable :logging
20+
1921
register Sinatra::ActiveRecordExtension
2022
register Sinatra::Flash
2123
register Sinatra::Contrib

‎app/commands/feeds/add_new_feed.rb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
require "feedbag"
2+
require "feedzirra"
3+
4+
5+
class AddNewFeed
6+
ONE_DAY = 24 * 60 * 60
7+
8+
def self.add(url, finder = Feedbag, parser = Feedzirra::Feed, repo = Feed)
9+
results = finder.find(url)
10+
11+
return false if results.empty?
12+
13+
result = parser.fetch_and_parse(results.first)
14+
15+
repo.create(name: result.title,
16+
url: result.feed_url,
17+
last_fetched: Time.now - ONE_DAY)
18+
end
19+
end

‎app/controllers/feeds_controller.rb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require_relative "../repositories/feed_repository"
2+
require_relative "../commands/feeds/add_new_feed"
23

34
class Stringer < Sinatra::Base
45
get "/feeds" do
@@ -12,4 +13,22 @@ class Stringer < Sinatra::Base
1213

1314
status 200
1415
end
16+
17+
get "/add_feed" do
18+
erb :'feeds/add'
19+
end
20+
21+
post "/add_feed" do
22+
feed = AddNewFeed.add(params[:feed_url])
23+
24+
if feed
25+
FetchFeeds.enqueue([feed])
26+
27+
flash[:success] = "We've added your new feed. Check back in a bit."
28+
redirect to("/")
29+
else
30+
flash.now[:error] = "We couldn't find that feed. Try again."
31+
erb :'feeds/add'
32+
end
33+
end
1534
end

‎app/public/css/styles.css‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ hr {
4343
-webkit-border-radius: 0px;
4444
-moz-border-radius: 0px;
4545
border-radius: 0px;
46+
margin-bottom: 0px;
4647
}
4748

4849
#action-bar .btn {
@@ -332,6 +333,10 @@ li.feed .remove-feed a:hover {
332333
color: #F67100;
333334
}
334335

336+
#add-feed {
337+
padding-top: 10px;
338+
}
339+
335340
.setup {
336341
width: 350px;
337342
margin: 0 auto;
@@ -389,7 +394,7 @@ li.feed .remove-feed a:hover {
389394
transition: 0.25s;
390395
}
391396

392-
.setup #password, .setup #password-confirmation {
397+
.setup #password, .setup #password-confirmation, .setup #feed-url {
393398
padding-left: 100px;
394399
padding-right: 36px;
395400
}

‎app/tasks/fetch_feed.rb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
require_relative "../commands/feeds/find_new_stories"
66

77
class FetchFeed
8-
def initialize(feed, feed_parser = Feedzirra::Feed)
8+
def initialize(feed, feed_parser = Feedzirra::Feed, logger = nil)
99
@feed = feed
1010
@parser = feed_parser
11+
@logger = logger
1112
end
1213

1314
def fetch
@@ -23,9 +24,7 @@ def fetch
2324
rescue Exception => ex
2425
FeedRepository.set_status(:red, @feed)
2526

26-
puts "Something went wrong when parsing #{@feed.url}"
27-
puts ex
28-
puts
27+
@logger.error "Something went wrong when parsing #{@feed.url}: #{ex}" if @logger
2928
end
3029
end
3130

‎app/views/feeds/add.erb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<div id="action-bar">
2+
<%= render_partial :feed_action_bar %>
3+
</div>
4+
5+
<div class="setup" id="add-feed">
6+
<h1>Need new stories?</h1>
7+
<hr />
8+
<p>Paste in the URL of the blog you want to read.</p>
9+
<hr />
10+
<form id="add-feed-setup" method="POST" action="/add_feed">
11+
<div class="control-group">
12+
<input name="feed_url" id="feed-url" type="text" autofocus="autofocus" />
13+
<i class="icon-rss field-icon"></i>
14+
<label id="feed_url-label" class="field-label" for="feed_url">Feed URL</label>
15+
</div>
16+
17+
<input type="submit" id="submit" class="btn btn-primary pull-right" value="Add"/>
18+
</form>
19+
</div>
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
require "spec_helper"
2+
3+
app_require "/commands/feeds/add_new_feed"
4+
5+
describe AddNewFeed do
6+
describe "#add" do
7+
context "feed cannot be discovered" do
8+
let(:finder) { stub(find: []) }
9+
it "returns false if cant discover any feeds" do
10+
result = AddNewFeed.add("http://not-a-feed.com", finder)
11+
12+
result.should be_false
13+
end
14+
end
15+
16+
context "feed can be discovered" do
17+
let(:feed_url) { "http://feed.com/atom.xml" }
18+
let(:feed_result) { stub(title: feed.name, feed_url: feed.url) }
19+
let(:feed) { FeedFactory.build }
20+
let(:finder) { stub(find: [feed_url]) }
21+
let(:repo) { stub }
22+
let(:parser) { stub(fetch_and_parse: feed_result) }
23+
24+
it "parses and creates the feed if discovered" do
25+
repo.should_receive(:create).and_return(feed)
26+
27+
result = AddNewFeed.add("http://feed.com", finder, parser, repo)
28+
29+
result.should be feed
30+
end
31+
end
32+
end
33+
end

0 commit comments

Comments
 (0)