apartment-sidekiq 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35b9f5adca7fb34911d5c395ace91d208b3686d
-  data.tar.gz: c2dccafcb1b86c5a2a708e2268c33894fbb623b7
+  metadata.gz: 2a4f57b8f378c0d03faf75de53a845aab621017d
+  data.tar.gz: 903dd6975571e6eeb9e5f9289351317b8148a64e
 SHA512:
-  metadata.gz: 485b45a47e014d3ca9f774fce4b1a600f559d6bc5c0461b7f52e2a5334f1e97bb4b6c6e698952826a01311c3b523db83752ccb238b4c6806c1a15bac242448f7
-  data.tar.gz: 586ee339d880540fee29e409f59e0aa6c38450f4f54e1f52e893a44f30168e7e7713e55b202cea9c745e7e32d83819eb696d842762b0f433d7f89a8c786ebc05
+  metadata.gz: 79f4be92a4f69f4f03501ab52e96504cb12db96c945604f8812ded9bff825aec662dd1d6e739c41e148aa0a46ec14903acd0fd9e2708afedf7e03458101cc71e
+  data.tar.gz: 1e8c2257dbd72e7b8ad3f6e4bfef9128a22a53d938fe0a74ff3e2ec561110f9f690ae61d2d47647669e3d2c720b9b8605b02201ef2ab05efa42bcdfa2869859a

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# master (unreleased)
+
+# 1.2.0 (2017-12-17)
+
+  * [#16](https://github.com/influitive/apartment-sidekiq/pull/16): Sidekiq::Batch compatibility [@mperham]
+  * [#20](https://github.com/influitive/apartment-sidekiq/issues/20): Relax apartment version in gemspec [@MSeneadza]
+    * @jhubert, @JanStevens and @1990prashant also opened issues/pull requests about this problem
+  * [#24](https://github.com/influitive/apartment-sidekiq/pull/24): Fix Sidekiq Pro Batch Lookup [@JanStevens]

data/README.md

@@ -1,5 +1,7 @@
 # Apartment::Sidekiq
 
+[![Gem Version](https://badge.fury.io/rb/apartment-sidekiq.svg)](https://badge.fury.io/rb/apartment-sidekiq)
+
 Official Support for Sidekiq with the Apartment Gem.
 
 This gem takes care of storing the current tenant that a job is enqueued within.
@@ -32,7 +34,3 @@ it will run job within an `Apartment::Tenant.switch` block.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/influitive/apartment-sidekiq/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/apartment-sidekiq.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'minitest'
 
-  spec.add_dependency 'apartment', '~> 1.0'
+  spec.add_dependency 'apartment', '>= 1.0'
   spec.add_dependency 'sidekiq', '>= 2.11'
 end

data/lib/apartment/sidekiq.rb

@@ -11,17 +11,21 @@ module Apartment
       def self.run
         ::Sidekiq.configure_client do |config|
           config.client_middleware do |chain|
-            chain.add Apartment::Sidekiq::Middleware::Client
+            chain.add ::Apartment::Sidekiq::Middleware::Client
           end
         end
 
         ::Sidekiq.configure_server do |config|
           config.client_middleware do |chain|
-            chain.add Apartment::Sidekiq::Middleware::Client
+            chain.add ::Apartment::Sidekiq::Middleware::Client
           end
 
           config.server_middleware do |chain|
-            chain.add Apartment::Sidekiq::Middleware::Server
+            if defined?(::Sidekiq::Batch::Server)
+              chain.insert_before ::Sidekiq::Batch::Server, ::Apartment::Sidekiq::Middleware::Server
+            else
+              chain.add ::Apartment::Sidekiq::Middleware::Server
+            end
           end
         end
       end

data/lib/apartment/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Apartment
   module Sidekiq
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apartment-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brad Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,14 +56,14 @@ dependencies:
   name: apartment
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Sidekiq support for Apartment