summaryrefslogtreecommitdiff
path: root/users/app/models/local_email.rb
diff options
context:
space:
mode:
Diffstat (limited to 'users/app/models/local_email.rb')
-rw-r--r--users/app/models/local_email.rb54
1 files changed, 34 insertions, 20 deletions
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