Unify format of hash, refactor some controller/helper methods

7 files changed, 55 insertions, 55 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index 2eb9032..30319f8 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -1,6 +1,6 @@
 class Account < ActiveRecord::Base
   def self.register_or_update(hash)
-    account = where(:user_id => hash[:user_id]).first_or_initialize
+    account = where(user_id: hash[:user_id]).first_or_initialize
     account.oauth_token = hash[:oauth_token]
     account.oauth_token_secret = hash[:oauth_token_secret]
     account.consumer_version = hash[:consumer_version]
@@ -14,15 +14,15 @@ class Account < ActiveRecord::Base
 
   def client
     Twitter::Client.new(
-      :consumer_key => Settings.consumer[consumer_version.to_i].key,
-      :consumer_secret => Settings.consumer[consumer_version.to_i].secret,
-      :oauth_token => oauth_token,
-      :oauth_token_secret => oauth_token_secret)
+      consumer_key: Settings.consumer[consumer_version.to_i].key,
+      consumer_secret: Settings.consumer[consumer_version.to_i].secret,
+      oauth_token: oauth_token,
+      oauth_token_secret: oauth_token_secret)
   end
 
   def twitter_user(uid = nil)
     uid ||= user_id
-    Rails.cache.fetch("twitter_user/#{uid}", :expires_in => 1.hour) do
+    Rails.cache.fetch("twitter_user/#{uid}", expires_in: 1.hour) do
       client.user(uid) rescue nil
     end
   end
@@ -39,7 +39,7 @@ class Account < ActiveRecord::Base
     end
 
     # rts 回収・RTのステータスIDを取得する必要がある
-    client.retweets(id, :count => 100).each do |status|
+    client.retweets(id, count: 100).each do |status|
       Retweet.from_tweet_object(status)
     end
   end
diff --git a/app/models/favorite.rb b/app/models/favorite.rb
index f1fc836..df894fc 100644
--- a/app/models/favorite.rb
+++ b/app/models/favorite.rb
@@ -17,8 +17,8 @@ class Favorite < ActiveRecord::Base
 
   def self.from_hash(hash)
     begin
-      f = create!(:tweet_id => hash[:tweet_id],
-                  :user_id => hash[:user_id])
+      f = create!(tweet_id: hash[:tweet_id],
+                  user_id: hash[:user_id])
       logger.debug("Created Favorite: #{hash[:user_id]} => #{hash[:tweet_id]}")
 
       return f
@@ -32,14 +32,14 @@ class Favorite < ActiveRecord::Base
   def self.from_tweet_object(tweet_object)
     if tweet_object.favoriters.is_a? Array
       tweet_object.favoriters.reverse.map do |uid|
-        from_hash(:user_id => uid, :tweet_id => tweet_object.id)
+        from_hash(user_id: uid, tweet_id: tweet_object.id)
       end
     end
   end
 
   def self.delete_from_hash(hash)
-    where(:tweet_id => hash[:tweet_id])
-      .where(:user_id => hash[:user_id])
+    where(tweet_id: hash[:tweet_id])
+      .where(user_id: hash[:user_id])
       .destroy_all
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9444304..ad99a02 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -1,7 +1,7 @@
 class Issue < ActiveRecord::Base
   def self.register(issue_type, status, data)
     begin
-      create!(:issue_type => issue_type, :status => status, :data => Yajl::Encoder::encode(data))
+      create!(issue_type: issue_type, status: status, data: Yajl::Encoder::encode(data))
     rescue
       logger.error($!)
       logger.error($@)
diff --git a/app/models/retweet.rb b/app/models/retweet.rb
index 032c242..5509c7f 100644
--- a/app/models/retweet.rb
+++ b/app/models/retweet.rb
@@ -17,9 +17,9 @@ class Retweet < ActiveRecord::Base
 
   def self.from_hash(hash)
     begin
-      r = create!(:id => hash[:id],
-                  :tweet_id => hash[:tweet_id],
-                  :user_id => hash[:user_id])
+      r = create!(id: hash[:id],
+                  tweet_id: hash[:tweet_id],
+                  user_id: hash[:user_id])
       logger.debug("Created Retweet: #{hash[:id]}: #{hash[:user_id]} => #{hash[:tweet_id]}")
 
       return r
@@ -32,8 +32,8 @@ class Retweet < ActiveRecord::Base
 
   def self.from_tweet_object(status)
     User.from_user_object(status.user)
-    from_hash(:id => status.id,
-              :user_id => status.user.id,
-              :tweet_id => status.retweeted_status.id)
+    from_hash(id: status.id,
+              user_id: status.user.id,
+              tweet_id: status.retweeted_status.id)
   end
 end
diff --git a/app/models/stolen_tweet.rb b/app/models/stolen_tweet.rb
index b3f7da1..aa2d01d 100644
--- a/app/models/stolen_tweet.rb
+++ b/app/models/stolen_tweet.rb
@@ -1,10 +1,10 @@
 class StolenTweet < ActiveRecord::Base
   belongs_to :tweet
-  belongs_to :original, :class_name => :Tweet
+  belongs_to :original, class_name: :Tweet
 
   def self.register(original_tweet, the_tweet)
     begin
-      create!(:tweet_id => the_tweet.id, :original_id => original_tweet.id)
+      create!(tweet_id: the_tweet.id, original_id: original_tweet.id)
     rescue ActiveRecord::RecordNotUnique
       logger.error("Duplicate Stolen Info")
     rescue
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 98b4f84..59a4575 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -1,13 +1,13 @@
 class Tweet < ActiveRecord::Base
   belongs_to :user
 
-  has_many :favorites, ->{order("favorites.id")}, :dependent => :delete_all
-  has_many :retweets, ->{order("retweets.id")}, :dependent => :delete_all
-  has_many :favoriters, ->{order("favorites.id")}, :through => :favorites, :source => :user
-  has_many :retweeters, ->{order("retweets.id")}, :through => :retweets, :source => :user
+  has_many :favorites, ->{order("favorites.id")}, dependent: :delete_all
+  has_many :retweets, ->{order("retweets.id")}, dependent: :delete_all
+  has_many :favoriters, ->{order("favorites.id")}, through: :favorites, source: :user
+  has_many :retweeters, ->{order("retweets.id")}, through: :retweets, source: :user
 
-  has_one :stolen_tweet, ->{includes(:original)}, :dependent => :delete
-  has_one :original, :through => :stolen_tweet, :source => :original
+  has_one :stolen_tweet, ->{includes(:original)}, dependent: :delete
+  has_one :original, through: :stolen_tweet, source: :original
 
   scope :recent, -> do
     where("tweets.tweeted_at > ?", Time.zone.now - 3.days)
@@ -34,11 +34,11 @@ class Tweet < ActiveRecord::Base
   end
 
   scope :favorited_by, -> user do
-    joins(:favorites).where(:favorites => {:user_id => user.id})
+    joins(:favorites).where(favorites: {user_id: user.id})
   end
 
   scope :retweeted_by, -> user do
-    joins(:retweets).where(:retweets => {:user_id => user.id})
+    joins(:retweets).where(retweets: {user_id: user.id})
   end
 
   scope :discovered_by, -> user do
@@ -50,16 +50,16 @@ class Tweet < ActiveRecord::Base
   end
 
   scope :original, -> do
-    joins("LEFT JOIN stolen_tweets ON tweets.id = stolen_tweets.tweet_id").where(:stolen_tweets => {:tweet_id => nil})
+    joins("LEFT JOIN stolen_tweets ON tweets.id = stolen_tweets.tweet_id").where(stolen_tweets: {tweet_id: nil})
   end
 
   scope :not_protected, -> do
-    includes(:user).where(:users => {:protected => false})
+    includes(:user).where(users: {protected: false})
   end
 
   def self.cached(id)
-    Rails.cache.fetch("tweet/#{id}", :expires_in => 3.hour) do
-      where(:id => id).first
+    Rails.cache.fetch("tweet/#{id}", expires_in: 3.hour) do
+      where(id: id).first
     end
   end
 
@@ -76,12 +76,12 @@ class Tweet < ActiveRecord::Base
   def self.delete_from_id(id)
     begin
       # counter_cache の無駄を省くために delete_all で
-      deleted_tweets = Tweet.delete_all(:id => id)
+      deleted_tweets = Tweet.delete_all(id: id)
       if deleted_tweets.to_i > 0
-        Favorite.delete_all(:tweet_id => id)
-        Retweet.delete_all(:tweet_id => id)
+        Favorite.delete_all(tweet_id: id)
+        Retweet.delete_all(tweet_id: id)
       else
-        Retweet.where(:id => id).destroy_all # counter_cache
+        Retweet.where(id: id).destroy_all # counter_cache
       end
     rescue
       logger.error("Unknown error while deleting tweet: #{$!}/#{$@}")
@@ -90,11 +90,11 @@ class Tweet < ActiveRecord::Base
 
   def self.from_hash(hash)
     begin
-      t = create!(:id => hash[:id],
-                  :text => hash[:text],
-                  :source => hash[:source],
-                  :tweeted_at => hash[:tweeted_at],
-                  :user_id => hash[:user_id])
+      t = create!(id: hash[:id],
+                  text: hash[:text],
+                  source: hash[:source],
+                  tweeted_at: hash[:tweeted_at],
+                  user_id: hash[:user_id])
       return t
     rescue ActiveRecord::RecordNotUnique
       logger.debug("Duplicate Tweet: #{hash[:id]}")
diff --git a/app/models/user.rb b/app/models/user.rb
index 57ed545..9cf6886 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,17 +1,17 @@
 class User < ActiveRecord::Base
-  has_many :tweets, :dependent => :delete_all
-  has_many :favorites, :dependent => :delete_all
-  has_many :retweets, :dependent => :delete_all
+  has_many :tweets, dependent: :delete_all
+  has_many :favorites, dependent: :delete_all
+  has_many :retweets, dependent: :delete_all
 
   def self.cached(identity)
     if identity.is_a?(Fixnum) || identity.is_a?(Bignum)
-      Rails.cache.fetch("user/#{identity}", :expires_in => 3.hour) do
-        where(:id => identity).first
+      Rails.cache.fetch("user/#{identity}", expires_in: 3.hour) do
+        where(id: identity).first
       end
     elsif identity.is_a?(String)
       if /^[A-Za-z0-9_]{1,15}$/ =~ identity
-        uid = Rails.cache.fetch("screen_name/#{identity}", :expires_in => 3.hour) do
-          if user = where(:screen_name => identity).first
+        uid = Rails.cache.fetch("screen_name/#{identity}", expires_in: 3.hour) do
+          if user = where(screen_name: identity).first
             user.id
           end
         end
@@ -50,11 +50,11 @@ class User < ActiveRecord::Base
   end
 
   def self.from_user_object(user_object)
-    from_hash(:id => user_object.id,
-              :screen_name => user_object.screen_name,
-              :name => user_object.name,
-              :profile_image_url => user_object.profile_image_url_https,
-              :protected => user_object.protected)
+    from_hash(id: user_object.id,
+              screen_name: user_object.screen_name,
+              name: user_object.name,
+              profile_image_url: user_object.profile_image_url_https,
+              protected: user_object.protected)
   end
 
   def self.delete_cache(uid)
@@ -71,7 +71,7 @@ class User < ActiveRecord::Base
   end
 
   def account
-    Account.where(:user_id => id).first
+    Account.where(user_id: id).first
   end
 
   def profile_image_url_original