rollbar 0.10.10 → 0.10.11

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+**0.10.11**
+- Fix usage of custom Sidekiq options
+
 **0.10.10**
 - Add support for sucker_punch asynchronous handling
 

data/lib/rollbar/configuration.rb

@@ -65,6 +65,7 @@ module Rollbar
       if value
         require 'rollbar/delay/sidekiq' if defined?(Sidekiq)
         @use_async      = true
+        @use_sidekiq    = value
         @async_handler  = Rollbar::Delay::Sidekiq.method(:handle)
       end
     end

data/lib/rollbar/delay/sidekiq.rb

@@ -6,7 +6,7 @@ module Rollbar
       OPTIONS = { 'queue' => 'rollbar', 'class' => self.name }.freeze
 
       def self.handle(payload)
-        item = @use_sidekiq.is_a?(Hash) ? OPTIONS.merge(@use_sidekiq) : OPTIONS
+        item = Rollbar.configuration.use_sidekiq.is_a?(Hash) ? OPTIONS.merge(Rollbar.configuration.use_sidekiq) : OPTIONS
 
         ::Sidekiq::Client.push item.merge('args' => [payload])
       end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = "0.10.10"
+  VERSION = "0.10.11"
 end

data/rollbar.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'database_cleaner', '~> 1.0.0'
   gem.add_development_dependency 'girl_friday', '>= 0.11.1'
   gem.add_development_dependency 'sucker_punch', '>= 1.0.0' if RUBY_VERSION != '1.8.7'
+  gem.add_development_dependency 'sidekiq', '>= 2.13.0' if RUBY_VERSION != '1.8.7'
   gem.add_development_dependency 'genspec', '>= 0.2.7'
 end

data/spec/delay/sidekiq_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+begin
+  require 'rollbar/delay/sidekiq'
+rescue LoadError
+end
+
+if defined?(Sidekiq)
+  describe Rollbar::Delay::Sidekiq do
+    before(:each) do
+      reset_configuration
+    end
+  
+    describe ".handler" do
+      let(:payload) { anything }
+  
+      context "with default options" do
+        before { Rollbar.configuration.use_sidekiq = true }
+  
+        it "enqueues to default queue" do
+          ::Sidekiq::Client.should_receive(:push).with(Rollbar::Delay::Sidekiq::OPTIONS.merge('args' => payload))
+          Rollbar::Delay::Sidekiq.handle(payload)
+        end
+      end
+  
+      context "with custom options" do
+        let(:custom_config) { { 'queue' => 'custom_queue' } }
+  
+        before { Rollbar.configuration.use_sidekiq = custom_config }
+  
+        it "enqueues to custom queue" do
+          options = Rollbar::Delay::Sidekiq::OPTIONS.merge(custom_config.merge('args' => payload))
+          ::Sidekiq::Client.should_receive(:push).with options
+  
+          Rollbar::Delay::Sidekiq.handle(payload)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 0.10.10
+  version: 0.10.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +186,7 @@ files:
 - lib/rollbar/version.rb
 - rollbar.gemspec
 - spec/controllers/home_controller_spec.rb
+- spec/delay/sidekiq_spec.rb
 - spec/dummyapp/.gitignore
 - spec/dummyapp/Rakefile
 - spec/dummyapp/app/assets/javascripts/application.js
@@ -251,6 +268,7 @@ specification_version: 3
 summary: Reports exceptions to Rollbar
 test_files:
 - spec/controllers/home_controller_spec.rb
+- spec/delay/sidekiq_spec.rb
 - spec/dummyapp/.gitignore
 - spec/dummyapp/Rakefile
 - spec/dummyapp/app/assets/javascripts/application.js