dont allow duplicate feeds, closes stringer-rss#17

Matt Swanson · Matt Swanson · commit 57b1ee329a8a · 2013-05-08T18:42:21.000-04:00
diff --git a/app/commands/feeds/import_from_opml.rb b/app/commands/feeds/import_from_opml.rb
@@ -4,11 +4,9 @@
 class ImportFromOpml
   ONE_DAY = 24 * 60 * 60
 
-  def self.import(opml_contents, should_overwrite = false)
+  def self.import(opml_contents)
     feeds = OpmlParser.new.parse_feeds(opml_contents)
 
-    Feed.delete_all if should_overwrite
-
     feeds.each do |feed|
       Feed.create(name: feed[:name],
                   url: feed[:url],
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb
@@ -20,13 +20,17 @@ class Stringer < Sinatra::Base
   end
 
   post "/feeds" do
-    feed = AddNewFeed.add(params[:feed_url])
+    @feed_url = params[:feed_url]
+    feed = AddNewFeed.add(@feed_url)
 
-    if feed
+    if feed and feed.valid?
       FetchFeeds.enqueue([feed])
 
       flash[:success] = "We've added your new feed. Check back in a bit."
       redirect to("/")
+    elsif feed
+      flash.now[:error] = "You are already subscribed to this feed..."
+      erb :'feeds/add'
     else
       flash.now[:error] = "We couldn't find that feed. Try again."
       erb :'feeds/add'
@@ -38,7 +42,7 @@ class Stringer < Sinatra::Base
   end
 
   post "/feeds/import" do
-    ImportFromOpml.import(params["opml_file"][:tempfile].read, true)
+    ImportFromOpml.import(params["opml_file"][:tempfile].read)
 
     redirect to("/setup/tutorial")
   end
diff --git a/app/models/feed.rb b/app/models/feed.rb
@@ -1,6 +1,8 @@
 class Feed < ActiveRecord::Base
   has_many :stories, order: "published desc", dependent: :delete_all
 
+  validates_uniqueness_of :url
+
   STATUS = { green: 0, yellow: 1, red: 2 }
 
   def status
diff --git a/app/views/feeds/add.erb b/app/views/feeds/add.erb
@@ -9,7 +9,7 @@
   <hr />
   <form id="add-feed-setup" method="POST" action="/feeds">
     <div class="control-group">
-      <input name="feed_url" id="feed-url" type="text" autofocus="autofocus" />
+      <input name="feed_url" id="feed-url" type="text" autofocus="autofocus" value="<%= @feed_url %>"/>
       <i class="icon-rss field-icon"></i>
       <label id="feed_url-label" class="field-label" for="feed_url"><%= t('feeds.add.fields.feed_url') %></label>
     </div>
diff --git a/spec/controllers/feeds_controller_spec.rb b/spec/controllers/feeds_controller_spec.rb
@@ -35,13 +35,23 @@
   end
 
   describe "GET /feeds/new" do
+    it "displays a form and submit button" do
+      get "/feeds/new"
+
+      page = last_response.body
+      page.should have_tag("form#add-feed-setup")
+      page.should have_tag("input#submit")
+    end
+  end
+
+  describe "POST /feeds" do
     context "when the feed url is valid" do
       let(:feed_url) { "http://example.com/" }
-      let(:feed) { stub }
+      let(:valid_feed) { stub(valid?: true) }
 
       it "adds the feed and queues it to be fetched" do
-        AddNewFeed.should_receive(:add).with(feed_url).and_return(feed)
-        FetchFeeds.should_receive(:enqueue).with([feed])
+        AddNewFeed.should_receive(:add).with(feed_url).and_return(valid_feed)
+        FetchFeeds.should_receive(:enqueue).with([valid_feed])
 
         post "/feeds", feed_url: feed_url
 
@@ -51,10 +61,24 @@
     end
 
     context "when the feed url is invalid" do
-      let(:feed_url) { "http://not-a-feed.com/" }
+      let(:feed_url) { "http://not-a-valid-feed.com/" }
+
+      it "adds the feed and queues it to be fetched" do
+        AddNewFeed.should_receive(:add).with(feed_url).and_return(false)
+
+        post "/feeds", feed_url: feed_url
+
+        page = last_response.body
+        page.should have_tag(".error")
+      end
+    end
+
+    context "when the feed url is one we already subscribe to" do
+      let(:feed_url) { "http://example.com/" }
+      let(:invalid_feed) { stub(valid?: false) }
 
       it "adds the feed and queues it to be fetched" do
-        AddNewFeed.should_receive(:add).with(feed_url).and_return(nil)
+        AddNewFeed.should_receive(:add).with(feed_url).and_return(invalid_feed)
 
         post "/feeds", feed_url: feed_url
 
@@ -74,7 +98,7 @@
     end
   end
 
-  describe "POST /import" do
+  describe "POST /feeds/import" do
     let(:opml_file) { Rack::Test::UploadedFile.new("spec/sample_data/subscriptions.xml", "application/xml") }
 
     it "parse OPML and starts fetching" do
