Improve consistency of text validations

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 4990a999ad6de32134951cebb935a2755551e986..c49c2d42783ff558df14db96f6e718d227bbe0fe 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -37,8 +37,8 @@ class DiaryEntry < ActiveRecord::Base
 
   scope :visible, -> { where(:visible => true) }
 
 
   scope :visible, -> { where(:visible => true) }
 

-  validates :title, :body, :presence => true, :invalid_chars => true
-  validates :title, :length => 1..255
+  validates :title, :presence => true, :length => 1..255, :invalid_chars => true
+  validates :body, :presence => true, :invalid_chars => true

   validates :latitude, :allow_nil => true,
                        :numericality => { :greater_than_or_equal_to => -90,
                                           :less_than_or_equal_to => 90 }
   validates :latitude, :allow_nil => true,
                        :numericality => { :greater_than_or_equal_to => -90,
                                           :less_than_or_equal_to => 90 }

diff --git a/app/models/note_comment.rb b/app/models/note_comment.rb
index 69a93c532a53354f725a0490d5d01461ac6a8b66..2347d43d02c4c71d6426d949b00828ea9e840998 100644 (file)
--- a/app/models/note_comment.rb
+++ b/app/models/note_comment.rb
@@ -33,8 +33,7 @@ class NoteComment < ActiveRecord::Base
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]
   validates :visible, :inclusion => [true, false]
   validates :author, :associated => true
   validates :event, :inclusion => %w[opened closed reopened commented hidden]

-  validates :body, :length => { :maximum => 2000 },
-                   :invalid_chars => true
+  validates :body, :length => { :maximum => 2000 }, :invalid_chars => true

 
   # Return the comment text
   def body
 
   # Return the comment text
   def body

diff --git a/app/models/redaction.rb b/app/models/redaction.rb
index 812224d36a657d922ad80c8e86365df322b9a8b4..e99460c3b9860e6426ca2544adc2cd1889d011d2 100644 (file)
--- a/app/models/redaction.rb
+++ b/app/models/redaction.rb
@@ -31,8 +31,8 @@ class Redaction < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
 
   has_many :old_ways
   has_many :old_relations
 

-  validates :title, :description, :invalid_chars => true
-  validates :description, :presence => true
+  validates :title, :presence => true, :invalid_chars => true
+  validates :description, :presence => true, :invalid_chars => true

   validates :description_format, :inclusion => { :in => %w[text html markdown] }
 
   # this method overrides the AR default to provide the rich
   validates :description_format, :inclusion => { :in => %w[text html markdown] }
 
   # this method overrides the AR default to provide the rich

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 70b2aebbe3dff9e038bb681474a82e79ba9049b3..942d160f52605f35e0917de128050877b089ff7a 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -38,9 +38,8 @@ class Trace < ActiveRecord::Base
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
 
   validates :user, :presence => true, :associated => true
   scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
 
   validates :user, :presence => true, :associated => true

-  validates :name, :presence => true, :length => 1..255
-  validates :name, :description, :invalid_chars => true
-  validates :description, :presence => { :on => :create }, :length => 1..255
+  validates :name, :presence => true, :length => 1..255, :invalid_chars => true
+  validates :description, :presence => { :on => :create }, :length => 1..255, :invalid_chars => true

   validates :timestamp, :presence => true
   validates :visibility, :inclusion => %w[private public trackable identifiable]
 
   validates :timestamp, :presence => true
   validates :visibility, :inclusion => %w[private public trackable identifiable]