deimos-ruby 1.5.0.pre.beta2 → 1.6.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f20063d68540f1d48e8a87b210f42b146156120b0cc183bd9ce9b3aacee848
-  data.tar.gz: 23a7dac7a19d8defae93a5e675b614541d771b4c46746f12177dbd184ff37d67
+  metadata.gz: 23c67fb21e32902a5672c44a081bb6a34a51529a1936962f25855944ef177f4d
+  data.tar.gz: 3de138bb2ae80ec08062417160f45103bb681d68edcc7a0cc75eca1c3a56cae9
 SHA512:
-  metadata.gz: d3e9e905a67b22e953c9b8066d13adcff0f7c219676791f30e05ba34e007913c7615996278cf1aa52655a3f272d007baefd08f9d2612cbcc7d4453d656872197
-  data.tar.gz: 7978987a6ba5e56c2d9f5fd46582b17ed4ae85cac8b94fd67a65bac13dd60a0d56491eb91f060b030324e29f94b00158fdd0b87125ba4acd2b0ccfe887a009cf
+  metadata.gz: 37f51c89c19891c4490982e101c2ae5c46ce6a389d5a7fd82c45601aa4581c1af2edbe5b261396f6feafd1e91cb0cd73d53689f703d19c553f2bbaaad0c9d694
+  data.tar.gz: d1045e3179921f5dc810c701faa513f011fec75bfbbadec6d16de961c768c3c3f796c259018c7dce888a9fdbae55fd53351c8559796ab10378d42125a181b304

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# [1.6.0-beta1] - 2020-02-05
+
+- Updated dependency for Phobos to 1.9.0-beta3. This ensures compatibility with
+  Phobos 2.0.
+- Fixed RSpec warning when using `test_consume_invalid_message`.
+
 # [1.5.0-beta2] - 2020-01-17
 - Added schema backends, which should simplify Avro encoding and make it
   more flexible for unit tests and local development.

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    deimos-ruby (1.5.0.pre.beta2)
+    deimos-ruby (1.6.0.pre.beta1)
       avro_turf (~> 0.11)
-      phobos (~> 1.8.2.pre.beta2)
+      phobos (~> 1.9.0.pre.beta3)
       ruby-kafka (~> 0.7)
 
 GEM
@@ -71,7 +71,7 @@ GEM
     digest-crc (0.4.1)
     dogstatsd-ruby (4.5.0)
     erubi (1.9.0)
-    excon (0.71.1)
+    excon (0.72.0)
     exponential-backoff (0.0.4)
     ffi (1.11.3)
     formatador (0.2.5)
@@ -131,7 +131,7 @@ GEM
     parser (2.6.5.0)
       ast (~> 2.4.0)
     pg (1.1.4)
-    phobos (1.8.2)
+    phobos (1.9.0.pre.beta3)
       activesupport (>= 3.0.0)
       concurrent-ruby (>= 1.0.2)
       concurrent-ruby-ext (>= 1.0.2)

data/deimos-ruby.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency('avro_turf', '~> 0.11')
-  spec.add_runtime_dependency('phobos', '~> 1.8.2.pre.beta2')
+  spec.add_runtime_dependency('phobos', '~> 1.9.0.pre.beta3')
   spec.add_runtime_dependency('ruby-kafka', '~> 0.7')
 
   spec.add_development_dependency('activerecord', '~> 5.2')

data/lib/deimos/batch_consumer.rb

@@ -11,27 +11,24 @@ module Deimos
     include Phobos::BatchHandler
 
     # :nodoc:
-    def around_consume_batch(payloads, metadata)
-      _received_batch(payloads, metadata)
+    def around_consume_batch(batch, metadata)
+      payloads = []
       benchmark = Benchmark.measure do
-        _with_error_span(payloads, metadata) { yield }
-      end
-      _handle_success(benchmark.real, payloads, metadata)
-    end
-
-    # :nodoc:
-    def before_consume_batch(batch, metadata)
-      _with_error_span(batch, metadata) do
         if self.class.config[:key_configured]
           metadata[:keys] = batch.map do |message|
             decode_key(message.key)
           end
         end
 
-        batch.map do |message|
-          self.class.decoder.decode(message.payload) if message.payload.present?
+        payloads = batch.map do |message|
+          message.payload ? self.class.decoder.decode(message.payload) : nil
+        end
+        _received_batch(payloads, metadata)
+        _with_error_span(payloads, metadata) do
+          yield payloads, metadata
         end
       end
+      _handle_success(benchmark.real, payloads, metadata)
     end
 
     # Consume a batch of incoming messages.

data/lib/deimos/consumer.rb

@@ -17,19 +17,15 @@ module Deimos
     def around_consume(payload, metadata)
       _received_message(payload, metadata)
       benchmark = Benchmark.measure do
-        _with_error_span(payload, metadata) { yield }
+        _with_error_span(payload, metadata) do
+          metadata[:key] = decode_key(metadata[:key]) if self.class.config[:key_configured]
+          decoded_payload = payload ? self.class.decoder.decode(payload) : nil
+          yield decoded_payload, metadata
+        end
       end
       _handle_success(benchmark.real, payload, metadata)
     end
 
-    # :nodoc:
-    def before_consume(payload, metadata)
-      _with_error_span(payload, metadata) do
-        metadata[:key] = decode_key(metadata[:key]) if self.class.config[:key_configured]
-        self.class.decoder.decode(payload) if payload.present?
-      end
-    end
-
     # Consume incoming messages.
     # @param _payload [String]
     # @param _metadata [Hash]

data/lib/deimos/test_helpers.rb

@@ -201,6 +201,7 @@ module Deimos
                        'partition_key' => partition_key,
                        'partition' => 1,
                        'offset' => 1,
+                       'headers' => {},
                        'value' => payload)
 
       unless skip_expectation
@@ -222,7 +223,7 @@ module Deimos
       expect {
         handler_class.decoder.validate(payload,
                                        schema: handler_class.decoder.schema)
-      }.to raise_error
+      }.to raise_error(Avro::SchemaValidator::ValidationError)
     end
 
     # Test that a given handler will consume a given batch payload correctly,
@@ -262,6 +263,7 @@ module Deimos
                'partition_key' => partition_key,
                'partition' => 1,
                'offset' => 1,
+               'headers' => {},
                'value' => payload)
       end
       batch = double('fetched_batch',

data/lib/deimos/version.rb

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

data/spec/spec_helper.rb

@@ -151,7 +151,7 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.before(:each) do |ex|
+  config.before(:each) do
     Deimos.config.reset!
     Deimos.configure do |deimos_config|
       deimos_config.phobos_config_file = File.join(File.dirname(__FILE__), 'phobos.yml')
@@ -163,7 +163,6 @@ RSpec.configure do |config|
       deimos_config.logger.level = Logger::INFO
       deimos_config.schema.backend = :avro_validation
     end
-    stub_producers_and_consumers! unless ex.metadata[:integration]
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.beta2
+  version: 1.6.0.pre.beta1
 platform: ruby
 authors:
 - Daniel Orner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2.pre.beta2
+        version: 1.9.0.pre.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.2.pre.beta2
+        version: 1.9.0.pre.beta3
 - !ruby/object:Gem::Dependency
   name: ruby-kafka
   requirement: !ruby/object:Gem::Requirement