10 files changed, 86 insertions, 69 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index c0fe243..6cb438b 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -35,9 +35,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/designs/user/by_email_alias.js b/users/app/designs/user/by_alias.js
index 508a002..dc8021a 100644
--- a/users/app/designs/user/by_email_alias.js
+++ b/users/app/designs/user/by_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_login_or_alias.js
index 71fd0ea..2d2096c 100644
--- a/users/app/designs/user/by_email_or_alias.js
+++ b/users/app/designs/user/by_login_or_alias.js
@@ -2,10 +2,8 @@ function(doc) {
   if (doc.type != 'User') {
     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/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 d23df71..bd9dea3 100644
--- a/users/app/models/local_email.rb
+++ b/users/app/models/local_email.rb
@@ -1,15 +1,32 @@
-class LocalEmail < Email
+class LocalEmail
+  include CouchRest::Model::Embeddable
+  include Email
+
+  property :username, String
+
+  before_validation :strip_domain_if_needed
+
+  validates :username,
+    :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_main_email
-  before_validation :add_domain_if_needed
-  validates :email,
-    :presence => true,
-    :format => { :with => /@#{APP_CONFIG[:domain]}\Z/,
-      :message => "needs to end in @#{APP_CONFIG[:domain]}"}
+  validate :differs_from_login
+
   validates :casted_by, :presence => true
 
+  def email
+    return '' if username.nil?
+    username + '@' + APP_CONFIG[:domain]
+  end
+
+  def email=(value)
+    return if value.blank?
+    self.username = value
+    strip_domain_if_needed
+  end
+
   def to_partial_path
     "emails/email"
   end
@@ -17,33 +34,30 @@ class LocalEmail < Email
   protected
 
   def unique_on_server
-    has_email = User.find_by_email_or_alias(email)
-    if has_email && has_email != self.base_doc
-      errors.add :email, "has already been taken"
+    has_email = User.find_by_login_or_alias(username)
+    if has_email && has_email != self.casted_by
+      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
 
-  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
-    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/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 1e8ee0e..292fb13 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_is_unique_alias
+
   validates :password_salt, :password_verifier,
     :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
 
@@ -28,28 +29,15 @@ 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
     load_views(Rails.root.join('users', 'app', 'designs', 'user'))
     view :by_login
     view :by_created_at
-    view :by_email
   end
 
   class << self
@@ -83,6 +71,10 @@ class User < CouchRest::Model::Base
     login
   end
 
+  def email_address
+    LocalEmail.new(login)
+  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
@@ -104,19 +96,13 @@ class User < CouchRest::Model::Base
   #  Validation Functions
   ##
 
-  def email_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"
+  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/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
index 948d847..e96385d 100644
--- a/users/app/views/emails/_email.html.haml
+++ b/users/app/views/emails/_email.html.haml
@@ -1,7 +1,6 @@
-- if email.valid?
-  %li.pull-right
-    %code= email
-    - if params[:action] == 'edit'
-      = link_to(user_email_alias_path(@user, email), :method => :delete) do
-        %i.icon-remove
-  .clearfix
+%li.pull-right
+  %code= email
+  - if params[:action] == 'edit'
+    = link_to(user_email_alias_path(@user, email), :method => :delete) do
+      %i.icon-remove
+.clearfix
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 820b80e..69864e5 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
+    = 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]