From 18433118889123c4f943a5156b8d1046c0f08f77 Mon Sep 17 00:00:00 2001
From: Domizio Demichelis <dd.nexus@gmail.com>
Date: Sun, 19 Dec 2010 13:21:20 -0400
Subject: [PATCH] fix for custom name in user_mailer generator [#882
 state:resolved]

---
 .../hobo/user_mailer/templates/activation.erb |  4 ++--
 .../user_mailer/templates/forgot_password.erb |  4 ++--
 .../hobo/user_mailer/templates/invite.erb     |  4 ++--
 .../hobo/user_mailer/templates/mailer.rb.erb  | 20 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/hobo/lib/generators/hobo/user_mailer/templates/activation.erb b/hobo/lib/generators/hobo/user_mailer/templates/activation.erb
index e76d41c86..3d733286d 100644
--- a/hobo/lib/generators/hobo/user_mailer/templates/activation.erb
+++ b/hobo/lib/generators/hobo/user_mailer/templates/activation.erb
@@ -1,8 +1,8 @@
-<%%= @user %>,
+<%%= @<%= name.underscore -%> %>,
 
 To activate your account for <%%= @app_name %>, click on this link:
 
-  <%%= user_activate_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore -%>_activate_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 
diff --git a/hobo/lib/generators/hobo/user_mailer/templates/forgot_password.erb b/hobo/lib/generators/hobo/user_mailer/templates/forgot_password.erb
index 868f4d5ec..185f21804 100644
--- a/hobo/lib/generators/hobo/user_mailer/templates/forgot_password.erb
+++ b/hobo/lib/generators/hobo/user_mailer/templates/forgot_password.erb
@@ -1,9 +1,9 @@
-<%%= @user %>,
+<%%= @<%= name.underscore -%> %>,
 
 If you have forgotten your password for <%%= @app_name %>, you can choose
 a new one by clicking on this link:
 
-  <%%= <%= name.underscore -%>_reset_password_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore -%>_reset_password_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,
 
diff --git a/hobo/lib/generators/hobo/user_mailer/templates/invite.erb b/hobo/lib/generators/hobo/user_mailer/templates/invite.erb
index 700811776..7b32751c8 100644
--- a/hobo/lib/generators/hobo/user_mailer/templates/invite.erb
+++ b/hobo/lib/generators/hobo/user_mailer/templates/invite.erb
@@ -1,8 +1,8 @@
-<%%= @user %>,
+<%%= @<%= name.underscore %> %>,
 
 You have been invited to join <%%= @app_name %>. If you wish to accept, please click on the following link
 
-  <%%= user_accept_invitation_url :id => @user, :key => @key %>
+  <%%= <%= name.underscore %>_accept_invitation_url :id => @<%= name.underscore %>, :key => @key %>
 
 Thank you,
 
diff --git a/hobo/lib/generators/hobo/user_mailer/templates/mailer.rb.erb b/hobo/lib/generators/hobo/user_mailer/templates/mailer.rb.erb
index 628c990e3..95374e8b7 100644
--- a/hobo/lib/generators/hobo/user_mailer/templates/mailer.rb.erb
+++ b/hobo/lib/generators/hobo/user_mailer/templates/mailer.rb.erb
@@ -1,24 +1,24 @@
 class <%= class_name -%>Mailer < ActionMailer::Base
   default :from => "no-reply@#{host}"
 
-  def forgot_password(user, key)
-    @user, @key = user, key
+  def forgot_password(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
     mail( :subject => "#{app_name} -- forgotten password",
-          :to      => user.email_address )
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% if invite_only? -%>
-  def invite(user, key)
-    @user, @key = user, key
+  def invite(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
     mail( :subject => "Invitation to #{app_name}",
-          :to      => user.email_address )
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% elsif options[:activation_email] %>
-  def activation(user, key)
-    @user, @key = user, key
-    mail :subject => "#{app_name} -- activate",
-         :to      => user.email_address
+  def activation(<%= name.underscore %>, key)
+    @<%= name.underscore %>, @key = <%= name.underscore %>, key
+    mail( :subject => "#{app_name} -- activate",
+          :to      => <%= name.underscore %>.email_address )
   end
 
 <% end -%>