Fixed existing tests

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 1d836353fee8b30d9f4f1a56396a068966748a49..368ee3aca802dc1770b7a5b87d25d38706205dea 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,28 +1,31 @@
 class DiaryEntry < ActiveRecord::Base
-  belongs_to :user
-  belongs_to :language, :foreign_key => 'language_code'
-  
-  has_many :comments, :class_name => "DiaryComment",
-                      :include => :user,
-                      :order => "diary_comments.id"
-  has_many :visible_comments, :class_name => "DiaryComment",
-                              :include => :user,
-                              :conditions => {
-                                :users => { :status => ["active", "confirmed" ] },
-                                :visible => true
-                              },
-                              :order => "diary_comments.id"
+  belongs_to :user, :counter_cache => true
+  belongs_to :language, :foreign_key => "language_code"
 
-  scope :visible, where(:visible => true)
+  has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
+  has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => %w(active confirmed) }).order(:id) }, :class_name => "DiaryComment"
 
-  validates_presence_of :title, :body
-  validates_length_of :title, :within => 1..255
-  #validates_length_of :language, :within => 2..5, :allow_nil => false
-  validates_numericality_of :latitude, :allow_nil => true,
-                            :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
-  validates_numericality_of :longitude, :allow_nil => true,
-                            :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
-  validates_associated :language
+  scope :visible, -> { where(:visible => true) }
 
-  attr_accessible :title, :body, :language_code, :latitude, :longitude
+  validates :title, :body, :presence => true
+  validates :title, :length => 1..255
+  validates :latitude, :allow_nil => true,
+                       :numericality => { :greater_than_or_equal_to => -90,
+                                          :less_than_or_equal_to => 90 }
+  validates :longitude, :allow_nil => true,
+                        :numericality => { :greater_than_or_equal_to => -180,
+                                           :less_than_or_equal_to => 180 }
+  validates :language, :user, :associated => true
+
+  after_save :spam_check
+
+  def body
+    RichText.new(self[:body_format], self[:body])
+  end
+
+  private
+
+  def spam_check
+    user.spam_check
+  end
 end