unit tests passing

1 files changed, 15 insertions, 17 deletions

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