mail_manager 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjliMjdlY2MyOGQ4ODI0ZjJmOGE4YzRhNGMwZjA4NjM0MmY3NDAyZA==
+    ZTQ5N2Y1YTdkZDMzODU3Mjc1ZjRkYjMxMjE1M2QyN2E3MmZjMWY2OQ==
   data.tar.gz: !binary |-
-    OGY4MTA0NWE0NmM0NDllNzA1NWZlOTcxNjBlYWZiYzQzYmRjNmRjZg==
+    NDZhYTgxNmI3MTcxY2RkYmQzNDcyMGIxNDdhOTJjM2YxZWU2Mjk5OQ==
 SHA512:
   metadata.gz: !binary |-
-    NWY3NjJkMDdhMTdjYzc1OTQ4OTE1ODRlYjMyNGM4NTlkNjY5YTg2NDY1ZjEy
-    YmFmZmQ4NTU3NDY1ZWY3NDBhN2IzZmI3ZjczZGE1NDQ5M2UwMTU1MmVmNWEw
-    YTE1ZWMwZTljMGViNDQ4NGQ3OWRlNzVmODliMmFhZjdkYTA2OTQ=
+    N2VhZTliNGYwY2YyZjQ0MTc5ZDY3M2FiNzhhMGFiMjdjOTI3NjEwM2IyNTNh
+    MzZjY2MwNGE0MDE1ZWRlZDQ0ODIzNzlhNmVjMjAzODdlMmNlZWE1YzhlYjNh
+    NTdmOWRmNDg4Y2FiNGYxZjM4MDY5YzUzZmYxMDkzZjA3N2U2M2U=
   data.tar.gz: !binary |-
-    ZTQ1YmVjODdjMWEyYmE0MmYzMzA2YjlkN2MxNTk3NWEyNjdjOWNkY2M4MGEx
-    ODNhNGI4MTQxNDgwMDY4ZjM4YWY2MDYyY2U4NjFkYjM1MmNjOWE5OTg0MmI3
-    NzNkNGYwMjY0NDJkN2NlMGIxZDVhOTZlOTEzMGVmMGMzNTUxNTg=
+    Njg2OWE3ZWMwNmM0YTZhM2U5NDg2NWE1MGQxNzUzNmY4MTY0MzgyYzUxZDE0
+    YjRhNmExMWU4NTllMDY5OTFjZmM0YzExZDUxNDY1ZGM2YWNhYmZhNmMzZmQw
+    YjdlOGUyZjM5OGY5ZTVhZjc5Y2M3ZDQ0MDQxZjQ4NzcxODhkODU=

data/config/initializers/delayed_job.rb

@@ -1,14 +1,17 @@
-require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','status')
-require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','repeating_job')
-require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','status_job')
-require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','persistent_job')
-require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','mailer')
-
-# config/initializers/delayed_job_config.rb
-Delayed::Worker.destroy_failed_jobs = false
-Delayed::Worker.sleep_delay = 60
-Delayed::Worker.max_attempts = 1
-Delayed::Worker.max_run_time = 5.minutes
-Delayed::Worker.read_ahead = 10
-Delayed::Worker.delay_jobs = !Rails.env.test?
-Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
+require 'delayed_job_active_record'
+if defined?(::Delayed::Job)
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','status')
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','repeating_job')
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','status_job')
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','persistent_job')
+  require File.join(MailManager::PLUGIN_ROOT,'lib','delayed','mailer')
+  
+  # config/initializers/delayed_job_config.rb
+  Delayed::Worker.destroy_failed_jobs = false
+  Delayed::Worker.sleep_delay = 60
+  Delayed::Worker.max_attempts = 1
+  Delayed::Worker.max_run_time = 5.minutes
+  Delayed::Worker.read_ahead = 10
+  Delayed::Worker.delay_jobs = !Rails.env.test?
+  Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
+end

data/lib/delayed/persistent_job.rb

@@ -1,4 +1,4 @@
-module Delayed
+module ::Delayed
   class PersistentJob < Job
     # Try to run job. Returns true/false (work done/work failed)
     @@destroy_failed_jobs = false

data/lib/delayed/repeating_job.rb

@@ -1,5 +1,6 @@
-module Delayed
-  class RepeatingJob < Job
+require 'delayed_job'
+module ::Delayed
+  class RepeatingJob < ::Delayed::Job
     def repeats_every
       (@repeats_every ||= payload_object.repeats_every || 1.minutes) rescue 1.minutes
     end

data/lib/delayed/status.rb

@@ -1,9 +1,9 @@
-module Delayed
+module ::Delayed
   class StatusException < Exception
   end
   class Status
     def self.ok?(overdue=15.minutes)
-      job = Delayed::StatusJob.first || Delayed::StatusJob.enqueue(::StatusJob.new)
+      job = ::Delayed::StatusJob.first || ::Delayed::StatusJob.enqueue(::Delayed::StatusJob.new)
       elapsed_time = (Time.now - job.updated_at).to_i
       raise(::Delayed::StatusException, "Rails3 Status job has failed at #{job.failed_at} with message: #{job.last_error}") if job.failed?
       raise(::Delayed::StatusException, "Rails3 Status job hasn't run for #{elapsed_time} seconds") if elapsed_time > overdue

data/lib/delayed/status_job.rb

@@ -16,8 +16,8 @@
 #     end
 #   end
 # end
-class Delayed::StatusJob < Delayed::Job
+class ::Delayed::StatusJob < ::Delayed::Job
   def perform
-    Delayed::StatusJob.enqueue ::StatusJob.new, run_at: 1.minute.from_now
+    ::Delayed::StatusJob.enqueue ::Delayed::StatusJob.new, run_at: 1.minute.from_now
   end
 end

data/lib/mail_manager/engine.rb

@@ -39,7 +39,13 @@ module MailManager
 end
 MailManager::Engine.config.to_prepare do
   ApplicationController.helper(MailManager::SubscriptionsHelper)
-  load File.join(MailManager::PLUGIN_ROOT,'config','initializers','delayed_job.rb')
   load File.join(MailManager::PLUGIN_ROOT,'lib','mail_manager','lock.rb')
+  begin
+    require 'delayed_job'
+    defined?(::Delayed::Job) or die "Cannot load Delayed::Job object!"
+    load File.join(MailManager::PLUGIN_ROOT,'config','initializers','delayed_job.rb')
+  rescue NameError => e
+  rescue LoadError => le
+  end
 end
 require 'will_paginate'

data/lib/mail_manager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tasks/mail_manager.rake

@@ -107,7 +107,7 @@ namespace :mail_manager do
 
   desc "Create Delayed Jobs for Mail Mgr"
   task :create_delayed_jobs  do
-    Delayed::RepeatingJob.enqueue(MailManager::BounceJob.new(15.minutes))
+    ::Delayed::RepeatingJob.enqueue(MailManager::BounceJob.new(15.minutes))
   end
 
   desc "Create Groups and Users"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mail_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lone Star Internet