sidekiq_send_mail 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d107eefbbf2a9cacf18e13cb81d8e36b20c62d
-  data.tar.gz: 3d4ec0176deac87fd515c1b59a5018e02f622d10
+  metadata.gz: 524e89d02202c37fd537e3a1037380d5a692cd05
+  data.tar.gz: ace67d8fbc416ca546649a82b2c0db84699a3286
 SHA512:
-  metadata.gz: 7b417ccc96eb4b0df985141db7d85b388e24ed96afa5542d0390eda5a981b85494327cb81cab646e9b00cc08002b0ce8c50bbbacf7250037d9a82b67bef1f72f
-  data.tar.gz: 86c5224ebb3c1aca94d99c4b7cc320896a1ae292a9b26c10677da4bb6960a4db8346cf88b6ad075e9cf3262c639adbc18a977056bf8e96b28602a63e5d1fd522
+  metadata.gz: 993a321dd74c39193d3d9af3bcd2e088a5fdd8b7a5db214deb4127865493a71b002dfa658ca3e4c8b561bdf3cee8223a89f6fde583e76df40ff527dc5beda562
+  data.tar.gz: f9c433c43d268c5c0760c94a2fefebffde2ee38e1f802aa44fa15e6059f0b3faabcdaee28c62b6226bb13627f4c8b0b6d09a3d1acaaabb1dd8429e2c32caa401

data/Rakefile

@@ -4,7 +4,7 @@ require 'bundler/gem_tasks'
 # Default directory to look in is `/specs`
 # Run with `rake spec`
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format', 'nested']
+  task.rspec_opts = ['--color', '--format', 'documentation']
 end
 
 task :default => :spec

data/app/workers/sidekiq_send_mail.rb

@@ -1,12 +1,5 @@
 module SidekiqSendMail
   class Worker
-    include Sidekiq::Worker
-    sidekiq_options queue: :emails, retry: 0, backtrace: true
-
-    sidekiq_retry_in do |count|
-      60 * 1440 * 30 # 30 days
-    end
-
     def perform(mail_yaml)
       m = ::Mail::Message.from_yaml mail_yaml
       m.deliver

data/bin/sk_send_mail

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
 #$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-puts `bundle exec sidekiq -i 1 -r #{File.expand_path './lib/sidekiq_send_mail.rb'} -c 1 -t 20 -q emails -P sidekiq-emails.pid`
+puts `sidekiq -d -i 1 -r #{File.expand_path '../../lib/sidekiq_send_mail.rb', __FILE__} -c 1 -t 20 -q emails -P /tmp/sidekiq-emails.pid -L /tmp/sidekig-log.log`

data/config/application.rb

@@ -4,17 +4,4 @@ require 'boot'
 
 Bundler.require :default, ENV['RACK_ENV'] if defined?(Bundler) #unless $0 == 'irb'
 
-require 'sidekiq'
-
-# check if running inside Sidekiq worker process
-load_workers = defined?(Sidekiq::CLI) || defined?(Sidekiq::Testing) ? true : false
-
-puts "SidekiqSendMail - check if should load worker - #{load_workers}"
-if load_workers
-  require 'mail'
-  Dir[File.expand_path('../../app/**/*.rb', __FILE__)].each { |f| require f }
-end
-
-if defined?(ActionMailer)
-  require File.expand_path('../../lib/mail_interceptor.rb', __FILE__)
-end
+require 'sidekiq'

data/lib/mail_interceptor.rb

@@ -2,7 +2,7 @@ module SidekiqSendMail
   class MailInterceptor
     def self.delivering_email(message)
       unless deliver?(message)
-        Sidekiq::Client.push 'queue' => 'emails', 'class' => 'SidekiqSendMail::Worker', 'args' => [message.to_yaml]
+        SidekiqSendMail::Worker.perform_async message.to_yaml
         message.perform_deliveries = false
         puts "Mail routed to Sidekiq (#{message.subject})!"
       end

data/lib/sidekiq_send_mail.rb

@@ -2,4 +2,29 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'config'))
 require File.expand_path('../../config/environment', __FILE__)
 
 module SidekiqSendMail
+  # Stub out this worker for queuing and testing purposes
+  class Worker
+    include Sidekiq::Worker
+    sidekiq_options queue: :emails, retry: 0, backtrace: true
+
+    sidekiq_retry_in do |count|
+      60 * 1440 * 30 # 30 days
+    end
+  end
+
+  def self.enable_worker!
+    require 'mail'
+    Dir[File.expand_path('../../app/**/*.rb', __FILE__)].each { |f| require f }
+  end
 end
+
+# check if running inside Sidekiq worker process
+load_workers = !!defined?(Sidekiq::CLI)
+
+puts "SidekiqSendMail - check if should load worker - #{load_workers}"
+SidekiqSendMail::enable_worker! if load_workers
+
+if defined?(ActionMailer)
+  require File.expand_path('../../lib/mail_interceptor.rb', __FILE__)
+end
+

data/sidekiq_send_mail.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path('../lib', __FILE__)
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = 'sidekiq_send_mail'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.authors     = ['Paul Geraghty']
   s.email       = 'muse@appsthatcould.be'
   s.homepage    = 'https://github.com/pgeraghty/sidekiq_send_mail'
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '>= 0'
   s.add_development_dependency 'rspec', '>= 0'
   s.add_development_dependency 'rails', '>= 3.2'
+  s.add_development_dependency 'coveralls', '>= 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_send_mail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paul Geraghty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -92,6 +92,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Render mail then send it in the background with Sidekiq with or without
   Rails.
 email: muse@appsthatcould.be