Fix most auto-correctable rubocop issues

[rails.git] / app / models / diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c0fbac546a9f47756c6239ee06fd9ee3cb1bb883..a66eb599dcacd2e8fdc6cafcf4db67f6a88928ab 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -3,17 +3,17 @@ class DiaryEntry < ActiveRecord::Base
   belongs_to :language, :foreign_key => 'language_code'
 
   has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
   belongs_to :language, :foreign_key => 'language_code'
 
   has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"

-  has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => ["active", "confirmed"] }).order(:id) }, :class_name => "DiaryComment"
+  has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w(active confirmed) }).order(:id) }, :class_name => "DiaryComment"

 
   scope :visible, -> { where(:visible => true) }
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
 
   scope :visible, -> { where(:visible => true) }
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255

-  #validates_length_of :language, :within => 2..5, :allow_nil => false
+  # validates_length_of :language, :within => 2..5, :allow_nil => false

   validates_numericality_of :latitude, :allow_nil => true,
   validates_numericality_of :latitude, :allow_nil => true,

-                            :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
+                                       :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90

   validates_numericality_of :longitude, :allow_nil => true,
   validates_numericality_of :longitude, :allow_nil => true,

-                            :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
+                                        :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180

   validates_associated :language
 
   after_save :spam_check
   validates_associated :language
 
   after_save :spam_check


@@ -22,7 +22,7 @@ class DiaryEntry < ActiveRecord::Base
     RichText.new(read_attribute(:body_format), read_attribute(:body))
   end
 
     RichText.new(read_attribute(:body_format), read_attribute(:body))
   end
 

-private
+  private

 
   def spam_check
     user.spam_check
 
   def spam_check
     user.spam_check