qe 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d5d103943b57c5379eae62343dcd251b55427a6
-  data.tar.gz: 7b54ece3f2ada83d0653c967dccdfa6d69e7201d
+  metadata.gz: e9a7a8be2452bf7a28feac011c403dd167be6649
+  data.tar.gz: 01bd26a4b64b180294fcef65ef61a431b830c128
 SHA512:
-  metadata.gz: 82deb1ea3844a3ae856d782b68b4605c96e7038fc8fb13cb48525c7dde874eab2258064430b8f2f482dfc87955d37082308e0633f5f2d1bf33ab1bcff41c8e5b
-  data.tar.gz: 23730bbb17b303ae805d0c965a1b06d7a756ea196981561f9139163d5078f45abf52cff5512eac2707d187b9d7ce83329539f7381d25c5b2dfb1fe19c9efcf9b
+  metadata.gz: dda74e97109518db33edc375c88ff40120e06df1d9936e940d00d78cc2f9e5514a3b9c1f0346f05af8861bd17f4331253ecde6f58149a73cc8a4592f9909ef3c
+  data.tar.gz: 6bac9793acfa1a0ced8e23324fa4a1a4434d89671368b9ea66e93dc560e017b806c920333512471e3d75ad9559cdf391595102c1a0dc8fb7fa9dab2bf23b9eaf

data/Gemfile

@@ -3,4 +3,3 @@ gemspec
 
 gem "delayed_job", "~> 4.0.0.beta2"
 gem "delayed_job_active_record", "~> 4.0.0.beta3"
-gem "rspec", "~> 2.14.0.rc1"

data/Gemfile.lock

@@ -1,101 +1,100 @@
 PATH
   remote: .
   specs:
-    qe (0.3.2)
+    qe (0.3.3)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.12)
-    awesome_print (1.1.0)
-    backburner (0.4.3)
+    arel (4.0.1)
+    atomic (1.1.14)
+    awesome_print (1.2.0)
+    backburner (0.4.5)
       beaneater (~> 0.3.1)
       dante (~> 0.1.5)
-    beaneater (0.3.1)
+    beaneater (0.3.2)
     builder (3.1.4)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
-    coderay (1.0.9)
-    connection_pool (1.1.0)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    coderay (1.1.0)
+    connection_pool (1.2.0)
     dante (0.1.5)
     delayed_job (4.0.0)
       activesupport (>= 3.0, < 4.1)
     delayed_job_active_record (4.0.0)
       activerecord (>= 3.0, < 4.1)
       delayed_job (>= 3.0, < 4.1)
-    diff-lcs (1.2.4)
-    i18n (0.6.4)
-    json (1.8.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    json (1.8.1)
     method_source (0.8.2)
     minitest (4.7.5)
     mono_logger (1.1.0)
-    multi_json (1.7.8)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    multi_json (1.8.4)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     qu (0.2.0)
       multi_json
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.2)
       rack
-    redis (3.0.4)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
-    resque (1.24.1)
+    redis (3.0.6)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (2.0.1)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
+    resque-scheduler (2.3.1)
+      redis (>= 3.0.0)
+      resque (~> 1.25)
+      rufus-scheduler (~> 2.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
-    rufus-scheduler (2.0.23)
-      tzinfo (>= 0.3.23)
-    sidekiq (2.13.0)
-      celluloid (>= 0.14.1)
+    rspec-mocks (2.14.4)
+    rufus-scheduler (2.0.6)
+    sidekiq (2.17.3)
+      celluloid (>= 0.15.2)
       connection_pool (>= 1.0.0)
       json
-      redis (>= 3.0)
-      redis-namespace
-    sinatra (1.4.3)
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    slop (3.4.6)
-    sqlite3 (1.3.7)
-    thread_safe (0.1.2)
+    slop (3.4.7)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
     timers (1.1.0)
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
@@ -113,6 +112,6 @@ DEPENDENCIES
   qu
   resque
   resque-scheduler
-  rspec (~> 2.14.0.rc1)
+  rspec
   sidekiq
   sqlite3

data/lib/qe/locale.rb

@@ -10,14 +10,14 @@ module Qe
         # the current locale to the options.
         enqueue = instance_method(:enqueue)
         define_method :enqueue do |options = {}|
-          options[:locale] = I18n.locale
+          options[:locale] ||= I18n.locale
           enqueue.bind(self).call(options)
         end
       end
 
       base.class_eval do
-        # Intercept <tt>Worker#before</tt> method, adding
-        # the setting the current locale.
+        # Intercept <tt>Worker#before</tt> method and
+        # set the current locale.
         before = instance_method(:before)
         define_method :before do
           I18n.locale = options.delete(:locale)

data/lib/qe/testing/rspec.rb

@@ -11,8 +11,8 @@ module Qe
         @scheduled = scheduled
       end
 
-      def with(options)
-        @options = options
+      def with(options = nil, &block)
+        @options = block || options
         self
       end
 
@@ -24,13 +24,15 @@ module Qe
       def matches?(block)
         block.call
 
-        jobs.any? do |job|
+        result = jobs.any? do |job|
           condition = job[:worker] == worker
           condition = condition && datetime? if scheduled
-          condition = condition && job[:options] == options if options
+          condition = condition && job[:options] == (options.kind_of?(Proc) ? options.call : options) if options
           condition = condition && job[:run_at].to_i == date.to_i if date
           condition
-        end != nil
+        end
+
+        !!result
       end
 
       def does_not_match?(block)
@@ -38,7 +40,7 @@ module Qe
 
         jobs.none? do |job|
           condition = job[:worker] != worker
-          condition = condition && job[:options] != options if options
+          condition = condition && job[:options] != (options.kind_of?(Proc) ? options.call : options) if options
           condition = condition && job[:run_at].to_i != date.to_i if date
           condition
         end
@@ -77,7 +79,7 @@ module Qe
     #   expect {}.to enqueue(MailerWorker).with(options)
     #
     def enqueue(worker)
-      Matcher.new(worker, true)
+      Matcher.new(worker, false)
     end
 
     #

data/lib/qe/version.rb

@@ -1,3 +1,3 @@
 module Qe
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/qe/worker/instance_methods.rb

@@ -2,7 +2,7 @@ module Qe
   module Worker
     module InstanceMethods
       def initialize(options)
-        @options = options.with_indifferent_access
+        @options = HashWithIndifferentAccess.new(options)
       end
 
       # Return options that were provided when

data/spec/qe/locale_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Qe::Locale do
-  let(:i18n) { double("I18n", :locale => :en) }
+  let(:i18n) { double("I18n", locale: :en) }
 
   before do
     stub_const("I18n", i18n)
@@ -38,21 +38,24 @@ describe Qe::Locale do
     it "sets locale" do
       expect {
         LocalizedWorker.enqueue
-      }.to enqueue(LocalizedWorker).with(:locale => :en)
+      }.to enqueue(LocalizedWorker).with(locale: :en)
     end
-  end
 
-  context "when performing" do
-    before do
-      Qe.adapter = Qe::Immediate
+    it "keeps defined locale" do
+      expect {
+        LocalizedWorker.enqueue(locale: "pt-BR")
+      }.to enqueue(LocalizedWorker).with(locale: "pt-BR")
     end
+  end
 
+  context "when performing" do
     it "sets locale" do
       i18n
         .should_receive(:locale=)
         .with(:en)
 
       LocalizedWorker.enqueue
+      Qe.drain
     end
   end
 end

data/spec/qe/matchers_spec.rb

@@ -11,6 +11,12 @@ describe Qe::EnqueueMatcher do
     }.to enqueue(HelloWorker).with(a: 1)
   end
 
+  it "enqueues job with options as a block" do
+    expect {
+      HelloWorker.enqueue(a: 1)
+    }.to enqueue(HelloWorker).with { {a: 1} }
+  end
+
   it "enqueues job without mentioning options" do
     expect {
       HelloWorker.enqueue(a: 1)

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: qe
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   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'
 - !ruby/object:Gem::Dependency
   name: qu
   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'
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   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'
 - !ruby/object:Gem::Dependency
   name: backburner
   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'
 - !ruby/object:Gem::Dependency
   name: resque
   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'
 - !ruby/object:Gem::Dependency
   name: resque-scheduler
   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'
 - !ruby/object:Gem::Dependency
   name: activerecord
   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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: A simple interface over several background job libraries like Resque,
@@ -186,8 +186,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -248,17 +248,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A simple interface over several background job libraries like Resque, Sidekiq