From 1bbd6763716dfbfbe0f11bc7e0e95e5f0b1a483a Mon Sep 17 00:00:00 2001
From: Rhenium <rhenium@rhe.jp>
Date: Thu, 30 Jan 2014 20:24:14 +0900
Subject: catch error when exception raised in Favorite/Retweet.from_json

---
 app/models/favorite.rb | 11 +++++------
 app/models/retweet.rb  | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'app')

diff --git a/app/models/favorite.rb b/app/models/favorite.rb
index 6e3d197..892efff 100644
--- a/app/models/favorite.rb
+++ b/app/models/favorite.rb
@@ -14,12 +14,11 @@ class Favorite < ActiveRecord::Base
     tweet = Tweet.from_json(json[:target_object])
     user = User.from_json(json[:source])
     favorite = Favorite.new(tweet: tweet, user: user)
-    if favorite.save
-      logger.debug("Successfully created a favorite: #{favorite.id}")
-    else
-      logger.debug("Failed to create a favorite: #{favorite}")
-    end
-
+    favorite.save!
+    logger.debug("Successfully created a favorite: #{favorite.id}")
+  rescue
+    logger.debug("Failed to create a favorite: #{favorite}")
+  ensure
     favorite
   end
 end
diff --git a/app/models/retweet.rb b/app/models/retweet.rb
index 4b6f65e..7b83dba 100644
--- a/app/models/retweet.rb
+++ b/app/models/retweet.rb
@@ -14,12 +14,11 @@ class Retweet < ActiveRecord::Base
     tweet = Tweet.from_json(json[:retweeted_status])
     user = User.from_json(json[:user])
     retweet = Retweet.new(id: json[:id], tweet: tweet, user: user)
-    if retweet.save
-      logger.debug("Successfully created a retweet: #{retweet.id}")
-    else
-      logger.debug("Failed to create a retweet: #{retweet}")
-    end
-
+    retweet.save!
+    logger.debug("Successfully created a retweet: #{retweet.id}")
+  rescue
+    logger.debug("Failed to create a retweet: #{retweet}")
+  ensure
     retweet
   end
 end
-- 
cgit v1.2.3