summaryrefslogtreecommitdiff
path: root/users/app/models
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-01-17 22:45:39 -0800
committerazul <azul@riseup.net>2013-01-17 22:45:39 -0800
commit168c36b578d675c99aad62a350aa68cc1b6d1316 (patch)
treecd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /users/app/models
parent19d563e2e2db98ecc5143229f554df6a09bc457e (diff)
parent27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (diff)
Merge pull request #18 from leapcode/feature/fixed-email-address
make email address just login@domain.tld
Diffstat (limited to 'users/app/models')
-rw-r--r--users/app/models/email.rb17
-rw-r--r--users/app/models/local_email.rb54
-rw-r--r--users/app/models/remote_email.rb14
-rw-r--r--users/app/models/user.rb40
4 files changed, 71 insertions, 54 deletions
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