karafka-sidekiq-backend 1.0.0 → 1.1.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac35518405825e475629928acad62fb4c971148b
-  data.tar.gz: 03db71a6d95e1f7eda063311c84b5f9383290f45
+  metadata.gz: f70c2627ad1cfc9207cb5505fea5048d61145cbd
+  data.tar.gz: 6e360b9d2328d413d11ab65c1d72ecb3946f92b3
 SHA512:
-  metadata.gz: 4a55f875872e7988bff3b4d97ad5828bb8e1766d1329cdaaad2312e08005d7bc1f55065d5a37cc0fd8f0dbc46d19a6ac1743067f1e9ed1d11264624003e1a345
-  data.tar.gz: a912aa6c87ef62998f444f23e2c4970400806c9ddb91f530ce8845e0bc6d3c781b03e9eaa4898e4e5e32c43a47ef5b3b812bff3dba3551a0057f36d88460d0d7
+  metadata.gz: 977ee7ddd3e498a5f57d1bdaaaf8430f67554eb12955c4f7320efc3b3b7d878f74517045534f10e2c64567dfa48d778c3e787ba28dc1e3534cdf8bfdc41fc423
+  data.tar.gz: 5600e31d518f97e8c1de7486c9f99f54fa8ec72150f6dd9baa03014087755188d19a84978708390afba3f40507b44385feac56bfbd07eab6a53091734e9ea821

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.2

data/.travis.yml

@@ -8,7 +8,8 @@ rvm:
   - 2.3.4
   - 2.4.0
   - 2.4.1
-  - jruby-9.1.12.0
+  - 2.4.2
+  - jruby-head
 script: bundle exec rspec spec/
 env:
   global:

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Karafka Sidekiq Backend
 
+## Unreleased
+- Ruby 2.4.2 support
+- #235 - Rename perform to consume
+
 ## 1.0
 
 - Gem init

data/Gemfile.lock

@@ -1,37 +1,23 @@
 PATH
   remote: .
   specs:
-    karafka-sidekiq-backend (1.0.0)
-      karafka (>= 1.0.0)
+    karafka-sidekiq-backend (1.1.0.alpha1)
+      karafka (>= 1.1.0.alpha1)
       sidekiq (>= 4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.3)
+    activesupport (5.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    celluloid (0.17.3)
-      celluloid-essentials
-      celluloid-extras
-      celluloid-fsm
-      celluloid-pool
-      celluloid-supervision
-      timers (>= 4.1.1)
-    celluloid-essentials (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-extras (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-fsm (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-pool (0.20.5)
-      timers (>= 4.1.1)
-    celluloid-supervision (0.20.6)
-      timers (>= 4.1.1)
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
+    delivery_boy (0.2.2)
+      king_konf (~> 0.1.8)
+      ruby-kafka (~> 0.4)
     diff-lcs (1.3)
     docile (1.1.5)
     dry-configurable (0.7.0)
@@ -39,75 +25,75 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.3.3)
+    dry-core (0.3.4)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.0)
-    dry-logic (0.4.1)
+    dry-logic (0.4.2)
       dry-container (~> 0.2, >= 0.2.6)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
-    dry-types (0.11.1)
+    dry-types (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1)
       dry-container (~> 0.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
-      dry-logic (~> 0.4, >= 0.4.0)
+      dry-logic (~> 0.4, >= 0.4.2)
       inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.0)
+    dry-validation (0.11.1)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.11.0)
+      dry-types (~> 0.12.0)
     envlogic (1.0.4)
       activesupport
-    hitimes (1.2.6)
-    i18n (0.8.6)
+    i18n (0.9.0)
+      concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.1.0)
-    karafka (1.0.0)
+    karafka (1.1.0.alpha1)
       activesupport (>= 5.0)
-      celluloid
       dry-configurable (~> 0.7)
       dry-validation (~> 0.11)
       envlogic (~> 1.0)
       multi_json (>= 1.12)
       rake (>= 11.3)
       require_all (>= 1.4)
-      ruby-kafka (>= 0.4)
+      ruby-kafka (>= 0.5)
       thor (~> 0.19)
-      waterdrop (>= 0.4)
+      waterdrop (>= 1.0.alpha2)
+    king_konf (0.1.8)
     minitest (5.10.3)
     multi_json (1.12.2)
     null-logger (0.1.4)
     rack (2.0.3)
     rack-protection (2.0.0)
       rack
-    rake (12.0.0)
-    redis (3.3.3)
+    rake (12.2.1)
+    redis (4.0.1)
     require_all (1.4.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    ruby-kafka (0.4.1)
-    sidekiq (5.0.4)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby-kafka (0.5.0)
+    sidekiq (5.0.5)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (~> 3.3, >= 3.3.3)
-    simplecov (0.15.0)
+      redis (>= 3.3.4, < 5)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -115,17 +101,14 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     timecop (0.9.1)
-    timers (4.1.2)
-      hitimes
-    tzinfo (1.2.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
-    waterdrop (0.4.0)
-      bundler
-      connection_pool
-      dry-configurable (~> 0.6)
+    waterdrop (1.0.0.alpha2)
+      delivery_boy (>= 0.2.2)
+      dry-configurable (~> 0.7)
+      dry-validation (~> 0.11)
       null-logger
-      rake
-      ruby-kafka (~> 0.4)
+      ruby-kafka (>= 0.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/karafka/karafka-sidekiq-backend.png)](https://travis-ci.org/karafka/karafka-sidekiq-backend)
 [![Join the chat at https://gitter.im/karafka/karafka](https://badges.gitter.im/karafka/karafka.svg)](https://gitter.im/karafka/karafka?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[Karafka Sidekiq Backend](https://github.com/karafka/karafka-sidekiq-backend) provides support for processing received Kafka messages inside of Sidekiq workers.
+[Karafka Sidekiq Backend](https://github.com/karafka/karafka-sidekiq-backend) provides support for consuming (processing) received Kafka messages inside of Sidekiq workers.
 
 ## Installations
 

data/karafka-sidekiq-backend.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.description = 'Karafka Sidekiq backend for background messages processing'
   spec.license     = 'MIT'
 
-  spec.add_dependency 'karafka', '>= 1.0.0'
+  spec.add_dependency 'karafka', '>= 1.1.0.alpha1'
   spec.add_dependency 'sidekiq', '>= 4.2'
   spec.required_ruby_version = '>= 2.3.0'
 

data/lib/karafka/backends/sidekiq.rb

@@ -5,7 +5,7 @@ module Karafka
     # Sidekiq backend that schedules stuff to Sidekiq worker for delayed execution
     module Sidekiq
       # Karafka Sidekiq backend version
-      VERSION = '1.0.0'
+      VERSION = '1.1.0.alpha1'
 
       private
 

data/lib/karafka/base_worker.rb

@@ -10,7 +10,9 @@ module Karafka
     # @param params_batch [Array] Array with messages batch
     def perform(topic_id, params_batch)
       Karafka.monitor.notice(self.class, params_batch)
-      controller(topic_id, params_batch).perform
+      instance = controller(topic_id, params_batch)
+      # This allows to support both Karafka 1.0 and 1.1
+      instance.respond_to?(:consume) ? instance.consume : instance.perform
     end
 
     private

data/lib/karafka/extensions/sidekiq_attributes_map.rb

@@ -17,12 +17,8 @@ module Karafka
       # Prepends class methods into attributes map
       # @param base [Class] class that we prepend to
       def self.prepended(base)
-        class << base
-          prepend ClassMethods
-        end
+        base.singleton_class.prepend ClassMethods
       end
     end
   end
 end
-
-Karafka::AttributesMap.prepend Karafka::Extensions::SidekiqAttributesMap

data/lib/karafka-sidekiq-backend.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
+# @note Active Support is already included since Karafka is using it directly so no need
+#   to require it again in the gemspec, etc
 %w[
   karafka
   sidekiq
+  active_support/core_ext/class/subclasses
 ].each(&method(:require))
 
 # Karafka framework namespace
@@ -23,3 +26,4 @@ end
 
 # Uses Karafka loader to load all the sources that this backend needs
 Karafka::Loader.load!(Karafka::Backends::Sidekiq.core_root)
+Karafka::AttributesMap.prepend(Karafka::Extensions::SidekiqAttributesMap)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: karafka-sidekiq-backend
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0.alpha1
 platform: ruby
 authors:
 - Maciej Mensfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: karafka
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0.alpha1
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -81,9 +81,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13