Use flexbox instead of floating to position the comment icon

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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c20788fbbe7858b6056d5773ae2183a5941b0d2e..4ff1eeb35e57b0e8e3890dee62e2804761634215 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,13 +1,61 @@
-class DiaryEntry < ActiveRecord::Base
-  belongs_to :user
-  has_many :diary_comments, :include => :user,
-                            :conditions => "users.visible = 1",
-                            :order => "diary_comments.id"
-
-  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
+# == Schema Information
+#
+# Table name: diary_entries
+#
+#  id            :bigint(8)        not null, primary key
+#  user_id       :bigint(8)        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 < ApplicationRecord
+  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 :subscriptions, :class_name => "DiaryEntrySubscription"
+  has_many :subscribers, :through => :subscriptions, :source => :user
+
+  scope :visible, -> { where(:visible => true) }
+
+  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
+    RichText.new(self[:body_format], self[:body])
+  end
+
+  private
+
+  def spam_check
+    user.spam_check
+  end
 end