summaryrefslogtreecommitdiff
path: root/users/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'users/app/models')
-rw-r--r--users/app/models/email.rb17
-rw-r--r--users/app/models/local_email.rb32
-rw-r--r--users/app/models/remote_email.rb14
-rw-r--r--users/app/models/user.rb15
4 files changed, 47 insertions, 31 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 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