Create invalid_char validators and apply to models

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

diff --git a/app/models/changeset_comment.rb b/app/models/changeset_comment.rb
index a010674a3cb062479fb20f2ee9282d454ccb3424..232785d95de585f6d2d508bf7381f31a0adfbb4f 100644 (file)
--- a/app/models/changeset_comment.rb
+++ b/app/models/changeset_comment.rb
@@ -1,17 +1,37 @@
+# == Schema Information
+#
+# Table name: changeset_comments
+#
+#  id           :integer          not null, primary key
+#  changeset_id :bigint(8)        not null
+#  author_id    :bigint(8)        not null
+#  body         :text             not null
+#  created_at   :datetime         not null
+#  visible      :boolean          not null
+#
+# Indexes
+#
+#  index_changeset_comments_on_created_at  (created_at)
+#
+# Foreign Keys
+#
+#  changeset_comments_author_id_fkey     (author_id => users.id)
+#  changeset_comments_changeset_id_fkey  (changeset_id => changesets.id)
+#
+
 class ChangesetComment < ActiveRecord::Base
   belongs_to :changeset
   belongs_to :author, :class_name => "User"
 
-  validates_presence_of :id, :on => :update # is it necessary?
-  validates_uniqueness_of :id
-  validates_presence_of :changeset
-  validates_associated :changeset
-  validates_presence_of :author
-  validates_associated :author
-  validates :visible, :inclusion => { :in => [true,false] }
-  
+  validates :id, :uniqueness => true, :presence => { :on => :update },
+                 :numericality => { :on => :update, :integer_only => true }
+  validates :changeset, :presence => true, :associated => true
+  validates :author, :presence => true, :associated => true
+  validates :visible, :inclusion => [true, false]
+  validates :body, :invalid_chars => true
+
   # Return the comment text
   def body
-    RichText.new("text", read_attribute(:body))
+    RichText.new("text", self[:body])
   end
 end