From 26c090439def7699e00ff1949c8b6afd4e6ebe08 Mon Sep 17 00:00:00 2001
From: Rafael George <george.rafael@gmail.com>
Date: Thu, 3 Oct 2013 17:06:14 -0400
Subject: [PATCH 1/2] Refactor: Topic#invite_by_email

Extract Topic#email_already_existas_for? and Topic#grant_permission_to_user
---
 app/models/topic.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index 33b3160e391..b5c95d9ceaf 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -426,11 +426,7 @@ class Topic < ActiveRecord::Base
       invite = Invite.create(invited_by: invited_by, email: lower_email)
       unless invite.valid?
 
-        # If the email already exists, grant permission to that user
-        if invite.email_already_exists and private_message?
-          user = User.where(email: lower_email).first
-          topic_allowed_users.create!(user_id: user.id)
-        end
+        grant_permission_to_user if email_already_exists_for?(invite)
 
         return
       end
@@ -444,6 +440,15 @@ class Topic < ActiveRecord::Base
     invite
   end
 
+  def email_already_exists_for?(invite)
+    invite.email_already_exists and private_message?
+  end
+
+  def grant_permission_to_user
+    User.where(email: lower_email).first
+    topic_allowed_users.create!(user_id: user.id)
+  end
+
   def max_post_number
     posts.maximum(:post_number).to_i
   end

From 622ffddbb8aedd0b853510fb04be53fc852ad2f6 Mon Sep 17 00:00:00 2001
From: Rafael George <george.rafael@gmail.com>
Date: Fri, 4 Oct 2013 12:18:07 -0400
Subject: [PATCH 2/2] Fix failing spec due to missing variable in extracted
 method

---
 app/models/topic.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/topic.rb b/app/models/topic.rb
index b5c95d9ceaf..9d01bd55fc0 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -426,7 +426,7 @@ class Topic < ActiveRecord::Base
       invite = Invite.create(invited_by: invited_by, email: lower_email)
       unless invite.valid?
 
-        grant_permission_to_user if email_already_exists_for?(invite)
+        grant_permission_to_user(lower_email) if email_already_exists_for?(invite)
 
         return
       end
@@ -444,8 +444,8 @@ class Topic < ActiveRecord::Base
     invite.email_already_exists and private_message?
   end
 
-  def grant_permission_to_user
-    User.where(email: lower_email).first
+  def grant_permission_to_user(lower_email)
+    user = User.where(email: lower_email).first
     topic_allowed_users.create!(user_id: user.id)
   end