Merge branch 'normalize-email' into 'master'

Normalize email before save Users were saving emails in uppercase See merge request !413

Merge branch 'normalize-email' into 'master'
Normalize email before save Users were saving emails in uppercase See merge request !413
Braulio Bhavamitra
2 parents 1213fdf1 a6b5dfe6
Showing 2 changed files with 17 additions and 0 deletions Show diff stats
app/models/user.rb
db/migrate/20150112233715_normalize_users_email.rb
@@ -102,6 +102,7 @@ class User &lt; ActiveRecord::Base
   validates_length_of       :email,    :within => 3..100, :if => (lambda {|user| !user.email.blank?})
   validates_uniqueness_of   :login, :email, :case_sensitive => false, :scope => :environment_id
   before_save :encrypt_password
+  before_save :normalize_email
   validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {|user| !user.email.blank?})
  
   validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { |u| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
@@ -336,6 +337,11 @@ class User &lt; ActiveRecord::Base
   end
  
   protected
+
+    def normalize_email
+      self.email = self.email.squish.downcase
+    end
+
     # before filter
     def encrypt_password
       return if password.blank?
@@ -0,0 +1,11 @@
+class NormalizeUsersEmail < ActiveRecord::Migration
+  def up
+    User.find_each do |u|
+      u.update_column :email, u.send(:normalize_email)
+    end
+  end
+
+  def down
+    say "this migration can't be reverted"
+  end
+end
...	...	@@ -102,6 +102,7 @@ class User < ActiveRecord::Base
102	102	validates_length_of :email, :within => 3..100, :if => (lambda {\|user\| !user.email.blank?})
103	103	validates_uniqueness_of :login, :email, :case_sensitive => false, :scope => :environment_id
104	104	before_save :encrypt_password
	105	+ before_save :normalize_email
105	106	validates_format_of :email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda {\|user\| !user.email.blank?})
106	107
107	108	validates_inclusion_of :terms_accepted, :in => [ '1' ], :if => lambda { \|u\| ! u.terms_of_use.blank? }, :message => N_('{fn} must be checked in order to signup.').fix_i18n
...	...	@@ -336,6 +337,11 @@ class User < ActiveRecord::Base
336	337	end
337	338
338	339	protected
	340	+
	341	+ def normalize_email
	342	+ self.email = self.email.squish.downcase
	343	+ end
	344	+
339	345	# before filter
340	346	def encrypt_password
341	347	return if password.blank?
...	...
...	...	@@ -0,0 +1,11 @@
	1	+class NormalizeUsersEmail < ActiveRecord::Migration
	2	+ def up
	3	+ User.find_each do \|u\|
	4	+ u.update_column :email, u.send(:normalize_email)
	5	+ end
	6	+ end
	7	+
	8	+ def down
	9	+ say "this migration can't be reverted"
	10	+ end
	11	+end
...	...