Send emails as delayed job

5 files changed, 23 insertions, 5 deletions

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 47544b3..d477e26 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -149,12 +149,12 @@ class Answer < ActiveRecord::Base
   protected
     # Sends email notification about new answer to mentor of owner
     def notify_new_answer
-      UserMailer.deliver_new_answer(owner.mentor, self) unless owner._?.mentor.nil?
+      UserMailer.send_later(:deliver_new_answer, owner.mentor, self) unless owner._?.mentor.nil?
     end
 
     # Sends email notification about changed answer to mentor of owner
     def notify_changed_answer
-      UserMailer.deliver_changed_answer(owner.mentor, self) unless owner._?.mentor.nil?
+      UserMailer.send_later(:deliver_changed_answer, owner.mentor, self) unless owner._?.mentor.nil?
     end
 
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 83d5f9f..c10a8f2 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -47,6 +47,6 @@ class Comment < ActiveRecord::Base
   protected
     # Sends notification about new comment to owner of mentor
     def notify_new_comment
-      UserMailer.deliver_new_comment(answer.owner, self)
+      UserMailer.send_later(:deliver_new_comment, answer.owner, self)
     end
 end
diff --git a/app/models/email_answer.rb b/app/models/email_answer.rb
index f1bd4a5..ffec1ac 100644
--- a/app/models/email_answer.rb
+++ b/app/models/email_answer.rb
@@ -36,7 +36,7 @@ class EmailAnswer < Answer
     question      = Question.first :conditions => { :id => subject.captures[0] }
 
     if(question.nil? || !question.content.is_a?(QuestionContentEmail))
-      UserMailer.deliver_unrecognized_email(user, email)
+      UserMailer.send_later(:deliver_unrecognized_email, user, email)
       return
     end
 
diff --git a/app/models/job.rb b/app/models/job.rb
new file mode 100644
index 0000000..7afa6f7
--- /dev/null
+++ b/app/models/job.rb
@@ -0,0 +1,18 @@
+# Don't use this class.
+#
+# Only purpose of this class is to let hobo_migration generator know that it
+# should create delayed_jobs table.
+class Job < ActiveRecord::Base
+  set_table_name "delayed_jobs"
+  fields do
+    priority    :integer, :default => 0
+    attempts    :integer, :default => 0
+    handler     :text
+    last_error  :string
+    run_at      :datetime
+    locked_at   :datetime
+    failed_at   :datetime
+    locked_by   :string
+    timestamps
+  end
+end
diff --git a/app/models/question.rb b/app/models/question.rb
index 294e03e..c377d5e 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -186,7 +186,7 @@ class Question < ActiveRecord::Base
       # If question category isn't assigned don't try to access it
       if question_category && approved
         for user in question_category.users
-          UserMailer.deliver_new_question user, self
+          UserMailer.send_later(:deliver_new_question, user, self)
         end
       end
     end