Remove require_terms_agreed configuration option

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index fa3c4c84826c1ad0be38a4319e56017c3bd04eb4..d6124199352481895af958f7ae5c25b7e8c02c1a 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,25 +1,56 @@
+# == Schema Information
+#
+# Table name: diary_entries
+#
+#  id            :integer          not null, primary key
+#  user_id       :integer          not null
+#  title         :string           not null
+#  body          :text             not null
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  latitude      :float
+#  longitude     :float
+#  language_code :string           default("en"), not null
+#  visible       :boolean          default(TRUE), not null
+#  body_format   :enum             default("markdown"), not null
+#
+# Indexes
+#
+#  diary_entry_created_at_index                (created_at)
+#  diary_entry_language_code_created_at_index  (language_code,created_at)
+#  diary_entry_user_id_created_at_index        (user_id,created_at)
+#
+# Foreign Keys
+#
+#  diary_entries_language_code_fkey  (language_code => languages.code)
+#  diary_entries_user_id_fkey        (user_id => users.id)
+#
+

 class DiaryEntry < ActiveRecord::Base
   belongs_to :user, :counter_cache => true
   belongs_to :language, :foreign_key => "language_code"
 
   has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
 class DiaryEntry < ActiveRecord::Base
   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 => %w(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"
+  has_many :subscriptions, :class_name => "DiaryEntrySubscription"
+  has_many :subscribers, :through => :subscriptions, :source => :user

 
   scope :visible, -> { where(:visible => true) }
 
 
   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_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
+  validates :title, :presence => true, :length => 1..255, :characters => true
+  validates :body, :presence => true, :characters => true
+  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
 
   after_save :spam_check
 
   def body

-    RichText.new(read_attribute(:body_format), read_attribute(:body))
+    RichText.new(self[:body_format], self[:body])

   end
 
   private
   end
 
   private