destinguish user.email from user.email_address

use the former if you want a working email account or nil, the
latter if you want the email address associated with a given
user no matter if the user actually has an email account or not.

2 files changed, 13 insertions, 2 deletions

diff --git a/app/models/anonymous_user.rb b/app/models/anonymous_user.rb
index 360a577..87239eb 100644
--- a/app/models/anonymous_user.rb
+++ b/app/models/anonymous_user.rb
@@ -13,6 +13,10 @@ class AnonymousUser < Object
     nil
   end
 
+  def email
+    nil
+  end
+
   def email_address
     nil
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index a809879..6678de6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -61,12 +61,19 @@ class User < CouchRest::Model::Base
     login
   end
 
-  def email_address
+  # use this if you want to get a working email address only.
+  def email
     if effective_service_level.provides?('email')
-      LocalEmail.new(login)
+      email_address
     end
   end
 
+  # use this if you want the email address associated with a
+  # user no matter if the user actually has a local email account
+  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