mandrill_queue 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 999107f1638f9646e86aa8e1524fa3a127d0dbdd
-  data.tar.gz: 4fe4219adb5e5eed2686bc78b502761d6b4a8083
+  metadata.gz: d51589640920eb3e6f0adc4a4216b56bf018a6a3
+  data.tar.gz: 734ac1825282bd142a07b3206341cf5092ff6ddc
 SHA512:
-  metadata.gz: f16991503ca10ef819f196cce0d0e38b9f364813303f6d822acbe50294b280d1570d8a72f15f7f083cde388deb431b466c964f7be94af54d3236648ff820e808
-  data.tar.gz: d9e669df1f6d28521d4a715fbd5aa80348fcce6ab1c5c378e204febd4238a2f1b8c0cfb0e7c134edbaa408b77f02d82835026e9a14f3bfbff890e85c5146c34d
+  metadata.gz: 18e64f5f2569a7a647f82b28496aa1a3a29536a5f39ffbe94903db5c0732434094b55d228f01a268db91ad76f17a8f5ffcc3b347c74874efc110200c5d7cca30
+  data.tar.gz: f8c468c62f2761a70ccfa63d80fb692770619d8a1f8626383216a32bf32d506938b1baa2a1956408d4d93d4797b0de39202981837f5f8829330481e17ddf28c1

data/Gemfile

@@ -23,5 +23,5 @@ platforms :rbx do
 end
 
 # group :development, :test do
-#   gem 'debugger', platform: :ruby
+#   gem 'pry-byebug', platform: :ruby
 # end

data/README.md

@@ -117,7 +117,9 @@ This can be added anywhere like a Rails controller or Sinatra endpoint.
 
 You probably already know this bit:
 
-    gem 'resque' # Support for Sidekiq and writing custom adapters coming soon...
+    gem 'sidekiq' 
+    # or
+    # gem 'resque'
     gem 'mandrill_queue'
 
 but didn't know this (but it's optional):
@@ -149,6 +151,7 @@ but here's a taster:
         # NEEDED FOR WORKER ONLY
         # Mandrill api key needed for worker only
         config.api_key = 'xxxxxx'
+        config.adapter = MyQueueAdapter # or just :sidekiq / :resque
         config.default_worker_class = MyWorker
         config.default_queue = :hipster_queue
 end
@@ -221,8 +224,9 @@ end
 
 ## TODO
 
-1. Render ActionView views to mailers.
-2. Allow synchonous sending.
+1. NB! Change DSL to pass in arguments to blocks so that the class context is still accessible within them.
+2. Render ActionView views to mailers.
+3. Allow synchonous sending.
 
 ## Contributing
 

data/lib/mandrill_queue/adapters/resque_adapter.rb

@@ -1,8 +1,21 @@
 module MandrillQueue
   module Adapters
     class ResqueAdapter
-      def enqueue_to(queue, klass, *args)
-        ::Resque.enqueue_to(queue, klass, *args)
+      def enqueue_to(queue, klass, options, *args)
+        if options.key?(:send_at)
+          check_for_scheduler!
+          Resque.enqueue_at_with_queue(queue, options[:send_at], klass, *args)
+        elsif options.key?(:send_in)
+          check_for_scheduler!
+          Resque.enqueue_in_with_queue(queue, options[:send_in], klass, *args)
+        else
+          ::Resque.enqueue_to(queue, klass, *args)
+        end
+      end
+
+      def check_for_scheduler!
+        raise RuntimeError, "Please install resque-scheduler to allow scheduled jobs!" \
+          unless ::Resque.respond_to?(:enqueue_in)
       end
     end
   end

data/lib/mandrill_queue/adapters/sidekiq_adapter.rb

@@ -1,8 +1,16 @@
 module MandrillQueue
   module Adapters
     class SidekiqAdapter
-      def enqueue_to(queue, klass, *args)
-        ::Sidekiq::Client.enqueue_to(queue, klass, *args)
+      def enqueue_to(queue, klass, options, *args)
+        client = ::Sidekiq::Client
+
+        if options.key?(:send_at)
+          client.enqueue_to_in(queue, options[:send_at], klass, *args)
+        elsif options.key?(:send_in)
+          client.enqueue_to_in(queue, options[:send_in], klass, *args)
+        else
+          client.enqueue_to(queue, klass, *args)
+        end
       end
     end
   end

data/lib/mandrill_queue/configuration.rb

@@ -1,7 +1,7 @@
 module MandrillQueue
 	class Configuration
 		ACCESSORS = [:message_defaults, :resque, :default_worker_class,
-							 :default_queue, :api_key, :logger, :adapter]
+							 :default_queue, :api_key, :logger, :adapter, :adapter_options]
 		attr_accessor(*ACCESSORS)
 
 		def initialize(defaults = {}, &block)

data/lib/mandrill_queue/mailer.rb

@@ -81,6 +81,7 @@ module MandrillQueue
 
 		def initialize(values = nil)
 			set!(values) unless values.nil?
+      @_adapter_options = self.class.configuration.adapter_options || {}
 		end
 
 		def reset!
@@ -133,9 +134,14 @@ module MandrillQueue
 
 		def deliver
 			validate!
-			MandrillQueue.adapter.enqueue_to(queue, worker_class, to_hash)
+			MandrillQueue.adapter.enqueue_to(queue, worker_class, adapter_options, to_hash)
 		end
 
+    def adapter_options(options = nil)
+      @_adapter_options.merge!(options) unless options.nil?
+      @_adapter_options ||= {}
+    end
+
 		def to_hash(options = {})
 			hash = {}
 			ACCESSORS.each do |key|
@@ -145,7 +151,7 @@ module MandrillQueue
 
 			hash[:message] = message.to_hash(options) rescue nil if !@_message.nil? || options[:include_nils]
 			hash[:content] = content.to_key_value_array(options) rescue nil if !@_content.nil? || options[:include_nils]
-			hash
+      hash
 		end
 
 		def set!(hash)

data/lib/mandrill_queue/version.rb

@@ -1,3 +1,3 @@
 module MandrillQueue
-	VERSION = '0.2.5'
+	VERSION = '0.2.6'
 end

data/lib/mandrill_queue.rb

@@ -5,6 +5,8 @@ require 'mandrill_queue/configuration'
 require 'mandrill_queue/mailer'
 
 module MandrillQueue
+  @@lock = Mutex.new
+
 	def self.configuration
 		@configuration ||= Configuration.new(defaults)
 	end
@@ -33,18 +35,20 @@ module MandrillQueue
   end
 
   def self.adapter
-    @_adapter ||= begin
-      unless adapter = configuration.adapter
-        adapter = :resque if defined(::Resque)
-        adapter = :sidekiq if defined(::Sidekiq)
-        if adapter.nil?
-          raise RuntimeError, <<-TXT.strip.tr("\t", '')
-            Worker adapter was not configured and cannot be determined.
-            Please include a worker gem in your Gemfile. Resque and Sidekiq are supported.
-          TXT
+    @@lock.synchronize do
+      @_adapter ||= begin
+        unless adapter = configuration.adapter
+          adapter = :resque if defined(::Resque)
+          adapter = :sidekiq if defined(::Sidekiq)
+          if adapter.nil?
+            raise RuntimeError, <<-TXT.strip.tr("\t", '')
+              Worker adapter was not configured and cannot be determined.
+              Please include a worker gem in your Gemfile. Resque and Sidekiq are supported.
+            TXT
+          end
         end
+        load_adapter(adapter)
       end
-      load_adapter(adapter)
     end
   end
 

data/lib/rails/generators/mandrill_queue/templates/initializer.rb

@@ -41,4 +41,9 @@ MandrillQueue.configure do |config|
 	# Used to set the current logger. This can be any object
 	# that responds to debug, info, warn, error and fatal
 	# config.logger = MyLoggingClass
+  #
+  # Default options passed through to the queue adapter
+  # These options can mean different things depending on
+  # which adapter you choose.
+  # config.adapter_options = {}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mandrill_queue
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Stan Bondi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport