nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

continuing refactor of model validation calls to rails 3 syntax

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/person.rb
View file

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

2
app/models/post.rb
View file

@ -29,7 +29,7 @@ class Post < ActiveRecord::Base
belongs_to :author, :class_name => 'Person' belongs_to :author, :class_name => 'Person'
validates_uniqueness_of :guid validates :guid, :uniqueness => true
def diaspora_handle def diaspora_handle
read_attribute(:diaspora_handle) || self.author.diaspora_handle read_attribute(:diaspora_handle) || self.author.diaspora_handle

7
app/models/profile.rb
View file

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

4
app/models/request.rb
View file

@ -12,7 +12,9 @@ class Request
xml_accessor :sender_handle xml_accessor :sender_handle
xml_accessor :recipient_handle xml_accessor :recipient_handle
validates_presence_of :sender, :recipient validates :sender, :presence => true
validates :recipient, :presence => true
validate :not_already_connected validate :not_already_connected
validate :not_friending_yourself validate :not_friending_yourself

3
app/models/user.rb
View file

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