From 28b21959f39b0e28c450bba54b8696632a0187fa Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Dec 2012 11:00:24 +0100
Subject: created generic Email class and use it with EmailAliases

---
 users/app/models/email.rb                      | 9 +++++++++
 users/app/models/email_alias.rb                | 6 ------
 users/app/models/user.rb                       | 4 ++--
 users/app/views/emails/_email.html.haml        | 4 ++++
 users/app/views/users/_email_aliases.html.haml | 8 ++------
 5 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 users/app/models/email.rb
 delete mode 100644 users/app/models/email_alias.rb
 create mode 100644 users/app/views/emails/_email.html.haml

(limited to 'users/app')

diff --git a/users/app/models/email.rb b/users/app/models/email.rb
new file mode 100644
index 0000000..0988d9f
--- /dev/null
+++ b/users/app/models/email.rb
@@ -0,0 +1,9 @@
+class Email
+  include CouchRest::Model::Embeddable
+
+  property :email, String
+
+  def to_s
+    email
+  end
+end
diff --git a/users/app/models/email_alias.rb b/users/app/models/email_alias.rb
deleted file mode 100644
index 25e4b27..0000000
--- a/users/app/models/email_alias.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class EmailAlias
-  include CouchRest::Model::Embeddable
-
-  property :email, String
-  timestamps!
-end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 3ad69c7..fcb211e 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -6,7 +6,7 @@ class User < CouchRest::Model::Base
 
   property :email, String, :accessible => true
   property :email_forward, String, :accessible => true
-  property :email_aliases, [EmailAlias]
+  property :email_aliases, [Email]
 
   validates :login, :password_salt, :password_verifier,
     :presence => true
@@ -77,7 +77,7 @@ class User < CouchRest::Model::Base
 
   def email_aliases_attributes=(attrs)
     if attrs
-      email_alias = EmailAlias.new(attrs.values.first)
+      email_alias = Email.new(attrs.values.first)
       email_aliases << email_alias
     end
   end
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
new file mode 100644
index 0000000..f182ed9
--- /dev/null
+++ b/users/app/views/emails/_email.html.haml
@@ -0,0 +1,4 @@
+%li.pull-right
+  %code= email
+  %i.icon-remove
+.clearfix
diff --git a/users/app/views/users/_email_aliases.html.haml b/users/app/views/users/_email_aliases.html.haml
index 41d4f9e..646480e 100644
--- a/users/app/views/users/_email_aliases.html.haml
+++ b/users/app/views/users/_email_aliases.html.haml
@@ -1,10 +1,6 @@
 .span6
   %ul.unstyled
-    - @user.email_aliases.each do |email_alias|
-      %li.pull-right
-        %code= email_alias.email
-        %i.icon-remove
-      .clearfix
+    =render @user.email_aliases
 .clearfix
-= f.simple_fields_for :email_aliases, EmailAlias.new do |e|
+= f.simple_fields_for :email_aliases, Email.new do |e|
   = e.input :email, :placeholder => "alias@#{request.domain}"
-- 
cgit v1.2.3