sidekiq-apriori 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd46659ed78b4be97a6a3a3fb2fa6abce7c1818
-  data.tar.gz: aef21efe430abb2fabafeaef22cf333e2ce1f63c
+  metadata.gz: 8520828e777c87ddf510b8c80f6f5eaab0dcb80a
+  data.tar.gz: 66cd361fcb7de9e529b06db5b077eb4f26604a3f
 SHA512:
-  metadata.gz: bb4148906994f507b4b7064b0a5a6e3eab2d48305bf9479b08802751cbed4745ee90bab92f2690f3bc32a34ca1c950607385181c55fab50e022e0b500ed249d1
-  data.tar.gz: 4dcdc931bc462cd284e7c8e5a1cf90711546c5e72d062fe3e86490fd5c5b39de35944c9a9dea098278af1d685a7554b38e98e78ca68465d2aceb9a34050dd449
+  metadata.gz: 1ddf4dd4d818c4197adc3f94f7e4983d449b16bf67b2bbcc8dac35cd6bc5276e72cc197a07153e7a29de92ca74fbbfad48da52b77ffa709ecdcac13781df2f7f
+  data.tar.gz: 95681152f904ea6a1711d7cbf8a1df9db5f3377a12bdd119aabd9bae964ba76698b4298fe03d84881fd496f68c4ec52b3684180df4532346ca6bf8ae589f98eb

data/.travis.yml

@@ -1,4 +1,8 @@
 language: ruby
-rvm:
-  - 2.0.0
-  - 1.9.3
+
+matrix:
+  include:
+    - rvm: 2.0.0
+      gemfile: gemfiles/ruby_2.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/ruby_19.gemfile

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gemspec

data/gemfiles/ruby_19.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "sidekiq", "< 3.2"
+
+gemspec :path=>"../"

data/gemfiles/ruby_2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "sidekiq", ">= 3.2"
+
+gemspec :path=>"../"

data/lib/sidekiq-apriori/middleware/prioritizer.rb

@@ -2,7 +2,7 @@ require 'sidekiq-apriori/priorities'
 
 module Sidekiq::Apriori
   class Prioritizer
-    def call(worker, msg, queue)
+    def call(worker, msg, queue, redis_pool = nil)
       options   = msg["args"].last if msg["args"].respond_to?(:last)
       priority  = options[:priority] if options.is_a?(Hash) && options.has_key?(:priority)
 

data/lib/sidekiq-apriori/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Apriori
-    VERSION = "0.0.3"
+    VERSION = "0.1.1"
   end
 end

data/sidekiq-apriori.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fakeredis"
   s.add_development_dependency "pry"
   s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~>3.0"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "simplecov-rcov"
   s.add_development_dependency "sqlite3"

data/spec/sidekiq-apriori/arb_spec.rb

@@ -12,21 +12,21 @@ describe Sidekiq::Apriori::Arb do
 
   it "should validate priorities" do
     arb.priority = "none"
-    arb.should be_invalid
+    expect(arb).to be_invalid
 
     Sidekiq::Apriori::PRIORITIES.each do |priority|
       arb.priority = priority
-      arb.should be_valid
+      expect(arb).to be_valid
     end
   end
 
   it "should attempt prioritization on creation with named prioritizer" do
-    using_method.should_receive(:some_method)
+    expect(using_method).to receive(:some_method)
     using_method.save
   end
 
   it "should attempt prioritization on creation with using a block" do
-    using_callable.should_receive(:some_other_method)
+    expect(using_callable).to receive(:some_other_method)
     using_callable.save
   end
 end

data/spec/sidekiq-apriori/middleware/client_spec.rb

@@ -3,7 +3,7 @@ require 'sidekiq-apriori/middleware/prioritizer'
 
 describe Sidekiq::Apriori, 'client middleware' do
   before do
-    Sidekiq.stub(:server? => false)
+    allow(Sidekiq).to receive(:server?).and_return(false)
 
     Sidekiq.configure_client do |config|
       config.client_middleware do |chain|
@@ -14,12 +14,13 @@ describe Sidekiq::Apriori, 'client middleware' do
   end
 
   it "should include Sidekiq::Apriori::Prioritizer in client middleware" do
-    Sidekiq.client_middleware.entries.should be_empty
+    expect(Sidekiq.client_middleware.entries).to be_empty
 
-    (require 'sidekiq-apriori/middleware/client').should be_true
+    expect(require 'sidekiq-apriori/middleware/client').to eq(true)
 
-    Sidekiq.client_middleware.entries.should_not be_empty
-    Sidekiq.client_middleware.entries.map(&:klass).
-      should be_include(Sidekiq::Apriori::Prioritizer)
+    expect(Sidekiq.client_middleware.entries).not_to be_empty
+    expect(Sidekiq.client_middleware.entries.map(&:klass)).to(
+      include(Sidekiq::Apriori::Prioritizer)
+    )
   end
 end

data/spec/sidekiq-apriori/middleware/prioritizer_spec.rb

@@ -9,26 +9,36 @@ describe Sidekiq::Apriori::Prioritizer do
 
   describe '#call' do
     it 'should respond' do
-      middleware.respond_to?(:call).should be_true
+      expect(middleware).to respond_to(:call)
     end
 
-    it 'should require three arguments' do
+    it 'rejects less than three arguments' do
       expect { middleware.call }.
-        to raise_error( ArgumentError,'wrong number of arguments (0 for 3)')
+        to raise_error( ArgumentError, /wrong number of arguments/ )
+    end
+
+    it 'allows 3 arguments' do
+      expect { middleware.call(nil, message, queue) {} }.
+        not_to raise_error
+    end
+
+    it 'allows for 4 arguments' do
+      expect { middleware.call(nil, message, queue, nil) {} }.
+        not_to raise_error
     end
 
     it 'should set priority queue' do
       middleware.call(nil, message, queue) {}
-      message['queue'].should eql('foo_high')
+      expect(message['queue']).to eq('foo_high')
     end
 
     it 'should allow only one priority suffix' do
       message['queue'] = 'foo_low_high_immediate'
       middleware.call(nil, message, queue) {}
-      message['queue'].should eql('foo_high')
+      expect(message['queue']).to eq('foo_high')
 
       middleware.call(nil, message, queue) {}
-      message['queue'].should eql('foo_high')
+      expect(message['queue']).to eq('foo_high')
     end
   end
 end

data/spec/sidekiq-apriori/middleware/server_spec.rb

@@ -3,7 +3,7 @@ require 'sidekiq-apriori/middleware/prioritizer'
 
 describe Sidekiq::Apriori, 'server middleware' do
   before do
-    Sidekiq.stub(:server? => true)
+    allow(Sidekiq).to receive(:server?).and_return(true)
 
     Sidekiq.configure_server do |config|
       config.client_middleware do |chain|
@@ -14,12 +14,13 @@ describe Sidekiq::Apriori, 'server middleware' do
   end
 
   it "should include Sidekiq::Apriori::Prioritizer in client middleware" do
-    Sidekiq.client_middleware.entries.should be_empty
+    expect(Sidekiq.client_middleware.entries).to be_empty
 
-    (require 'sidekiq-apriori/middleware/server').should be_true
+    expect(require 'sidekiq-apriori/middleware/server').to eq(true)
 
-    Sidekiq.client_middleware.entries.should_not be_empty
-    Sidekiq.client_middleware.entries.map(&:klass).
-      should be_include(Sidekiq::Apriori::Prioritizer)
+    expect(Sidekiq.client_middleware.entries).not_to be_empty
+    expect(Sidekiq.client_middleware.entries.map(&:klass)).to(
+      include(Sidekiq::Apriori::Prioritizer)
+    )
   end
 end

data/spec/sidekiq-apriori/worker_spec.rb

@@ -15,7 +15,7 @@ describe Sidekiq::Apriori::Worker do
   #
   if ( RUBY_VERSION.split(/\./).map(&:to_i) rescue [] ).first > 1
     it "redefines 'perform' to handle an extra argument when that argument has priority information" do
-      job.should be_an_instance_of(Job)
+      expect(job).to be_an_instance_of(Job)
       expect { job.perform(priority: "high") }.not_to raise_error
     end
 

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ Sidekiq.configure_server do |config|
 end
 
 RSpec.configure do |config|
-  config.before(:each) do
+  config.before(:each) do |example|
     ## Use metadata to determine testing behavior
     ## for queuing.
     Sidekiq::Worker.clear_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-apriori
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Blake Thomas
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !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: fakeredis
   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: rake
   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'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: simplecov-rcov
   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'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   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'
 description: Prioritization middleware for Sidekiq
@@ -144,15 +144,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .simplecov
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/ruby_19.gemfile
+- gemfiles/ruby_2.gemfile
 - lib/sidekiq-apriori.rb
 - lib/sidekiq-apriori/arb.rb
 - lib/sidekiq-apriori/middleware.rb
@@ -180,17 +182,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: nowarning
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Prioritization Middleware for Sidekiq
@@ -202,3 +204,4 @@ test_files:
 - spec/sidekiq-apriori/worker_spec.rb
 - spec/spec_helper.rb
 - spec/support/arb.rb
+has_rdoc: