11 files changed, 79 insertions, 112 deletions
diff --git a/users/app/designs/user/by_email_alias.js b/users/app/designs/user/by_alias.js
index dc8021a..dc8021a 100644
--- a/users/app/designs/user/by_email_alias.js
+++ b/users/app/designs/user/by_alias.js
diff --git a/users/app/designs/user/by_email_or_alias.js b/users/app/designs/user/by_login_or_alias.js
index 2e5d0a8..2d2096c 100644
--- a/users/app/designs/user/by_email_or_alias.js
+++ b/users/app/designs/user/by_login_or_alias.js
@@ -2,9 +2,7 @@ function(doc) {
   if (doc.type != 'User') {
     return;
   }
-  if (doc.email) {
-    emit(doc.login, 1);
-  }
+  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]
diff --git a/users/test/unit/email_aliases_test.rb b/users/test/unit/email_aliases_test.rb
index e3f060d..86d14aa 100644
--- a/users/test/unit/email_aliases_test.rb
+++ b/users/test/unit/email_aliases_test.rb
@@ -4,9 +4,9 @@ class EmailAliasTest < ActiveSupport::TestCase
 
   setup do
     @user = FactoryGirl.build :user
-    @other_user = FactoryGirl.build :user
-    @alias = "valid_alias@#{APP_CONFIG[:domain]}"
-    User.find_by_email_or_alias(@alias).try(:destroy)
+    @alias = "valid_alias"
+    # make sure no existing records are in the way...
+    User.find_by_login_or_alias(@alias).try(:destroy)
   end
 
   test "no email aliases set in the beginning" do
@@ -17,13 +17,13 @@ class EmailAliasTest < ActiveSupport::TestCase
     @user.attributes = {:email_aliases_attributes => {"0" => {:email => @alias}}}
     assert @user.changed?
     assert @user.save
-    assert_equal @alias, @user.email_aliases.first.to_s
+    assert_equal @alias, @user.email_aliases.first.username
   end
 
   test "adding email alias directly" do
     @user.email_aliases.build :email => @alias
     assert @user.save
-    assert_equal @alias, @user.reload.email_aliases.first.to_s
+    assert_equal @alias, @user.email_aliases.first.username
   end
 
   test "duplicated email aliases are invalid" do
@@ -32,29 +32,29 @@ class EmailAliasTest < ActiveSupport::TestCase
     assert_invalid_alias @alias
   end
 
-  test "email alias needs to be different from other peoples email" do
-    @other_user.email = @alias
-    @other_user.save
+  test "email alias needs to be different from other peoples login" do
+    other_user = FactoryGirl.create :user, :login => @alias
     assert_invalid_alias @alias
+    other_user.destroy
   end
 
   test "email needs to be different from other peoples email aliases" do
-    @other_user.email_aliases.build :email => @alias
-    @other_user.save
+    other_user = FactoryGirl.create :user, :email_aliases_attributes => {'1' => @alias}
     assert_invalid_alias @alias
+    other_user.destroy
   end
 
-  test "email is invalid as email alias" do
-    @user.email = @alias
+  test "login is invalid as email alias" do
+    @user.login = @alias
     assert_invalid_alias @alias
   end
 
   test "find user by email alias" do
     @user.email_aliases.build :email => @alias
     assert @user.save
-    assert_equal @user, User.find_by_email_or_alias(@alias)
-    assert_equal @user, User.find_by_email_alias(@alias)
-    assert_nil User.find_by_email(@alias)
+    assert_equal @user, User.find_by_login_or_alias(@alias)
+    assert_equal @user, User.find_by_alias(@alias)
+    assert_nil User.find_by_login(@alias)
   end
 
   def assert_invalid_alias(string)
diff --git a/users/test/unit/email_test.rb b/users/test/unit/email_test.rb
deleted file mode 100644
index d7ef1f8..0000000
--- a/users/test/unit/email_test.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'test_helper'
-
-class EmailTest < ActiveSupport::TestCase
-
-  setup do
-    @user = FactoryGirl.build :user
-    @other_user = FactoryGirl.build :user
-    @email_string = "valid_alias@#{APP_CONFIG[:domain]}"
-    User.find_by_email_or_alias(@email_string).try(:destroy)
-  end
-
-  teardown do
-    @user.destroy if @user.persisted? # just in case
-    @other_user.destroy if @other_user.persisted?
-  end
-
-  test "email needs to be different from other peoples email" do
-    @other_user.email = @email_string
-    @other_user.save
-    assert_invalid_email @email_string
-  end
-
-  test "email needs to be different from other peoples email aliases" do
-    @other_user.email_aliases.build :email => @email_string
-    @other_user.save
-    assert_invalid_email @email_string
-  end
-
-  test "email needs to be different from email aliases" do
-    @user.email_aliases.build :email => @email_string
-    @user.save
-    assert_invalid_email @email_string
-  end
-
-  test "non local emails are invalid" do
-    assert_invalid_email "not_valid@mail.me"
-  end
-
-  test "local emails are valid" do
-    local_email = "valid@#{APP_CONFIG[:domain]}"
-    @user.email = local_email
-    @user.valid?
-    assert_equal Hash.new, @user.errors.messages
-  end
-
-  test "find user by email" do
-    email = "finding@test.me"
-    @user.email = email
-    @user.save
-    assert_equal @user, User.find_by_email(email)
-    assert_equal @user, User.find_by_email_or_alias(email)
-    assert_nil User.find_by_email_alias(email)
-  end
-
-  def assert_invalid_email(string)
-    @user.email = string
-    assert !@user.valid?
-    assert @user.errors.keys.include?(:email)
-  end
-
-end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index 917728b..66563a3 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -57,4 +57,18 @@ class UserTest < ActiveSupport::TestCase
     assert @user.is_admin?
   end
 
+  test "login needs to be unique" do
+    other_user = FactoryGirl.create :user, login: @user.login
+    assert !@user.valid?
+    other_user.destroy
+  end
+
+  test "login needs to be different from other peoples email aliases" do
+    other_user = FactoryGirl.create :user
+    other_user.email_aliases.build :email => @user.login
+    other_user.save
+    assert !@user.valid?
+    other_user.destroy
+  end
+
 end