karafka-sidekiq-backend 1.2.0.beta1 → 1.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16558b17b692066dafda116ac5305f97eb090223c525ef9f7d928421ff035778
-  data.tar.gz: 47a3e0b1dcc3553077c2144f2e175318ac1de7a2bff40f33501c54361bf369b6
+  metadata.gz: 5cbf46f4edac28d13fad77fc120bf92456e37380bcee52718713ad94f4e9a5f2
+  data.tar.gz: 5da6e57d3f61b3d2f59410e78c7c94a1a26b04051714f2895f36ce00c2099e8c
 SHA512:
-  metadata.gz: 43ea83d99f762fa1d9d709773959fd5c94cba803be58f4f32d19fd1bf080c4ec25d195c72bc874a947af9b4220ea91bfee47e890d229319d8f7607e1da30e0fe
-  data.tar.gz: 74b9743f1df06af45ca2953e055bd3622693b326ce347f1bf887d8a299c59a1b8c3c3cedbaefb7b76453aee0f788571717a85484934d5cab2578ec0355906310
+  metadata.gz: c98cfa129b4733d21fa6fc0491ba522c89c5187fc1d1113b8256e9a980f50dba131353b61e37ee3f9867d8ad6e6a665abb0d2980ec3cff9bcab91fc3dfa9b53f
+  data.tar.gz: 63fd8534461a01e418e365f13ad207cfad9d5f7dff24adc09b8b15301e22749b3ad2d49b38ead45a70628722af90d2e36f5d48f3ce1cdadf1783567a9304fc93

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Karafka Sidekiq Backend
 
-## 1.2.0.beta1
+## 1.2.0.beta2
 - #274 - Rename controllers to consumers
 - Karafka 1.2 support
+- Parse data before pushing to Sidekiq
 
 ## 1.1
 - Ruby 2.4.2 support

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    karafka-sidekiq-backend (1.2.0.beta1)
-      karafka (>= 1.2.0.beta1)
+    karafka-sidekiq-backend (1.2.0.beta2)
+      karafka (>= 1.2.0.beta2)
       sidekiq (>= 4.2)
 
 GEM
@@ -63,7 +63,7 @@ GEM
       concurrent-ruby (~> 1.0)
     inflecto (0.0.2)
     json (2.1.0)
-    karafka (1.2.0.beta1)
+    karafka (1.2.0.beta2)
       activesupport (>= 4.0)
       dry-configurable (~> 0.7)
       dry-inflector (~> 0.1.1)

data/README.md

@@ -98,12 +98,16 @@ Custom interchangers target issues with non-standard (binary, etc.) data that we
 ```ruby
 class Base64Interchanger
   class << self
-    def load(params)
-      Base64.encode64(Marshal.dump(params))
+    def load(params_batch)
+      params_batch.map do |params|
+        Base64.encode64(Marshal.dump(params))
+      end
     end
 
-    def parse(params)
-      Marshal.load(Base64.decode64(params))
+    def parse(params_batch)
+      params_batch.map do |params|
+        Marshal.load(Base64.decode64(params))
+      end
     end
   end
 end

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.2.0.beta1'
+  spec.add_dependency 'karafka', '>= 1.2.0.beta2'
   spec.add_dependency 'sidekiq', '>= 4.2'
   spec.required_ruby_version = '>= 2.3.0'
 

data/lib/karafka/backends/sidekiq.rb

@@ -5,20 +5,18 @@ module Karafka
     # Sidekiq backend that schedules stuff to Sidekiq worker for delayed execution
     module Sidekiq
       # Karafka Sidekiq backend version
-      VERSION = '1.2.0.beta1'
+      VERSION = '1.2.0.beta2'
 
       # Enqueues the execution of perform method into a worker.
       # @note Each worker needs to have a class #perform_async method that will allow us to pass
       #   parameters into it. We always pass topic as a first argument and this request
       #   params_batch as a second one (we pass topic to be able to build back the consumer
       #   in the worker)
-      def call
-        Karafka.monitor.instrument('backends.sidekiq.process', caller: self) do
+      def process
           topic.worker.perform_async(
             topic.id,
-            topic.interchanger.load(params_batch.to_a)
+            topic.interchanger.load(params_batch)
           )
-        end
       end
     end
   end

data/lib/karafka/interchanger.rb

@@ -13,22 +13,24 @@ module Karafka
       # @note Params might not be parsed because of lazy loading feature. If you implement your
       #   own interchanger logic, this method needs to return data that can be converted to
       #   json with default Sidekiqs logic
-      # @return [Karafka::Params::ParamsBatch] same as input. We assume that our incoming data is
-      #   jsonable-safe and we can rely on a direct Sidekiq encoding logic
+      # @return [Karafka::Params::ParamsBatch] parsed params batch. There are too many problems
+      #   with passing unparsed data from Karafka to Sidekiq, to make it a default. In case you
+      #   need this, please implement your own interchanger.
       def load(params_batch)
-        params_batch
+        params_batch.parsed
       end
 
       # @param params_batch [Hash] Sidekiqs params that are now a Hash (after they were JSON#parse)
       # @note Since Sidekiq does not like symbols, we restore symbolized keys for system keys, so
       #   everything can work as expected. Keep in mind, that custom data will always be assigned
-      #   with string keys per design. To change it, pleasae change this interchanger and create
+      #   with string keys per design. To change it, please change this interchanger and create
       #   your own custom parser
       def parse(params_batch)
         params_batch.map! do |params|
           Karafka::Params::Params::SYSTEM_KEYS.each do |key|
             stringified_key = key.to_s
-            params[key] = params.delete(stringified_key) if params.key?(stringified_key)
+            next unless params.key?(stringified_key)
+            params[key] ||= params.delete(stringified_key)
           end
 
           params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-sidekiq-backend
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta1
+  version: 1.2.0.beta2
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta1
+        version: 1.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0.beta1
+        version: 1.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement