From 95b8f0e145be56c0f3c4c2dabf6dda799344ca4b Mon Sep 17 00:00:00 2001 From: Adrian Short Date: Thu, 5 Jul 2012 11:32:08 +0100 Subject: [PATCH] Revert "Better error handling when feeds don't parse" This reverts commit e2eb60a6a7149777548d2143cd870e8c1051f34a. --- app/controllers/feeds_controller.rb | 6 +----- app/models/feed.rb | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index 2c086b7..706d65d 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -41,11 +41,7 @@ class FeedsController < ApplicationController # POST /feeds # POST /feeds.json def create - begin - @feed = Feed.new(params[:feed]) - rescue - redirect_to '/', error: "Feed didn't parse. Please check it with the validator." - end + @feed = Feed.new(params[:feed]) respond_to do |format| if @feed.save diff --git a/app/models/feed.rb b/app/models/feed.rb index 027df1d..1ae394f 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -15,7 +15,7 @@ class Feed validates :title, :presence => true validates_format_of :feed_url, :with => URI::regexp(%w(http https)), :message => "must be a valid URL" - before_create :get + after_create :get # Fetch and parse feed contents from web @@ -31,11 +31,6 @@ class Feed Feedzirra::Feed.add_common_feed_element('generator', :as => :generator) feed = Feedzirra::Feed.fetch_and_parse(@feed_url) - - # We fetched the feed OK but couldn't parse it. HTTP 200 OK - if feed.is_a? Fixnum - raise - end self.set( :title => feed.title,