continuing refactor of model validation calls to rails 3 syntax

This commit is contained in:
buddhamagnet 2011-09-11 21:39:02 +01:00
parent cfa659c47e
commit 010024c4f9
5 changed files with 18 additions and 14 deletions

View file

@ -39,9 +39,11 @@ class Person < ActiveRecord::Base
before_destroy :remove_all_traces
before_validation :clean_url
validates_presence_of :url, :profile, :serialized_public_key
validates_uniqueness_of :diaspora_handle
validates :url, :presence => true
validates :profile, :presence => true
validates :serialized_public_key, :presence => true
validates :diaspora_handle, :uniqueness => true
scope :searchable, joins(:profile).where(:profiles => {:searchable => true})
scope :remote, where('people.owner_id IS NULL')

View file

@ -28,8 +28,8 @@ class Post < ActiveRecord::Base
has_many :resharers, :class_name => 'Person', :through => :reshares, :source => :author
belongs_to :author, :class_name => 'Person'
validates_uniqueness_of :guid
validates :guid, :uniqueness => true
def diaspora_handle
read_attribute(:diaspora_handle) || self.author.diaspora_handle

View file

@ -12,7 +12,7 @@ class Profile < ActiveRecord::Base
acts_as_taggable_on :tags
extract_tags_from :tag_string
validates_length_of :tag_list, :maximum => 5
validates :tag_list, :length => { :maximum => 5 }
xml_attr :diaspora_handle
xml_attr :first_name
@ -29,9 +29,10 @@ class Profile < ActiveRecord::Base
before_save :strip_names
after_validation :strip_names
validates_length_of :first_name, :maximum => 32
validates_length_of :last_name, :maximum => 32
validates :first_name, :length => { :maximum => 32 }
validates :last_name, :length => { :maximum => 32 }
validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true
validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true
validate :max_tags

View file

@ -11,8 +11,10 @@ class Request
xml_accessor :sender_handle
xml_accessor :recipient_handle
validates_presence_of :sender, :recipient
validates :sender, :presence => true
validates :recipient, :presence => true
validate :not_already_connected
validate :not_friending_yourself

View file

@ -18,9 +18,8 @@ class User < ActiveRecord::Base
before_validation :strip_and_downcase_username
before_validation :set_current_language, :on => :create
validates_presence_of :username
validates_uniqueness_of :username
validates :username, :presence => true, :uniqueness => true
validates_format_of :username, :with => /\A[A-Za-z0-9_]+\z/
validates_length_of :username, :maximum => 32
validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES