rimless 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a247d9518f07c23212c98c743fd9012528861c5db9672b5cf0696174417872
-  data.tar.gz: 14beb7441d3c156c886550889d748f1a7b743815f12b16cca551eca71fdd7751
+  metadata.gz: 1c4f8ffaba9e9935ef3dce5dbb9dbe983c0b7405fd2b94b0e3c49abf4d23f37a
+  data.tar.gz: 2590e8e7d9858460924a7947413770b51b1b367f77add354d79af8f95621eb1e
 SHA512:
-  metadata.gz: 4952c0e0a5b610d98f5aa09e024b4998eaed636ed6e48fddf63d4bf2d6012f272b63661820938b0157c46c9373f4841ef6cb046904fbb82a0068a87047def8c4
-  data.tar.gz: 757a22a53a12d8cd91dbc3b91cffe29695d57212b98c5c97e218f9ea6d18c103c45eec5d6a9aefa6104d5bbcd405ce4feb7d19898ca01199802d58425d646af1
+  metadata.gz: d06e180257c7c14b712aac3e7bb47105354ab03ad177c68737d32c5867166b83503a25afbd5b3bb60625da05deedc4a77581497a2c02f5b8344452ad0d3fe097
+  data.tar.gz: e1859640122aaab64ee8af5c1272cc29a86e43551e7b505d5295f18b214baa94db6d6f7273086f10b5417c5af12e7a739643415a218131a95e8a8d1f171761de

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 1.1.1
+
+* Corrected the GNU Make release target
+
+### 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
+  won't actually talk to Kafka (#9)
+
+### 1.0.3
+
+* Corrected broken stats when no consumer is yet defined (#8)
+
+### 1.0.2
+
+* Only load the statistics rake task when Rails is available and the
+  environment is development (instead of not production, this may cause issues
+  for +canary+ or +stage+ Rails environments)
+
 ### 1.0.1
 
 * Added the missing +Karafka::Testing::RSpec::Helpers+ include to the

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))
 
@@ -149,4 +153,4 @@ stats: install
 
 release:
 	# Release a new gem version
-	@$(RAKE) release
+	@$(BUNDLE) exec $(RAKE) release

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/rspec.rb

@@ -62,6 +62,10 @@ RSPEC_CONFIGURER.configure do |config|
     # Clear any cached data
     FakeConfluentSchemaRegistryServer.clear
 
+    # Do not interact with Apache Kafka itself on tests
+    allow(WaterDrop::AsyncProducer).to receive(:call)
+    allow(WaterDrop::SyncProducer).to receive(:call)
+
     # Reconfigure the Rimless AvroTurf instance
     Rimless.configure_avro_turf
 

data/lib/rimless/tasks/stats.rake

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(Rails) && !Rails.env.production?
+if defined?(Rails) && Rails.env.development?
   require 'rspec/core/rake_task'
 
   task :stats do
@@ -9,6 +9,8 @@ if defined?(Rails) && !Rails.env.production?
     [
       [:unshift, 'Consumer', 'app/consumers']
     ].each do |method, type, dir|
+      next unless File.directory? dir
+
       ::STATS_DIRECTORIES.send(method, [type, dir])
       ::CodeStatistics::TEST_TYPES << type if type.include? 'specs'
     end

data/lib/rimless/version.rb

@@ -2,5 +2,5 @@
 
 module Rimless
   # The version of the +rimless+ gem
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 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.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Hermann Mayer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2021-05-12 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
@@ -418,7 +418,7 @@ files:
 homepage: https://github.com/hausgold/rimless
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -433,8 +433,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: A bundle of opinionated Apache Kafka / Confluent Schema Registry helpers.
 test_files: []