From 669cd8578e86d75e3c140cfc46cfcba57dfe8d83 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 15 Aug 2011 12:35:32 -0700
Subject: [PATCH] scoped invite_user_by_email job into Mail module

---
 app/controllers/invitations_controller.rb        |  2 +-
 app/models/job/invite_user_by_email.rb           | 14 --------------
 app/models/job/mail/invite_user_by_email.rb      | 16 ++++++++++++++++
 .../jobs/{ => mail}/invite_user_by_email_spec.rb |  4 ++--
 4 files changed, 19 insertions(+), 17 deletions(-)
 delete mode 100644 app/models/job/invite_user_by_email.rb
 create mode 100644 app/models/job/mail/invite_user_by_email.rb
 rename spec/models/jobs/{ => mail}/invite_user_by_email_spec.rb (76%)

diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index 145bb2660..d063ef839 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -38,7 +38,7 @@ class InvitationsController < Devise::InvitationsController
         end
       end
 
-      good_emails.each{|e| Resque.enqueue(Job::InviteUserByEmail, current_user.id, e, aspect, message)}
+      good_emails.each{|e| Resque.enqueue(Job::Mail::InviteUserByEmail, current_user.id, e, aspect, message)}
 
       if bad_emails.any?
         flash[:error] = I18n.t('invitations.create.sent') + good_emails.join(', ') + " "+ I18n.t('invitations.create.rejected') + bad_emails.join(', ')
diff --git a/app/models/job/invite_user_by_email.rb b/app/models/job/invite_user_by_email.rb
deleted file mode 100644
index 7f5c0eed5..000000000
--- a/app/models/job/invite_user_by_email.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-
-module Job
-  class InviteUserByEmail < Base
-    @queue = :mail
-    def self.perform(sender_id, email, aspect_id, invite_message)
-      user = User.find(sender_id)
-      user.invite_user(aspect_id, 'email', email, invite_message)
-    end
-  end
-end
diff --git a/app/models/job/mail/invite_user_by_email.rb b/app/models/job/mail/invite_user_by_email.rb
new file mode 100644
index 000000000..6e4275f60
--- /dev/null
+++ b/app/models/job/mail/invite_user_by_email.rb
@@ -0,0 +1,16 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  module Mail
+    class InviteUserByEmail < Base
+      @queue = :mail
+      def self.perform(sender_id, email, aspect_id, invite_message)
+        user = User.find(sender_id)
+        user.invite_user(aspect_id, 'email', email, invite_message)
+      end
+    end
+  end
+end
diff --git a/spec/models/jobs/invite_user_by_email_spec.rb b/spec/models/jobs/mail/invite_user_by_email_spec.rb
similarity index 76%
rename from spec/models/jobs/invite_user_by_email_spec.rb
rename to spec/models/jobs/mail/invite_user_by_email_spec.rb
index a1d04de22..8f3181737 100644
--- a/spec/models/jobs/invite_user_by_email_spec.rb
+++ b/spec/models/jobs/mail/invite_user_by_email_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Job::InviteUserByEmail do
+describe Job::Mail::InviteUserByEmail do
   before do
     @sender = alice
     @email = 'bob@bob.com'
@@ -18,6 +18,6 @@ describe Job::InviteUserByEmail do
 
   it 'calls invite_user with email param' do
     @sender.should_receive(:invite_user).with(@aspect_id, 'email', @email, @message)
-    Job::InviteUserByEmail.perform(@sender.id, @email, @aspect_id, @message)
+    Job::Mail::InviteUserByEmail.perform(@sender.id, @email, @aspect_id, @message)
   end
 end