qe 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc9d27dd577ce5164a2d8f785bbd0444461dfeb
-  data.tar.gz: a9baded0b5e1978af43a46430a6fa4aa7948ce56
+  metadata.gz: b2b51561f2d0b2049401a673a8d2742b81afa42e
+  data.tar.gz: 042ff83f3a95c09ee581eea21b82793304e19857
 SHA512:
-  metadata.gz: 7bf8d75c482e0617a79986acdb41a4718e2e83b20d30e1504de4211a1a4783478a95291ff036de1fca3f07f5acaea05deaa68fd6ee540eda1f7b0e6cd9a5bc6c
-  data.tar.gz: b0d02d51692709520bfecca71e796898acd20d280c3408ece0cc13e2e9a84b16f8734bf16228cc23ae2282ae7c983620d521f1232a5aea1362faf40a9b0d1cba
+  metadata.gz: c2fa0a4118dd9a201648aff7fa0a82e503fad9ae6f51441d1954e1fa3d6d68fa0630289758c0b05b13cb8e00434bae30b50d48c93aa994cc5af814e42ca85b72
+  data.tar.gz: ef8a1bcb96c133cabf80132b141f13bdeb3d7ef6ce03041c6b854a6ad693b51082f01641f5650ea898bb4850c3dcb456068544e8bb9ac586fb39110b23e1eaa4

data/Gemfile.lock

@@ -1,90 +1,91 @@
 PATH
   remote: .
   specs:
-    qe (0.3.5)
+    qe (0.4.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    awesome_print (1.2.0)
-    backburner (0.4.5)
+    arel (6.0.0)
+    awesome_print (1.6.1)
+    backburner (0.4.6)
       beaneater (~> 0.3.1)
       dante (~> 0.1.5)
-    beaneater (0.3.2)
+    beaneater (0.3.3)
     builder (3.2.2)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
     coderay (1.1.0)
-    connection_pool (2.0.0)
+    connection_pool (2.1.1)
     dante (0.1.5)
-    delayed_job (4.0.1)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.1)
-      activerecord (>= 3.0, < 4.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)
     diff-lcs (1.2.5)
-    i18n (0.6.9)
-    json (1.8.1)
+    hitimes (1.2.2)
+    i18n (0.7.0)
+    json (1.8.2)
     method_source (0.8.2)
-    minitest (5.3.4)
+    minitest (5.5.1)
     mono_logger (1.1.0)
     multi_json (1.10.1)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     qu (0.2.0)
       multi_json
-    rack (1.5.2)
+    rack (1.6.0)
     rack-protection (1.5.3)
       rack
-    rake (10.3.2)
-    redis (3.0.7)
-    redis-namespace (1.4.1)
-      redis (~> 3.0.4)
+    rake (10.4.2)
+    redis (3.2.0)
+    redis-namespace (1.5.1)
+      redis (~> 3.0, >= 3.0.4)
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (3.0.0)
+    resque-scheduler (4.0.0)
       mono_logger (~> 1.0)
       redis (~> 3.0)
       resque (~> 1.25)
-      rufus-scheduler (~> 2.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.1)
+      rufus-scheduler (~> 3.0)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.1)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.0)
-    rufus-scheduler (2.0.24)
-      tzinfo (>= 0.3.22)
-    sidekiq (3.1.4)
-      celluloid (>= 0.15.2)
-      connection_pool (>= 2.0.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rufus-scheduler (3.0.9)
+      tzinfo
+    sidekiq (3.3.1)
+      celluloid (>= 0.16.0)
+      connection_pool (>= 2.1.1)
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
@@ -92,12 +93,13 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.5.0)
-    sqlite3 (1.3.9)
+    slop (3.6.0)
+    sqlite3 (1.3.10)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (1.1.0)
-    tzinfo (1.2.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)

data/README.md

@@ -184,6 +184,23 @@ If the `mailer()` method isn't defined, the `Qe::ActionMailer::AbstractMethodErr
 
 If the `:mail` option isn't defined, the `Qe::ActionMailer::MissingMailNameError` exception will be raised.
 
+### Sidekiq
+
+You can set Sidekiq options by using the method `Sidekiq::Worker.options`.
+
+```ruby
+require 'qe/sidekiq'
+
+class NonRetryableWorker
+  include Qe::Worker
+  options retry: false
+
+  def perform
+    # do something...
+  end
+end
+```
+
 ### Development support
 
 Qe comes with development support. Instead of starting up workers on development environment, you can use the `Qe::Immediate` adapter, which executes your worker right away!
@@ -222,7 +239,6 @@ describe "Enqueuing a job" do
 end
 ```
 
-
 ## Maintainer
 
 * Nando Vieira (<http://nandovieira.com.br>)

data/lib/qe/sidekiq.rb

@@ -12,12 +12,12 @@ module Qe
     end
 
     def self.enqueue(worker, options = {})
-      Worker.sidekiq_options :queue => worker.queue
+      Worker.sidekiq_options worker.options.merge(:queue => worker.queue)
       Worker.perform_async(worker.name, options)
     end
 
     def self.schedule(worker, run_at, options = {})
-      Worker.sidekiq_options :queue => worker.queue
+      Worker.sidekiq_options worker.options.merge(:queue => worker.queue)
       Worker.perform_at(run_at, worker.name, options)
     end
   end

data/lib/qe/version.rb

@@ -1,3 +1,3 @@
 module Qe
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

data/lib/qe/worker/class_methods.rb

@@ -18,6 +18,12 @@ module Qe
         @queue = args.first unless args.empty?
         (@queue || :default).to_s
       end
+
+      # Set the queue options.
+      def options(*args)
+        @options = args.first unless args.empty?
+        @options || {}
+      end
     end
   end
 end

data/spec/qe/sidekiq_spec.rb

@@ -23,7 +23,7 @@ describe Qe::Sidekiq do
 
   context "enqueuing" do
     let(:worker) {
-      double("worker", :queue => "some_queue", :name => "SomeWorker")
+      double("worker", :queue => "some_queue", :name => "SomeWorker", :options => {})
     }
 
     before do
@@ -43,11 +43,22 @@ describe Qe::Sidekiq do
 
       Qe::Sidekiq.enqueue(worker, :a => 1)
     end
+
+    it "sets options" do
+      worker = Class.new do
+        include Qe::Worker
+        options :retry => false
+      end
+
+      expect(Qe::Sidekiq::Worker).to  receive(:sidekiq_options)
+                                        .with(hash_including(:retry => false))
+      Qe::Sidekiq.enqueue(worker)
+    end
   end
 
   context "scheduling" do
     let(:worker) {
-      double("worker", :queue => "some_queue", :name => "SomeWorker")
+      double("worker", :queue => "some_queue", :name => "SomeWorker", :options => {})
     }
 
     before do
@@ -58,7 +69,7 @@ describe Qe::Sidekiq do
       expect(Qe::Sidekiq::Worker).to receive(:sidekiq_options)
                                         .with(:queue => "some_queue")
 
-      Qe::Sidekiq.enqueue(worker)
+      Qe::Sidekiq.schedule(worker, Time.now)
     end
 
     it "schedules job" do
@@ -69,5 +80,18 @@ describe Qe::Sidekiq do
 
       Qe::Sidekiq.schedule(worker, date, :a => 1)
     end
+
+    it "sets options" do
+      Qe.adapter = Qe::Sidekiq
+
+      worker = Class.new do
+        include Qe::Worker
+        options :retry => false
+      end
+
+      expect(Qe::Sidekiq::Worker).to  receive(:sidekiq_options)
+                                        .with(hash_including(:retry => false))
+      Qe::Sidekiq.schedule(worker, Time.now)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qe
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple interface over several background job libraries like Resque, Sidekiq
@@ -294,4 +294,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/hello_worker.rb
 - spec/support/localized_worker.rb
-has_rdoc: