Merge branch 'master' of git://git.openstreetmap.org/rails into openID

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 36d3df3b407015cfc8b9f8edf052083689b39708..09e1a7d35611a9c3178a4832a3b19845b5faf0fe 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 

-  has_many :blocks, :class_name => "UserBlock", :conditions => ["user_blocks.end_at > now() or user_blocks.needs_view"]
+  has_many :active_blocks, :class_name => "UserBlock", :conditions => ['user_blocks.ends_at > \'#{Time.now.getutc.xmlschema(5)}\' or user_blocks.needs_view']

   has_many :roles, :class_name => "UserRole"
 
   validates_presence_of :email, :display_name
   has_many :roles, :class_name => "UserRole"
 
   validates_presence_of :email, :display_name


@@ -22,10 +22,11 @@ class User < ActiveRecord::Base
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
   validates_uniqueness_of :display_name, :allow_nil => true
   validates_uniqueness_of :email

+  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_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true

-  validates_length_of :email, :within => 6..255
-  validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  validates_email_format_of :email
+  validates_email_format_of :new_email, :allow_blank => true

   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true
   validates_format_of :display_name, :with => /^[^\/;.,?]*$/
   validates_numericality_of :home_lat, :allow_nil => true
   validates_numericality_of :home_lon, :allow_nil => true


@@ -85,7 +86,7 @@ class User < ActiveRecord::Base
   end
 
   def languages
   end
 
   def languages

-    attribute_present?(:languages) ? read_attribute(:languages).split(",") : []
+    attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []

   end
 
   def languages=(languages)
   end
 
   def languages=(languages)


@@ -135,7 +136,7 @@ class User < ActiveRecord::Base
   end
 
   ##
   end
 
   ##

-  # returns true if the user has the moderator role, false otherwise
+  # returns true if the user has the administrator role, false otherwise

   def administrator?
     has_role? 'administrator'
   end
   def administrator?
     has_role? 'administrator'
   end


@@ -143,14 +144,14 @@ class User < ActiveRecord::Base
   ##
   # returns true if the user has the requested role
   def has_role?(role)
   ##
   # returns true if the user has the requested role
   def has_role?(role)

-    roles.inject(false) { |x, r| x or r.role == role }
+    roles.any? { |r| r.role == role }

   end
 
   ##
   # returns the first active block which would require users to view 
   # a message, or nil if there are none.
   def blocked_on_view
   end
 
   ##
   # returns the first active block which would require users to view 
   # a message, or nil if there are none.
   def blocked_on_view

-    blocks.inject(nil) { |s,x| s || (x.needs_view? ? x : nil) }
+    active_blocks.detect { |b| b.needs_view? }

   end
 
   def delete
   end
 
   def delete