switch to using feedzirra to handle new_entries logic. tweak overflow styles. fix missing feed titles in import

Matt Swanson · Matt Swanson · commit 757193ad53a4 · 2013-04-17T22:27:31.000-04:00
diff --git a/README.md b/README.md
@@ -2,4 +2,4 @@ A work-in-progress, self-hosted, anti-social RSS reader.
 
 It looks something like this at the moment:
 
-![](http://i.imgur.com/CmiINVG.png)
+![](https://raw.github.com/swanson/stringer/screenshots/feed.png)
diff --git a/app/commands/feeds/import_from_opml.rb b/app/commands/feeds/import_from_opml.rb
@@ -2,17 +2,17 @@
 require_relative "../../utils/opml_parser"
 
 class ImportFromOpml
-  ONE_HOUR = 60 * 60
+  ONE_DAY = 24 * 60 * 60
 
   def self.import(opml_contents, should_overwrite = false)
     feeds = OpmlParser.new.parse_feeds(opml_contents)
 
     Feed.delete_all if should_overwrite
 
     feeds.each do |feed|
-      Feed.create(name: feed[:title],
+      Feed.create(name: feed[:name],
                   url: feed[:url],
-                  last_fetched: Time.now - ONE_HOUR)
+                  last_fetched: Time.now - ONE_DAY)
     end
   end
 end
diff --git a/app/models/feed.rb b/app/models/feed.rb
@@ -1,3 +1,3 @@
 class Feed < ActiveRecord::Base
-  has_many :stories
+  has_many :stories, order: "published desc"
 end
diff --git a/app/models/story.rb b/app/models/story.rb
@@ -8,7 +8,7 @@ def headline
   end
 
   def lead
-    Loofah.fragment(self.body).text[0,25]
+    Loofah.fragment(self.body).text[0,100]
   end
 
   def source
diff --git a/app/public/css/styles.css b/app/public/css/styles.css
@@ -105,6 +105,8 @@ li.story.open .story-preview {
   height: 30px;
   line-height: 30px;
   cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .story-preview div {
diff --git a/app/tasks/fetch_feed.rb b/app/tasks/fetch_feed.rb
@@ -11,23 +11,36 @@ def initialize(feed, feed_parser = Feedzirra::Feed)
 
   def fetch
     begin
-      result = @parser.fetch_and_parse(@feed.url)
+      updated_feed = rebuild_feed
 
-      unless result.last_modified < @feed.last_fetched
-        result.entries.each do |entry|
-          StoryRepository.add(entry, @feed) if is_new?(entry)
-        end
-
-        FeedRepository.update_last_fetched(@feed, result.last_modified)
+      updated_feed.new_entries.each do |entry|
+        StoryRepository.add(entry, @feed) if is_new?(entry)
       end
-    rescue
+
+      FeedRepository.update_last_fetched(@feed, updated_feed.last_modified)
+    rescue Exception => ex
       puts "Something went wrong when parsing #{@feed.url}"
     end
 
-    result
+    updated_feed
   end
 
   private
+  def rebuild_feed
+    new_feed = Feedzirra::Parser::RSS.new
+    new_feed.feed_url = @feed.url
+    new_feed.last_modified = @feed.last_fetched
+
+    unless @feed.stories.empty?
+      last_entry = Feedzirra::Parser::RSSEntry.new
+      last_entry.url = @feed.stories.first.permalink
+
+      new_feed.entries << last_entry
+    end
+
+    @parser.update(new_feed)
+  end
+
   def is_new?(entry)
     entry.published > @feed.last_fetched
   end
diff --git a/screenshots/feed.png b/screenshots/feed.png
diff --git a/spec/factories/feed_factory.rb b/spec/factories/feed_factory.rb
@@ -5,6 +5,7 @@ def self.build(params = {})
     FakeFeed.new(
       name: params[:name] || Faker::Name.name + " on Software",
       url: params[:url] || Faker::Internet.url,
-      last_fetched: params[:last_fetched] || Time.now)
+      last_fetched: params[:last_fetched] || Time.now,
+      stories: params[:stories] || [])
   end
 end
diff --git a/spec/tasks/fetch_feed_spec.rb b/spec/tasks/fetch_feed_spec.rb
@@ -18,7 +18,7 @@
     context "when no new posts have been added" do
       it "should not add any new posts" do
         fake_feed = stub(last_modified: Time.new(2012, 12, 31))
-        parser = stub(fetch_and_parse: fake_feed)
+        parser = stub(update: fake_feed)
 
         StoryRepository.should_not_receive(:add)
 
@@ -31,8 +31,8 @@
       let(:new_story){ stub(published: now + 1) }
       let(:old_story) { stub(published: Time.new(2009, 4, 20)) }
 
-      let(:fake_feed) { stub(last_modified: now, entries: [new_story, old_story]) }
-      let(:fake_parser) { stub(fetch_and_parse: fake_feed) }
+      let(:fake_feed) { stub(last_modified: now, entries: [new_story, old_story], new_entries: [new_story]) }
+      let(:fake_parser) { stub(update: fake_feed) }
 
       it "should only add posts that are new" do
         StoryRepository.should_receive(:add).with(new_story, daring_fireball)

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ A work-in-progress, self-hosted, anti-social RSS reader.`
`2`	`2`
`3`	`3`	`It looks something like this at the moment:`
`4`	`4`
`5`		`-![](http://i.imgur.com/CmiINVG.png)`
	`5`	`+![](https://raw.github.com/swanson/stringer/screenshots/feed.png)`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,8 @@ li.story.open .story-preview {`
`105`	`105`	`height: 30px;`
`106`	`106`	`line-height: 30px;`
`107`	`107`	`cursor: pointer;`
	`108`	`+ overflow: hidden;`
	`109`	`+ text-overflow: ellipsis;`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`.story-preview div {`