rimless 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa04c0230d9defc00a64eaebabbad4d06dd22c6432316d5fd7baab0e64527cdd
-  data.tar.gz: 311d8c3b112b6f628d66f6d59eb3b8f9298bd56b5c8f7d973e456668dab34dbc
+  metadata.gz: f8731817c3b1148a4a9c5954f89cbc2a6a1f5c9e7023137be662d2405260cfc0
+  data.tar.gz: 731e88cf5b51713d89178dd7e17b5ec180ed3644f7359a6dc70994d2f2dfd5f5
 SHA512:
-  metadata.gz: 9a93590a36bdb88097de37ce3d1dc0cd93d8f763a860f7cdac5d796764ecf8a74aebdc1db5a6e0642cde7cc108796226f9fd0e7ba02be1d768b30632829eec26
-  data.tar.gz: d8893ee4ce93e8682d55bec99645f401953b3fe92daeb5a7d607e3ca76ce1f295b7af469029ec5818a0c71987fcd32b151563e1bbc389a29ef4d9c3cda65ee97
+  metadata.gz: 470445e7954d1c51c815c98988a87fe2e8b520b53ccdc36cd77ae8380ed0756ec89c181f338e646cd5f472b2cf9fd249b259d1f34713f7ec6e71a0486bd4d27b
+  data.tar.gz: bb8c86c2aece00aa3c6e38ebb96847bf33059f60cab1e163d92cc8ae8fb077bb000423b977243214df5c3d45691e3bad48a62ebb811b4783d6f1a4688abf256e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.1.0
+
+* Added support for Karafka `~> 1.4.0` and set is as minimum dependency version
+  (#10)
+
 ### 1.0.4
 
 * Mocked WaterDrop producers in the rimless rspec helper so that tests

data/Makefile

@@ -85,7 +85,11 @@ update: install
 	@$(MKDIR) -p $(VENDOR_DIR)
 	@$(call run-shell,$(BUNDLE) exec $(APPRAISAL) update)
 
-test: #install
+test: \
+	test-specs \
+	test-style
+
+test-specs:
 	# Run the whole test suite
 	@$(call run-shell,$(BUNDLE) exec $(RAKE))
 

data/lib/rimless/consumer.rb

@@ -131,7 +131,7 @@ module Rimless
                 topic(topic_name) do
                   consumer dest_consumer
                   worker Rimless::ConsumerJob
-                  interchanger Rimless::Karafka::Base64Interchanger
+                  interchanger Rimless::Karafka::Base64Interchanger.new
                 end
               end
             end

data/lib/rimless/karafka/avro_deserializer.rb

@@ -6,15 +6,19 @@ module Rimless
     class AvroDeserializer
       # Deserialize an Apache Avro encoded Apache Kafka message.
       #
-      # @param message [String] the binary blob to deserialize
+      # @param params [Karafka::Params::Params] the Karafka message parameters
       # @return [Hash{Symbol => Mixed}] the deserialized Apache Avro message
-      def call(message)
+      def call(params)
+        # When the Kafka message does not have a payload, we won't fail.
+        # This is for Kafka users which use log compaction with a nil payload.
+        return if params.raw_payload.nil?
+
         # We use sparsed hashes inside of Apache Avro messages for schema-less
         # blobs of data, such as loosely structured metadata blobs.  Thats a
         # somewhat bad idea on strictly typed and defined messages, but their
         # occurence should be rare.
         Rimless
-          .decode(message.payload)
+          .decode(params.raw_payload)
           .yield_self { |data| Sparsify(data, sparse_array: true) }
           .yield_self { |data| data.transform_keys { |key| key.delete('\\') } }
           .yield_self { |data| Unsparsify(data, sparse_array: true) }

data/lib/rimless/karafka/base64_interchanger.rb

@@ -7,14 +7,14 @@ module Rimless
     #
     # rubocop:disable Security/MarshalLoad because we encode/decode the
     #   messages in our own controlled context
-    class Base64Interchanger
+    class Base64Interchanger < ::Karafka::Interchanger
       # Encode a binary Apache Kafka message(s) so they can be passed to the
       # Sidekiq +Rimless::ConsumerJob+.
       #
       # @param params_batch [Mixed] the raw message(s) to encode
       # @return [String] the marshaled+base64 encoded data
-      def self.encode(params_batch)
-        Base64.encode64(Marshal.dump(params_batch.to_a))
+      def encode(params_batch)
+        Base64.encode64(Marshal.dump(super))
       end
 
       # Decode the binary Apache Kafka message(s) so they can be processed by
@@ -22,8 +22,8 @@ module Rimless
       #
       # @param params_string [String] the marshaled+base64 encoded data
       # @return [Mixed] the unmarshaled+base64 decoded data
-      def self.decode(params_string)
-        Marshal.load(Base64.decode64(params_string))
+      def decode(params_string)
+        Marshal.load(Base64.decode64(super)).map(&:stringify_keys)
       end
     end
     # rubocop:enable Security/MarshalLoad

data/lib/rimless/version.rb

@@ -2,5 +2,5 @@
 
 module Rimless
   # The version of the +rimless+ gem
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/rimless.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activesupport', '>= 4.2.0'
   spec.add_runtime_dependency 'avro_turf', '~> 0.11.0'
-  spec.add_runtime_dependency 'karafka', '~> 1.3'
-  spec.add_runtime_dependency 'karafka-sidekiq-backend', '~> 1.3'
-  spec.add_runtime_dependency 'karafka-testing', '~> 1.3'
+  spec.add_runtime_dependency 'karafka', '~> 1.4'
+  spec.add_runtime_dependency 'karafka-sidekiq-backend', '~> 1.4'
+  spec.add_runtime_dependency 'karafka-testing', '~> 1.4'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'sparsify', '~> 1.1'
   spec.add_runtime_dependency 'waterdrop', '~> 1.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rimless
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: karafka-sidekiq-backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: karafka-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A bundle of opinionated Apache Kafka / Confluent Schema Registry helpers.