L.hash expects parseHash to return false if there isn't a location

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index fe48ee8dce01b50213dd72c05878f2e78c60c67c..58f8710f95d10d8168989e76d449714f57aab2fd 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,11 +1,35 @@
 class DiaryEntry < ActiveRecord::Base
 class DiaryEntry < ActiveRecord::Base

-  belongs_to :user
-  has_many :diary_comments, :order => "id"
+  belongs_to :user, :counter_cache => true
+  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"
+
+  scope :visible, -> { where(:visible => true) }

 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255

-  validates_length_of :language, :within => 2..3
-  validates_numericality_of :latitude, :allow_nil => true
-  validates_numericality_of :longitude, :allow_nil => true
-  validates_associated :user
+  #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
+
+  after_initialize :set_defaults
+  after_save :spam_check
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
+private
+
+  def set_defaults
+    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  end
+
+  def spam_check
+    user.spam_check
+  end

 end
 end