From 7f7ba4f3d72104d67e9ecf839c9688c0580d4063 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 16 Jan 2013 16:52:35 +0100 Subject: incomplete initial changes to make email address just login@domain.tld This involves a number of other changes like making sure the comparison between aliases and emails still works. Will do that by removing the @domain.tld from aliases as well. --- users/app/designs/user/by_email_alias.js | 2 +- users/app/designs/user/by_email_or_alias.js | 4 +-- users/app/models/local_email.rb | 49 ++++++++++++++++++++--------- users/app/models/user.rb | 33 ++++++------------- users/app/views/users/edit.html.haml | 4 ++- 5 files changed, 49 insertions(+), 43 deletions(-) (limited to 'users/app') diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js index 508a002..dc8021a 100644 --- a/users/app/designs/user/by_email_alias.js +++ b/users/app/designs/user/by_email_alias.js @@ -3,6 +3,6 @@ function(doc) { return; } doc.email_aliases.forEach(function(alias){ - emit(alias.email, 1); + emit(alias.username, 1); }); } diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js index 71fd0ea..2e5d0a8 100644 --- a/users/app/designs/user/by_email_or_alias.js +++ b/users/app/designs/user/by_email_or_alias.js @@ -3,9 +3,9 @@ function(doc) { return; } if (doc.email) { - emit(doc.email, 1); + emit(doc.login, 1); } doc.email_aliases.forEach(function(alias){ - emit(alias.email, 1); + emit(alias.username, 1); }); } diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb index d23df71..c3bb15c 100644 --- a/users/app/models/local_email.rb +++ b/users/app/models/local_email.rb @@ -1,15 +1,37 @@ -class LocalEmail < Email +class LocalEmail + + property :username, String + + validates :username, + :format => { :with => /\A([^@\s]+)(@.*)?\Z/, :message => "needs to be a valid login or email address"} validate :unique_on_server validate :unique_alias_for_user validate :differs_from_main_email - before_validation :add_domain_if_needed - validates :email, + before_validation :strip_domain_if_needed + validates :username, :presence => true, - :format => { :with => /@#{APP_CONFIG[:domain]}\Z/, + :format => { :with => /[^@]*(@#{APP_CONFIG[:domain]})?\Z/i, :message => "needs to end in @#{APP_CONFIG[:domain]}"} validates :casted_by, :presence => true + def initialize(attributes = nil, &block) + attributes = {:username => attributes} if attributes.is_a? String + super(attributes, &block) + end + + def to_s + email + end + + def ==(other) + other.is_a?(String) ? self.email == other : super + end + + def to_param + email + end + def to_partial_path "emails/email" end @@ -17,16 +39,16 @@ class LocalEmail < Email protected def unique_on_server - has_email = User.find_by_email_or_alias(email) + has_email = User.find_by_login_or_alias(username) if has_email && has_email != self.base_doc - errors.add :email, "has already been taken" + errors.add :username, "has already been taken" end end def unique_alias_for_user aliases = self.casted_by.email_aliases - if aliases.select{|a|a.email == self.email}.count > 1 - errors.add :email, "is already your alias" + if aliases.select{|a|a.username == self.username}.count > 1 + errors.add :username, "is already your alias" end end @@ -34,16 +56,13 @@ class LocalEmail < Email # If this has not changed but the email let's mark the email invalid instead. return if self.persisted? user = self.casted_by - if user.email == self.email - errors.add :email, "may not be the same as your email address" + if user.login == self.username + errors.add :username, "may not be the same as your email address" end end - def add_domain_if_needed - if email.blank? - errors.add :email, "may not be empty." - end - self.email += "@" + APP_CONFIG[:domain] unless self.email.include?("@") + def strip_domain_if_needed + self.username.gsub /@#{APP_CONFIG[:domain]}/i, '' end end diff --git a/users/app/models/user.rb b/users/app/models/user.rb index f20c6ac..40e285a 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -6,7 +6,6 @@ class User < CouchRest::Model::Base property :password_verifier, String, :accessible => true property :password_salt, String, :accessible => true - property :email, String, :accessible => true property :email_forward, String, :accessible => true property :email_aliases, [LocalEmail] @@ -21,6 +20,8 @@ class User < CouchRest::Model::Base :format => { :with => /\A[A-Za-z\d_\.]+\z/, :message => "Only letters, digits, . and _ allowed" } + validate :login_differs_from_email_aliases + validates :password_salt, :password_verifier, :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" } @@ -28,21 +29,9 @@ class User < CouchRest::Model::Base :confirmation => true, :format => { :with => /.{8}.*/, :message => "needs to be at least 8 characters long" } - # TODO: write a proper email validator to be used in the different places - validates :email, - :format => { :with => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/, :message => "needs to be a valid email address"} - - validates :email, - :format => { :with => /\A(.+@#{APP_CONFIG[:domain]})?\Z/, - :message => "needs to end in @#{APP_CONFIG[:domain]}"} - - validate :email_unique_on_server - validates :email_forward, :format => { :with => /\A(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}))?\Z/, :message => "needs to be a valid email address"} - validate :email_differs_from_email_aliases - timestamps! design do @@ -83,6 +72,10 @@ class User < CouchRest::Model::Base login end + def email_address + login + '@' + APP_CONFIG[:domain] + end + # Since we are storing admins by login, we cannot allow admins to change their login. def is_admin? APP_CONFIG['admins'].include? self.login @@ -100,19 +93,11 @@ class User < CouchRest::Model::Base # Validation Functions ## - def email_differs_from_email_aliases + def login_differs_from_email_aliases # If this has not changed but the email aliases let's not mark this invalid. return if email_aliases.any? and email_aliases.last.errors.any? - if email_aliases.map(&:email).include?(email) - errors.add(:email, "may not be the same as an alias") - end - end - - def email_unique_on_server - return unless email - has_email = User.find_by_email_or_alias(email) - if has_email && has_email != self.base_doc - errors.add :email, "has already been taken" + if email_aliases.map(&:email).include?(email_address) + errors.add(:login, "may not be the same as an alias") end end diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 820b80e..d5dc3b5 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -5,7 +5,9 @@ = user_form_with 'password_fields', :legend => :change_password = render 'cancel_account' if @user == current_user - content_for :email do - = user_form_with 'email_field', :legend => :set_email_address + %legend=t :email_address + Your email address is + =user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3 From a8ec73a0307924610023525786bb3a9eb8b173e1 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 17 Jan 2013 15:09:58 +0100 Subject: unit tests passing --- users/app/designs/user/by_alias.js | 8 +++++++ users/app/designs/user/by_email_alias.js | 8 ------- users/app/designs/user/by_email_or_alias.js | 11 --------- users/app/designs/user/by_login_or_alias.js | 9 ++++++++ users/app/models/email.rb | 17 ++++++++------ users/app/models/local_email.rb | 32 ++++++++++++-------------- users/app/models/remote_email.rb | 14 +++++++++++ users/app/models/user.rb | 15 ++++++------ users/app/views/users/_email_aliases.html.haml | 2 +- users/app/views/users/edit.html.haml | 2 +- 10 files changed, 66 insertions(+), 52 deletions(-) create mode 100644 users/app/designs/user/by_alias.js delete mode 100644 users/app/designs/user/by_email_alias.js delete mode 100644 users/app/designs/user/by_email_or_alias.js create mode 100644 users/app/designs/user/by_login_or_alias.js create mode 100644 users/app/models/remote_email.rb (limited to 'users/app') diff --git a/users/app/designs/user/by_alias.js b/users/app/designs/user/by_alias.js new file mode 100644 index 0000000..dc8021a --- /dev/null +++ b/users/app/designs/user/by_alias.js @@ -0,0 +1,8 @@ +function(doc) { + if (doc.type != 'User') { + return; + } + doc.email_aliases.forEach(function(alias){ + emit(alias.username, 1); + }); +} diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_email_alias.js deleted file mode 100644 index dc8021a..0000000 --- a/users/app/designs/user/by_email_alias.js +++ /dev/null @@ -1,8 +0,0 @@ -function(doc) { - if (doc.type != 'User') { - return; - } - doc.email_aliases.forEach(function(alias){ - emit(alias.username, 1); - }); -} diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_email_or_alias.js deleted file mode 100644 index 2e5d0a8..0000000 --- a/users/app/designs/user/by_email_or_alias.js +++ /dev/null @@ -1,11 +0,0 @@ -function(doc) { - if (doc.type != 'User') { - return; - } - if (doc.email) { - emit(doc.login, 1); - } - doc.email_aliases.forEach(function(alias){ - emit(alias.username, 1); - }); -} diff --git a/users/app/designs/user/by_login_or_alias.js b/users/app/designs/user/by_login_or_alias.js new file mode 100644 index 0000000..2d2096c --- /dev/null +++ b/users/app/designs/user/by_login_or_alias.js @@ -0,0 +1,9 @@ +function(doc) { + if (doc.type != 'User') { + return; + } + emit(doc.login, 1); + doc.email_aliases.forEach(function(alias){ + emit(alias.username, 1); + }); +} diff --git a/users/app/models/email.rb b/users/app/models/email.rb index 0745fda..904acb9 100644 --- a/users/app/models/email.rb +++ b/users/app/models/email.rb @@ -1,10 +1,13 @@ -class Email - include CouchRest::Model::Embeddable +module Email + extend ActiveSupport::Concern - property :email, String - - validates :email, - :format => { :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, :message => "needs to be a valid email address"} + included do + validates :email, + :format => { + :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, + :message => "needs to be a valid email address" + } + end def initialize(attributes = nil, &block) attributes = {:email => attributes} if attributes.is_a? String @@ -16,7 +19,7 @@ class Email end def ==(other) - other.is_a?(String) ? self.email == other : super + other.is_a?(Email) ? self.email == other.email : self.email == other end def to_param diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb index c3bb15c..587acc6 100644 --- a/users/app/models/local_email.rb +++ b/users/app/models/local_email.rb @@ -1,35 +1,33 @@ class LocalEmail + include CouchRest::Model::Embeddable + include Email property :username, String + before_validation :strip_domain_if_needed + validates :username, :format => { :with => /\A([^@\s]+)(@.*)?\Z/, :message => "needs to be a valid login or email address"} validate :unique_on_server validate :unique_alias_for_user - validate :differs_from_main_email - before_validation :strip_domain_if_needed + validate :differs_from_login + validates :username, :presence => true, :format => { :with => /[^@]*(@#{APP_CONFIG[:domain]})?\Z/i, - :message => "needs to end in @#{APP_CONFIG[:domain]}"} + :message => "may not contain an '@' or needs to end in @#{APP_CONFIG[:domain]}"} validates :casted_by, :presence => true - def initialize(attributes = nil, &block) - attributes = {:username => attributes} if attributes.is_a? String - super(attributes, &block) - end - - def to_s - email - end - - def ==(other) - other.is_a?(String) ? self.email == other : super + def email + return '' if username.nil? + username + '@' + APP_CONFIG[:domain] end - def to_param - email + def email=(value) + return if value.blank? + self.username = value + strip_domain_if_needed end def to_partial_path @@ -52,7 +50,7 @@ class LocalEmail end end - def differs_from_main_email + def differs_from_login # If this has not changed but the email let's mark the email invalid instead. return if self.persisted? user = self.casted_by diff --git a/users/app/models/remote_email.rb b/users/app/models/remote_email.rb new file mode 100644 index 0000000..4fe7425 --- /dev/null +++ b/users/app/models/remote_email.rb @@ -0,0 +1,14 @@ +class RemoteEmail + include CouchRest::Model::Embeddable + include Email + + property :email, String + + def username + email.spilt('@').first + end + + def domain + email.split('@').last + end +end diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 40e285a..f89d01c 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -20,7 +20,7 @@ class User < CouchRest::Model::Base :format => { :with => /\A[A-Za-z\d_\.]+\z/, :message => "Only letters, digits, . and _ allowed" } - validate :login_differs_from_email_aliases + validate :login_is_unique_alias validates :password_salt, :password_verifier, :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" } @@ -38,7 +38,6 @@ class User < CouchRest::Model::Base load_views(Rails.root.join('users', 'app', 'designs', 'user')) view :by_login view :by_created_at - view :by_email end class << self @@ -93,11 +92,13 @@ class User < CouchRest::Model::Base # Validation Functions ## - def login_differs_from_email_aliases - # If this has not changed but the email aliases let's not mark this invalid. - return if email_aliases.any? and email_aliases.last.errors.any? - if email_aliases.map(&:email).include?(email_address) - errors.add(:login, "may not be the same as an alias") + def login_is_unique_alias + has_alias = User.find_by_login_or_alias(username) + return if has_alias.nil? + if has_alias != self + errors.add(:login, "has already been taken") + elsif has_alias.login != self.login + errors.add(:login, "may not be the same as one of your aliases") end end diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml index e012429..faac2bc 100644 --- a/users/app/views/users/_email_aliases.html.haml +++ b/users/app/views/users/_email_aliases.html.haml @@ -3,4 +3,4 @@ =render @user.email_aliases .clearfix = f.simple_fields_for :email_aliases, @email_alias do |e| - = e.input :email, :placeholder => "alias@#{APP_CONFIG[:domain]}" + = e.input :username, :placeholder => "alias" diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index d5dc3b5..3f62e5f 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -7,7 +7,7 @@ - content_for :email do %legend=t :email_address Your email address is - =user.email_address + = user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3 From 247a6f14db14543773beb1a1e96f2c335800eb82 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 17 Jan 2013 16:28:52 +0100 Subject: minor fixes to validation workflow --- users/app/controllers/users_controller.rb | 3 ++- users/app/models/local_email.rb | 11 ++++------- users/app/models/user.rb | 2 +- users/app/views/emails/_email.html.haml | 11 +++++------ users/app/views/users/edit.html.haml | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) (limited to 'users/app') diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 79de630..75ae2da 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -33,9 +33,10 @@ class UsersController < ApplicationController def update @user.attributes = params[:user] - @email_alias = @user.email_aliases.last if @user.changed? and @user.save flash[:notice] = t(:user_updated_successfully) + elsif !@user.email_aliases.last.valid? + @email_alias = @user.email_aliases.pop end respond_with @user, :location => edit_user_path(@user, :anchor => @anchor) end diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb index 587acc6..bd9dea3 100644 --- a/users/app/models/local_email.rb +++ b/users/app/models/local_email.rb @@ -7,16 +7,13 @@ class LocalEmail before_validation :strip_domain_if_needed validates :username, - :format => { :with => /\A([^@\s]+)(@.*)?\Z/, :message => "needs to be a valid login or email address"} + :presence => true, + :format => { :with => /\A([^@\s]+)(@#{APP_CONFIG[:domain]})?\Z/i, :message => "needs to be a valid login or email address @#{APP_CONFIG[:domain]}"} validate :unique_on_server validate :unique_alias_for_user validate :differs_from_login - validates :username, - :presence => true, - :format => { :with => /[^@]*(@#{APP_CONFIG[:domain]})?\Z/i, - :message => "may not contain an '@' or needs to end in @#{APP_CONFIG[:domain]}"} validates :casted_by, :presence => true def email @@ -38,7 +35,7 @@ class LocalEmail def unique_on_server has_email = User.find_by_login_or_alias(username) - if has_email && has_email != self.base_doc + if has_email && has_email != self.casted_by errors.add :username, "has already been taken" end end @@ -60,7 +57,7 @@ class LocalEmail end def strip_domain_if_needed - self.username.gsub /@#{APP_CONFIG[:domain]}/i, '' + self.username.gsub! /@#{APP_CONFIG[:domain]}/i, '' end end diff --git a/users/app/models/user.rb b/users/app/models/user.rb index f89d01c..63f4d0f 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -72,7 +72,7 @@ class User < CouchRest::Model::Base end def email_address - login + '@' + APP_CONFIG[:domain] + LocalEmail.new(login) end # Since we are storing admins by login, we cannot allow admins to change their login. diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml index 3feb6f0..f5eb2d0 100644 --- a/users/app/views/emails/_email.html.haml +++ b/users/app/views/emails/_email.html.haml @@ -1,6 +1,5 @@ -- if email.valid? - %li.pull-right - %code= email - = link_to(user_email_alias_path(@user, email), :method => :delete) do - %i.icon-remove - .clearfix +%li.pull-right + %code= email + = link_to(user_email_alias_path(@user, email), :method => :delete) do + %i.icon-remove +.clearfix diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index 3f62e5f..69864e5 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -7,7 +7,7 @@ - content_for :email do %legend=t :email_address Your email address is - = user.email_address + = render user.email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias = render 'tabs/tabs', :tabs => [:account, :email] -- cgit v1.2.3