refactored model validations to use newer rails 3 syntax

This commit is contained in:
buddhamagnet 2011-09-11 21:31:39 +01:00
parent 96fc057974
commit cfa659c47e
8 changed files with 16 additions and 14 deletions

View file

@ -11,8 +11,8 @@ class Aspect < ActiveRecord::Base
has_many :aspect_visibilities
has_many :posts, :through => :aspect_visibilities
validates_presence_of :name
validates_length_of :name, :maximum => 20
validates :name, :presence => true, :length => { :maximum => 20 }
validates_uniqueness_of :name, :scope => :user_id, :case_sensitive => false
attr_accessible :name, :contacts_visible, :order_id

View file

@ -5,9 +5,9 @@
class AspectVisibility < ActiveRecord::Base
belongs_to :aspect
validates_presence_of :aspect
validates :aspect, :presence => true
belongs_to :post
validates_presence_of :post
validates :post, :presence => true
end

View file

@ -26,8 +26,8 @@ class Comment < ActiveRecord::Base
belongs_to :post
belongs_to :author, :class_name => 'Person'
validates_presence_of :text, :post
validates_length_of :text, :maximum => 2500
validates :text, :presence => true, :length => { :maximum => 2500 }
validates :post, :presence => true
serialize :youtube_titles, Hash

View file

@ -7,7 +7,7 @@ class Contact < ActiveRecord::Base
validates_presence_of :user
belongs_to :person
validates_presence_of :person
validates :person, :presence => true
has_many :aspect_memberships
has_many :aspects, :through => :aspect_memberships

View file

@ -13,7 +13,8 @@ class Invitation < ActiveRecord::Base
before_validation :set_email_as_default_service
# before_create :share_with_exsisting_user, :if => :recipient_id?
validates_presence_of :identifier, :service
validates :identifier, :presence => true
validates :service, :presence => true
validate :valid_identifier?
validate :recipient_not_on_pod?
validates_presence_of :sender, :aspect, :unless => :admin?

View file

@ -20,7 +20,8 @@ class Like < ActiveRecord::Base
belongs_to :author, :class_name => 'Person'
validates_uniqueness_of :target_id, :scope => [:target_type, :author_id]
validates_presence_of :author, :target
validates :author, :presence => true
validates :target, :presence => true
after_create do
self.target.update_likes_counter

View file

@ -5,8 +5,8 @@
class Mention < ActiveRecord::Base
belongs_to :post
belongs_to :person
validates_presence_of :post
validates_presence_of :person
validates :post, :presence => true
validates :person, :presence => true
after_destroy :delete_notification

View file

@ -14,7 +14,7 @@ class Message < ActiveRecord::Base
belongs_to :author, :class_name => 'Person'
belongs_to :conversation, :touch => true
validates_presence_of :text
validates :text, :presence => true
after_create do
#sign comment as commenter