X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..c7061991e74a20cc0576a3afa269821a87178f77:/app/models/user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index e6a11b6bd..1a0e3415e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,7 +12,7 @@ class User < ActiveRecord::Base
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, -> { order(:created_at => :desc) }
-  has_many :changeset_comments, :foreign_key =>  :author_id
+  has_many :changeset_comments, :foreign_key => :author_id
   has_and_belongs_to_many :changeset_subscriptions, :class_name => "Changeset", :join_table => "changesets_subscribers", :foreign_key => "subscriber_id"
   has_many :note_comments, :foreign_key => :author_id
   has_many :notes, :through => :note_comments
@@ -34,25 +34,27 @@ class User < ActiveRecord::Base
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }
 
-  validates_presence_of :email, :display_name
-  validates_confirmation_of :email # , :message => ' addresses must match'
-  validates_confirmation_of :pass_crypt # , :message => ' must match the confirmation password'
-  validates_uniqueness_of :display_name, :allow_nil => true, :case_sensitive => false, :if => proc { |u| u.display_name_changed? }
-  validates_uniqueness_of :email, :case_sensitive => false, :if => proc { |u| u.email_changed? }
-  validates_uniqueness_of :openid_url, :allow_nil => true
-  validates_length_of :pass_crypt, :within => 8..255
-  validates_length_of :display_name, :within => 3..255, :allow_nil => true
+  validates :display_name, :presence => true, :allow_nil => true, :length => 3..255,
+                           :exclusion => %w(new terms save confirm confirm-email go_public reset-password forgot-password suspended)
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :uniqueness => { :case_sensitive => false }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff/;.,?%#]*\z} }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => /\A\S/, :message => "has leading whitespace" }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => /\S\z/, :message => "has trailing whitespace" }
+  validates :email, :presence => true, :confirmation => true
+  validates :email, :if => proc { |u| u.email_changed? },
+                    :uniqueness => { :case_sensitive => false }
+  validates :pass_crypt, :confirmation => true, :length => 8..255
+  validates :home_lat, :home_lon, :allow_nil => true, :numericality => true
+  validates :home_zoom, :allow_nil => true, :numericality => { :only_integer => true }
+  validates :preferred_editor, :inclusion => Editors::ALL_EDITORS, :allow_nil => true
+  validates :image, :attachment_content_type => { :content_type => %r{\Aimage/.*\Z} }
+
   validates_email_format_of :email, :if => proc { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? }
-  validates_format_of :display_name, :with => /\A[^\x00-\x1f\x7f\ufffe\uffff\/;.,?%#]*\z/, :if => proc { |u| u.display_name_changed? }
-  validates_format_of :display_name, :with => /\A\S/, :message => "has leading whitespace", :if => proc { |u| u.display_name_changed? }
-  validates_format_of :display_name, :with => /\S\z/, :message => "has trailing whitespace", :if => proc { |u| u.display_name_changed? }
-  validates_exclusion_of :display_name, :in => %w(new terms save confirm confirm-email go_public reset-password forgot-password suspended)
-  validates_numericality_of :home_lat, :allow_nil => true
-  validates_numericality_of :home_lon, :allow_nil => true
-  validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
-  validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
-  validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
 
   after_initialize :set_defaults
   before_save :encrypt_password
@@ -60,7 +62,7 @@ class User < ActiveRecord::Base
 
   def self.authenticate(options)
     if options[:username] && options[:password]
-      user = where("email = ? OR display_name = ?", options[:username], options[:username]).first
+      user = find_by("email = ? OR display_name = ?", options[:username], options[:username])
 
       if user.nil?
         users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username])
@@ -114,23 +116,23 @@ class User < ActiveRecord::Base
   end
 
   def description
-    RichText.new(read_attribute(:description_format), read_attribute(:description))
+    RichText.new(self[:description_format], self[:description])
   end
 
   def languages
-    attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
+    attribute_present?(:languages) ? self[:languages].split(/ *[, ] */) : []
   end
 
   def languages=(languages)
-    write_attribute(:languages, languages.join(","))
+    self[:languages] = languages.join(",")
   end
 
   def preferred_language
     languages.find { |l| Language.exists?(:code => l) }
   end
 
-  def preferred_language_from(array)
-    (languages & array.collect(&:to_s)).first
+  def preferred_languages
+    @locales ||= Locale.list(languages)
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
@@ -199,7 +201,8 @@ class User < ActiveRecord::Base
     self.image = nil
     self.email_valid = false
     self.new_email = nil
-    self.openid_url = nil
+    self.auth_provider = nil
+    self.auth_uid = nil
     self.status = "deleted"
     save
   end
@@ -239,7 +242,7 @@ class User < ActiveRecord::Base
   private
 
   def set_defaults
-    self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
+    self.creation_time = Time.now.getutc unless attribute_present?(:creation_time)
   end
 
   def encrypt_password