Fix rubucop errors

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 2a0a5ab4508f2c193c048cf3eeb24edff5262fdc..04524e6a2f56d102d10d50a9c3b00ffcd8227e36 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -88,16 +88,22 @@ class User < ActiveRecord::Base
                     :default_url => "/assets/:class/:attachment/:style.png",
                     :styles => { :large => "100x100>", :small => "50x50>" }
 
+  INVALID_ASCII_CHARS = "/;.,?%#".freeze
+  INVALID_NON_ASCII_CHARS = "\x00-\x1f\x7f\ufffe\uffff".freeze
+
   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} }
+                           :format => { :with => /\A[^#{INVALID_NON_ASCII_CHARS}]*\z/ }
+  validates :display_name, :if => proc { |u| u.display_name_changed? },
+                           :format => { :with => /\A[^#{INVALID_ASCII_CHARS}]*\z/,
+                                        :message => I18n.t("users.account.invalid chars", :invalid_chars => INVALID_ASCII_CHARS) }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\A\S/, :message => "has leading whitespace" }
+                           :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") }
   validates :display_name, :if => proc { |u| u.display_name_changed? },
-                           :format => { :with => /\S\z/, :message => "has trailing whitespace" }
+                           :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") }
   validates :email, :presence => true, :confirmation => true
   validates :email, :if => proc { |u| u.email_changed? },
                     :uniqueness => { :case_sensitive => false }
@@ -117,6 +123,7 @@ class User < ActiveRecord::Base
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
+  after_save :reset_preferred_languages
 
   def to_param
     display_name
@@ -197,6 +204,10 @@ class User < ActiveRecord::Base
     @preferred_languages ||= Locale.list(languages)
   end
 
+  def reset_preferred_languages
+    @preferred_languages = nil
+  end
+
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)
@@ -206,7 +217,7 @@ class User < ActiveRecord::Base
                    .where("id != ?", id)
                    .where(sql_for_area)
                    .where("#{sql_for_distance} <= ?", radius)
-                   .order(sql_for_distance)
+                   .order(Arel.sql(sql_for_distance))
                    .limit(num)
     else
       nearby = []