X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..d0998f3a63d94200a200194e1925e6a83119cfd4:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 12afbb24b..0053333e2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ActiveRecord::Base - require 'xml/libxml' + require "xml/libxml" has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) } @@ -12,8 +12,8 @@ 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_and_belongs_to_many :changeset_subscriptions, :class_name => 'Changeset', :join_table => 'changesets_subscribers', :foreign_key => 'subscriber_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,14 +62,12 @@ 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]) - if users.count == 1 - user = users.first - end + user = users.first if users.count == 1 end if user && PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password]) @@ -102,29 +102,29 @@ class User < ActiveRecord::Base end def to_xml_node - el1 = XML::Node.new 'user' - el1['display_name'] = display_name.to_s - el1['account_created'] = creation_time.xmlschema + el1 = XML::Node.new "user" + el1["display_name"] = display_name.to_s + el1["account_created"] = creation_time.xmlschema if home_lat && home_lon - home = XML::Node.new 'home' - home['lat'] = home_lat.to_s - home['lon'] = home_lon.to_s - home['zoom'] = home_zoom.to_s + home = XML::Node.new "home" + home["lat"] = home_lat.to_s + home["lon"] = home_lon.to_s + home["zoom"] = home_zoom.to_s el1 << home end el1 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 @@ -138,7 +138,6 @@ class User < ActiveRecord::Base def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) if home_lon && home_lat gc = OSM::GreatCircle.new(home_lat, home_lon) - bounds = gc.bounds(radius) sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") nearby = User.where("id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius).order(sql_for_distance).limit(num) else @@ -170,13 +169,13 @@ class User < ActiveRecord::Base ## # returns true if the user has the moderator role, false otherwise def moderator? - has_role? 'moderator' + has_role? "moderator" end ## # returns true if the user has the administrator role, false otherwise def administrator? - has_role? 'administrator' + has_role? "administrator" end ## @@ -202,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 @@ -212,8 +212,8 @@ class User < ActiveRecord::Base def spam_score changeset_score = changesets.size * 50 trace_score = traces.size * 50 - diary_entry_score = diary_entries.inject(0) { |s, e| s += e.body.spam_score } - diary_comment_score = diary_comments.inject(0) { |s, c| s += c.body.spam_score } + diary_entry_score = diary_entries.inject(0) { |a, e| a + e.body.spam_score } + diary_comment_score = diary_comments.inject(0) { |a, e| a + e.body.spam_score } score = description.spam_score / 4.0 score += diary_entries.where("created_at > ?", 1.day.ago).count * 10