deimos-ruby 1.3.0.pre.beta1 → 1.3.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6496a3f7011b2d9cf92bc2841bd0cdaeea6173eb8a2fb4f388c640ecc619f0d
-  data.tar.gz: d98cd1b64bcc56397b4be95a54018beb57d294803ef3d2dec4f0ce649471f217
+  metadata.gz: 51d996dd84852cb13e3907865decb60c9461dbe95c7ac609520384ace3ee99e9
+  data.tar.gz: e337ab82edb93fcb194319a0fdc423ef174ed2140f4bced78617a82cc601bfe6
 SHA512:
-  metadata.gz: 393b37b8dc0799317ffb037552dd3c6f140c45dfa8ed33de93fa2dcfaead6a06d4065ed2082b3026acbae7ae023494bfe09a5d1a9cb4ad08cb7620c2d00b11a5
-  data.tar.gz: e3474dda911ee613f4048f82d76983cc6d361e5b878c87514543cd8b6105f3bf5c8ecb255a1349a59efb9944f637dabee147d7e32a9b767f1e06a90512bccc79
+  metadata.gz: '0295f4730381d36d2599bc01852610d4a18e821438799fa9d5c8cc8fd87332d07231ee4676d0f3ff5406ba12e95fe404306dc11c630f581732a24cf38d068cf8'
+  data.tar.gz: f27882ee2e78c799aad970fe5c38056a45bb6fed3b062255a31ff2e975e3bc4d7d3c74a256b4e31492faf4d714b49fd8589fb5a74c1226fbfa15d28a6e7ee14d

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# [1.3.0-beta2] - 2019-11-22
+- Fixed bug where consumers would require a key config in all cases
+  even though it's optional if they don't use keys.
+
 # [1.3.0-beta1] - 2019-11-21
 - Added `fetch_record` and `assign_key` methods to ActiveRecordConsumer.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.3.0.pre.beta1)
+    deimos-ruby (1.3.0.pre.beta2)
       avro-patches (~> 0.3)
       avro_turf (~> 0.8)
       phobos (~> 1.8.2.pre.beta2)

data/lib/deimos/base_consumer.rb

@@ -26,8 +26,7 @@ module Deimos
       return nil if key.nil?
 
       config = self.class.config
-      if config[:encode_key] && config[:key_field].nil? &&
-         config[:key_schema].nil?
+      unless config[:key_configured]
         raise 'No key config given - if you are not decoding keys, please use '\
           '`key_config plain: true`'
       end

data/lib/deimos/batch_consumer.rb

@@ -23,8 +23,10 @@ module Deimos
     # :nodoc:
     def before_consume_batch(batch, metadata)
       _with_error_span(batch, metadata) do
-        metadata[:keys] = batch.map do |message|
-          decode_key(message.key)
+        if self.class.config[:key_configured]
+          metadata[:keys] = batch.map do |message|
+            decode_key(message.key)
+          end
         end
 
         batch.map do |message|

data/lib/deimos/consumer.rb

@@ -27,7 +27,7 @@ module Deimos
     # :nodoc:
     def before_consume(payload, metadata)
       _with_error_span(payload, metadata) do
-        metadata[:key] = decode_key(metadata[:key])
+        metadata[:key] = decode_key(metadata[:key]) if self.class.config[:key_configured]
         self.class.decoder.decode(payload) if payload.present?
       end
     end

data/lib/deimos/shared_config.rb

@@ -14,8 +14,11 @@ module Deimos
       def config
         return @config if @config
 
+        # default to none: true
         @config = {
-          encode_key: true
+          key_configured: false,
+          encode_key: false,
+          no_keys: true
         }
         klass = self.superclass
         while klass.respond_to?(:config)
@@ -49,6 +52,7 @@ module Deimos
       # @param plain [Boolean] if true, do not encode keys at all
       # @param none [Boolean] if true, do not use keys at all
       def key_config(plain: nil, field: nil, schema: nil, none: nil)
+        config[:key_configured] = true
         config[:no_keys] = none
         config[:encode_key] = !plain && !none
         config[:key_field] = field&.to_s

data/lib/deimos/test_helpers.rb

@@ -138,7 +138,7 @@ module Deimos
         alias_method(:old_consume, :consume) unless self.instance_methods.include?(:old_consume)
       end
       allow_any_instance_of(klass).to receive(:consume) do |instance, payload, metadata|
-        metadata[:key] = klass.new.decode_key(metadata[:key])
+        metadata[:key] = klass.new.decode_key(metadata[:key]) if klass.config[:key_configured]
         instance.old_consume(payload, metadata)
       end
     end
@@ -445,6 +445,8 @@ module Deimos
     def _key_from_consumer(consumer)
       if consumer.config[:key_field] || consumer.config[:key_schema]
         { 'test' => 1 }
+      elsif consumer.config[:no_keys]
+        nil
       else
         1
       end

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.3.0-beta1'
+  VERSION = '1.3.0-beta2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.beta1
+  version: 1.3.0.pre.beta2
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro-patches