From 8a950761d3303a8433748a8c41fe77660912a069 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 22:47:54 +0200
Subject: [PATCH 1/6] configures delayed_jobs

---
 Gemfile                                       |  2 ++
 Gemfile.lock                                  |  8 ++++++
 bin/delayed_job                               |  5 ++++
 config/application.rb                         |  1 +
 config/initializers/delayed_job_config.rb     |  9 +++++++
 .../20150903200440_create_delayed_jobs.rb     | 22 ++++++++++++++++
 db/schema.rb                                  | 26 +++++++++++++++----
 7 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100755 bin/delayed_job
 create mode 100644 config/initializers/delayed_job_config.rb
 create mode 100644 db/migrate/20150903200440_create_delayed_jobs.rb

diff --git a/Gemfile b/Gemfile
index a986bf6e2..753719cf6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -43,6 +43,8 @@ gem 'paranoia'
 gem 'savon'
 gem 'dalli'
 gem 'rollbar', '~> 2.2.1'
+gem 'delayed_job_active_record'
+gem 'daemons'
 
 gem 'ahoy_matey', '~> 1.2.1'
 gem 'groupdate'   # group temporary data
diff --git a/Gemfile.lock b/Gemfile.lock
index 26b825c0d..88fc3f092 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,9 +107,15 @@ GEM
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+    daemons (1.2.3)
     dalli (2.7.4)
     database_cleaner (1.5.0)
     debug_inspector (0.0.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
+      delayed_job (>= 3.0, < 4.1)
     devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -402,8 +408,10 @@ DEPENDENCIES
   ckeditor
   coffee-rails (~> 4.1.0)
   coveralls
+  daemons
   dalli
   database_cleaner
+  delayed_job_active_record
   devise
   email_spec
   factory_girl_rails
diff --git a/bin/delayed_job b/bin/delayed_job
new file mode 100755
index 000000000..edf195985
--- /dev/null
+++ b/bin/delayed_job
@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize
diff --git a/config/application.rb b/config/application.rb
index 8cd17632d..76466329e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,5 +33,6 @@ module Participacion
     # Add lib to the autoload path
     config.autoload_paths << Rails.root.join('lib')
     config.time_zone = 'Madrid'
+    config.active_job.queue_adapter = :delayed_job
   end
 end
diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb
new file mode 100644
index 000000000..e52a95189
--- /dev/null
+++ b/config/initializers/delayed_job_config.rb
@@ -0,0 +1,9 @@
+Delayed::Worker.destroy_failed_jobs = false
+Delayed::Worker.sleep_delay = 2
+Delayed::Worker.max_attempts = 3
+Delayed::Worker.max_run_time = 30.seconds
+Delayed::Worker.read_ahead = 10
+Delayed::Worker.default_queue_name = 'default'
+Delayed::Worker.delay_jobs = !Rails.env.test?
+Delayed::Worker.raise_signal_exceptions = :term
+Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
\ No newline at end of file
diff --git a/db/migrate/20150903200440_create_delayed_jobs.rb b/db/migrate/20150903200440_create_delayed_jobs.rb
new file mode 100644
index 000000000..27fdcf6cc
--- /dev/null
+++ b/db/migrate/20150903200440_create_delayed_jobs.rb
@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, force: true do |table|
+      table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
+      table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
+      table.text :handler,                 null: false # YAML-encoded string of the object that will do work
+      table.text :last_error                           # reason for last failure (See Note below)
+      table.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                        # Set when a client is working on this object
+      table.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string :locked_by                          # Who is working on this object (if locked)
+      table.string :queue                              # The name of the queue this job is in
+      table.timestamps null: true
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d561bcccd..688f20838 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150903155146) do
+ActiveRecord::Schema.define(version: 20150903200440) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -90,8 +90,8 @@ ActiveRecord::Schema.define(version: 20150903155146) do
     t.integer  "author_id"
     t.datetime "created_at",                                          null: false
     t.datetime "updated_at",                                          null: false
-    t.datetime "hidden_at"
     t.string   "visit_id"
+    t.datetime "hidden_at"
     t.integer  "flags_count",                             default: 0
     t.datetime "ignored_flag_at"
     t.integer  "cached_votes_total",                      default: 0
@@ -109,6 +109,22 @@ ActiveRecord::Schema.define(version: 20150903155146) do
   add_index "debates", ["cached_votes_up"], name: "index_debates_on_cached_votes_up", using: :btree
   add_index "debates", ["hidden_at"], name: "index_debates_on_hidden_at", using: :btree
 
+  create_table "delayed_jobs", force: :cascade do |t|
+    t.integer  "priority",   default: 0, null: false
+    t.integer  "attempts",   default: 0, null: false
+    t.text     "handler",                null: false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
+
   create_table "flags", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "flaggable_type"
@@ -200,13 +216,12 @@ ActiveRecord::Schema.define(version: 20150903155146) do
     t.string   "unconfirmed_email"
     t.boolean  "email_on_debate_comment",                 default: false
     t.boolean  "email_on_comment_reply",                  default: false
+    t.string   "phone_number",                 limit: 30
     t.string   "official_position"
     t.integer  "official_level",                          default: 0
     t.datetime "hidden_at"
-    t.string   "phone_number",                 limit: 30
-    t.string   "username"
-    t.datetime "confirmed_hide_at"
     t.string   "sms_confirmation_code"
+    t.string   "username"
     t.string   "document_number"
     t.string   "document_type"
     t.datetime "residence_verified_at"
@@ -218,6 +233,7 @@ ActiveRecord::Schema.define(version: 20150903155146) do
     t.string   "unconfirmed_phone"
     t.string   "confirmed_phone"
     t.datetime "letter_requested_at"
+    t.datetime "confirmed_hide_at"
     t.string   "letter_verification_code"
   end
 

From d0d33cc517dd1fa0704466ddfb28f957495e3f80 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 22:48:29 +0200
Subject: [PATCH 2/6] sends custom emails with delayed jobs

---
 app/controllers/comments_controller.rb           | 4 ++--
 app/controllers/verification/email_controller.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index f07507600..96aecf083 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -8,8 +8,8 @@ class CommentsController < ApplicationController
 
   def create
     if @comment.save
-      Mailer.comment(@comment).deliver_now if email_on_debate_comment?
-      Mailer.reply(@comment).deliver_now if email_on_comment_reply?
+      Mailer.comment(@comment).deliver_later if email_on_debate_comment?
+      Mailer.reply(@comment).deliver_later if email_on_comment_reply?
     else
       render :new
     end
diff --git a/app/controllers/verification/email_controller.rb b/app/controllers/verification/email_controller.rb
index 1c07b1457..cb7542c80 100644
--- a/app/controllers/verification/email_controller.rb
+++ b/app/controllers/verification/email_controller.rb
@@ -16,7 +16,7 @@ class Verification::EmailController < ApplicationController
     @email = Verification::Email.new(@verified_user)
     if @email.save
       current_user.reload
-      Mailer.email_verification(current_user, @email.recipient, @email.encrypted_token).deliver_now
+      Mailer.email_verification(current_user, @email.recipient, @email.encrypted_token).deliver_later
       redirect_to account_path, notice: t('verification.email.create.flash.success', email: @verified_user.email)
     else
       redirect_to verified_user_path, alert: t('verification.email.create.alert.failure')

From 71aaef3805a193a67e0c4513d693379e2e3d2bca Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 22:59:25 +0200
Subject: [PATCH 3/6] sends devise emails with delayed_jobs

---
 Gemfile                             | 1 +
 Gemfile.lock                        | 3 +++
 app/models/user.rb                  | 2 +-
 config/initializers/devise_async.rb | 4 ++++
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/devise_async.rb

diff --git a/Gemfile b/Gemfile
index 753719cf6..805b3ede5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,6 +45,7 @@ gem 'dalli'
 gem 'rollbar', '~> 2.2.1'
 gem 'delayed_job_active_record'
 gem 'daemons'
+gem 'devise-async'
 
 gem 'ahoy_matey', '~> 1.2.1'
 gem 'groupdate'   # group temporary data
diff --git a/Gemfile.lock b/Gemfile.lock
index 88fc3f092..9ade7b204 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,6 +123,8 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    devise-async (0.10.1)
+      devise (~> 3.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
     domain_name (0.5.24)
@@ -413,6 +415,7 @@ DEPENDENCIES
   database_cleaner
   delayed_job_active_record
   devise
+  devise-async
   email_spec
   factory_girl_rails
   faker
diff --git a/app/models/user.rb b/app/models/user.rb
index d03cac6e4..7d6ca2380 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,7 +6,7 @@ class User < ActiveRecord::Base
 
   apply_simple_captcha
   devise :database_authenticatable, :registerable, :confirmable,
-         :recoverable, :rememberable, :trackable, :validatable, :omniauthable
+         :recoverable, :rememberable, :trackable, :validatable, :omniauthable, :async
 
   acts_as_voter
   acts_as_paranoid column: :hidden_at
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
new file mode 100644
index 000000000..efedc8446
--- /dev/null
+++ b/config/initializers/devise_async.rb
@@ -0,0 +1,4 @@
+Devise::Async.setup do |config|
+  config.enabled = true
+  config.backend = :delayed_job
+end
\ No newline at end of file

From a5e7b1b166f32f282690792f8476bb3148531f84 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 23:11:02 +0200
Subject: [PATCH 4/6] disables asynchronous sending of devise emails in test
 env

---
 config/initializers/devise_async.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index efedc8446..81f3743fa 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1,4 +1,8 @@
 Devise::Async.setup do |config|
-  config.enabled = true
+  if Rails.env.test?
+    config.enabled = false
+  else
+    config.enabled = true
+  end
   config.backend = :delayed_job
 end
\ No newline at end of file

From feaf4465f3c32d147279044bebf399a53fcdf3d9 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 23:26:28 +0200
Subject: [PATCH 5/6] adds capistrano tasks and hooks for delayed_jobs

---
 config/deploy.rb                      |  7 ++++-
 lib/capistrano/tasks/delayed_job.rake | 44 +++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 lib/capistrano/tasks/delayed_job.rake

diff --git a/config/deploy.rb b/config/deploy.rb
index 5a8ec62aa..adc38c917 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -27,7 +27,7 @@ set :pty, true
 set :use_sudo, false
 
 set :linked_files, %w{config/database.yml config/secrets.yml}
-set :linked_dirs, %w{log tmp public/system public/assets}
+set :linked_dirs, %w{log tmp public/system public/assets tmp/pids}
 
 set :keep_releases, 5
 
@@ -36,6 +36,9 @@ set :local_user, ENV['USER']
 # Run test before deploy
 set :tests, ["spec"]
 
+set :delayed_job_server_role, :worker
+set :delayed_job_args, "-n 2"
+
 # Config files should be copied by deploy:setup_config
 set(:config_files, %w(
   log_rotation
@@ -55,6 +58,8 @@ namespace :deploy do
   after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
   after :finishing, 'deploy:beta_testers'
   after :finishing, 'deploy:cleanup'
+  # Restart Delayed Job
+  after 'deploy:publishing', 'delayed_job:restart'
   # Restart unicorn
   after 'deploy:publishing', 'deploy:restart'
 end
diff --git a/lib/capistrano/tasks/delayed_job.rake b/lib/capistrano/tasks/delayed_job.rake
new file mode 100644
index 000000000..e134a32c9
--- /dev/null
+++ b/lib/capistrano/tasks/delayed_job.rake
@@ -0,0 +1,44 @@
+namespace :delayed_job do
+
+  def args
+    fetch(:delayed_job_args, "")
+  end
+
+  def delayed_job_roles
+    fetch(:delayed_job_server_role, :app)
+  end
+
+  desc 'Stop the delayed_job process'
+  task :stop do
+    on roles(delayed_job_roles) do
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :bundle, :exec, :'bin/delayed_job', :stop
+        end
+      end
+    end
+  end
+
+  desc 'Start the delayed_job process'
+  task :start do
+    on roles(delayed_job_roles) do
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :bundle, :exec, :'bin/delayed_job', args, :start
+        end
+      end
+    end
+  end
+
+  desc 'Restart the delayed_job process'
+  task :restart do
+    on roles(delayed_job_roles) do
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :bundle, :exec, :'bin/delayed_job', args, :restart
+        end
+      end
+    end
+  end
+
+end
\ No newline at end of file

From 2461ab3c4a274207925fc6e13ccaa038d2eee15f Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Thu, 3 Sep 2015 23:31:14 +0200
Subject: [PATCH 6/6] disables delayed jobs in dev

---
 config/initializers/delayed_job_config.rb | 6 +++++-
 config/initializers/devise_async.rb       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb
index e52a95189..07e961c9d 100644
--- a/config/initializers/delayed_job_config.rb
+++ b/config/initializers/delayed_job_config.rb
@@ -1,9 +1,13 @@
+if Rails.env.test? || Rails.env.development?
+  Delayed::Worker.delay_jobs = false
+else
+  Delayed::Worker.delay_jobs = true
+end
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.sleep_delay = 2
 Delayed::Worker.max_attempts = 3
 Delayed::Worker.max_run_time = 30.seconds
 Delayed::Worker.read_ahead = 10
 Delayed::Worker.default_queue_name = 'default'
-Delayed::Worker.delay_jobs = !Rails.env.test?
 Delayed::Worker.raise_signal_exceptions = :term
 Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
\ No newline at end of file
diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb
index 81f3743fa..47b01e7f4 100644
--- a/config/initializers/devise_async.rb
+++ b/config/initializers/devise_async.rb
@@ -1,5 +1,5 @@
 Devise::Async.setup do |config|
-  if Rails.env.test?
+  if Rails.env.test? || Rails.env.development?
     config.enabled = false
   else
     config.enabled = true