deimos-ruby 1.12.3 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 755e18a8a926a57147e5702c32e97e4a436855be16d023e7fae55e1cc54e31cc
-  data.tar.gz: 0b13c1f56ae9a384b6beb55e792a5461dad0366c149e11efeee17687b2fc5461
+  metadata.gz: 945958ca7b49192f533a47eac766f4ca463d7ed85702b2c85b41fc22d8aaeef1
+  data.tar.gz: 8e7a6bf75f733d1903810a85e6ccf0185a868d8dbc07a1544d210bb160135417
 SHA512:
-  metadata.gz: 68d6a5b47a82f32f0a4619f3d915cf63332b17e2c3f1d2f5cf257c18410a8e2628c266b72f9167fd95ce6191cfacbf13dd5fb72b3ee86b4fb6cd98b366fd2d82
-  data.tar.gz: ee4ae15d36fe70bc5fedb9118a926be60918b7108198b9b964fb1a9aa8a92b77d630957b0237ac584b2acf8cace6e454725c2016f75167c13f720d0cbe04a653
+  metadata.gz: 220de8bc9a38b50affdc56e0f25c6a185ffc1646cf39de21478b6906fc1fcf3bf20c197d4105132ecc7cae004e75498299ebc104fcb8d46f530fe8a67ac92883
+  data.tar.gz: fd89136dea1f76acb4de3bda22ee06e1d5ef88dc827a2690b588d2e84284584041818bbb257b71db99212586005a4b6818f89e8f627dc727e2eb8ba1b144c94f

data/.gemfiles/avro_turf-0.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile '../Gemfile'
+
+gem 'avro_turf', '~> 0.11'

data/.gemfiles/avro_turf-1.gemfile

@@ -0,0 +1,3 @@
+eval_gemfile '../Gemfile'
+
+gem 'avro_turf', '~> 1.0'

data/.github/workflows/ci.yml

@@ -0,0 +1,49 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches: [ master ]
+
+env:
+  GIT_COMMIT_SHA: ${{ github.sha }}
+  GIT_BRANCH: ${{ github.ref }}
+
+jobs:
+  linting:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_WITH: lint
+      BUNDLE_WITHOUT: development:test
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby 2.7
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: Rubocop
+        run: bundle exec rubocop --format progress
+
+  build:
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/.gemfiles/${{ matrix.gemfile }}.gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        gemfile: [ 'avro_turf-0', 'avro_turf-1' ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Test
+        run: bundle exec rspec

data/.gitignore

@@ -12,6 +12,7 @@
 /test/version_tmp/
 /tmp/
 /log/
+Gemfile.lock
 
 # Used by dotenv library to load environment variables.
 # .env
@@ -38,4 +39,4 @@
 
 test.sqlite3
 
-.idea
+.idea

data/CHANGELOG.md

@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## UNRELEASED
 
+# 1.12.6 - 2022-03-14
+
+- Fix NameError when using Datadog Metrics
+- Fix unwanted STDOUT output when loading the main `Deimos` module
+
+# 1.12.5 - 2022-03-09
+
+- Allow use of new avro_turf versions where child schemas are not listed with the top level schemas
+- Add support for SASL authentication with brokers
+- Add support for Basic auth with Schema Registry
+
+# 1.12.4 - 2022-01-13
+
+- Fix bug where schema controller mixin was using the schema name to register and not the namespaced schema name
+
 # 1.12.3 - 2021-12-13
 
 - Fix bug with previous release

data/README.md

@@ -259,7 +259,7 @@ like this:
 ```javascript
 {
   "namespace": "com.my-namespace",
-  "name": "MySchema-key",
+  "name": "MySchema_key",
   "type": "record",
   "doc": "Key for com.my-namespace.MySchema",
   "fields": [
@@ -934,8 +934,8 @@ The following metrics are reported:
 
 ### Configuring Metrics Providers
 
-See the `metrics` field under [Configuration](CONFIGURATION.md).
-View all available Metrics Providers [here](lib/deimos/metrics/metrics_providers)
+See the `metrics` field under [Configuration](#configuration).
+View all available Metrics Providers [here](lib/deimos/metrics)
 
 ### Custom Metrics Providers
 

data/bin/console

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'deimos'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/deimos-ruby.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency('avro_turf', '~> 0.11')
+  spec.add_runtime_dependency('avro_turf', '>= 0.11', '< 2')
   spec.add_runtime_dependency('phobos', '>= 1.9', '< 3.0')
   spec.add_runtime_dependency('ruby-kafka', '< 2')
   spec.add_runtime_dependency('sigurd', '~> 0.0.1')

data/docs/CONFIGURATION.md

@@ -130,9 +130,21 @@ kafka.client_id|`phobos`|Identifier for this application.
 kafka.connect_timeout|15|The socket timeout for connecting to the broker, in seconds.
 kafka.socket_timeout|15|The socket timeout for reading and writing to the broker, in seconds.
 kafka.ssl.enabled|false|Whether SSL is enabled on the brokers.
+kafka.ssl.ca_certs_from_system|false|Use CA certs from system.
 kafka.ssl.ca_cert|nil| A PEM encoded CA cert, a file path to the cert, or an Array of certs to use with an SSL connection.
 kafka.ssl.client_cert|nil|A PEM encoded client cert to use with an SSL connection, or a file path to the cert.
 kafka.ssl.client_cert_key|nil|A PEM encoded client cert key to use with an SSL connection.
+kafka.sasl.enabled|false|Whether SASL is enabled on the brokers.
+kafka.sasl.gssapi_principal|nil|A KRB5 principal.
+kafka.sasl.gssapi_keytab|nil|A KRB5 keytab filepath.
+kafka.sasl.plain_authzid|nil|Plain authorization ID.
+kafka.sasl.plain_username|nil|Plain username.
+kafka.sasl.plain_password|nil|Plain password.
+kafka.sasl.scram_username|nil|SCRAM username.
+kafka.sasl.scram_password|nil|SCRAM password.
+kafka.sasl.scram_mechanism|nil|Scram mechanism, either "sha256" or "sha512".
+kafka.sasl.enforce_ssl|nil|Whether to enforce SSL with SASL.
+kafka.sasl.oauth_token_provider|nil|OAuthBearer Token Provider instance that implements method token. See {Sasl::OAuth#initialize}.
 
 ## Consumer Configuration
 
@@ -177,9 +189,11 @@ Config name|Default|Description
 -----------|-------|-----------
 schema.backend|`:mock`|Backend representing the schema encoder/decoder. You can see a full list [here](../lib/deimos/schema_backends).
 schema.registry_url|`http://localhost:8081`|URL of the Confluent schema registry.
+schema.user|nil|Basic auth user.
+schema.password|nil|Basic auth password.
 schema.path|nil|Local path to find your schemas.
 schema.use_schema_classes|false|Set this to true to use generated schema classes in your application.
-schema.generated_schema_path|`app/lib/schema_classes`|Local path to generated schema classes.
+schema.generated_class_path|`app/lib/schema_classes`|Local path to generated schema classes.
 
 ## Database Producer Configuration
 

data/lib/deimos/config/configuration.rb

@@ -136,6 +136,58 @@ module Deimos
 
         # Verify certificate hostname if supported (ruby >= 2.4.0)
         setting :verify_hostname, true
+
+        # Use CA certs from system. This is useful to have enabled for Confluent Cloud
+        # @return [Boolean]
+        setting :ca_certs_from_system, false
+      end
+
+      setting :sasl do
+        # Whether SASL is enabled on the brokers.
+        # @return [Boolean]
+        setting :enabled
+
+        # A KRB5 principal.
+        # @return [String]
+        setting :gssapi_principal
+
+        # A KRB5 keytab filepath.
+        # @return [String]
+        setting :gssapi_keytab
+
+        # Plain authorization ID. It needs to default to '' in order for it to work.
+        # This is because Phobos expects it to be truthy for using plain SASL.
+        # @return [String]
+        setting :plain_authzid, ''
+
+        # Plain username.
+        # @return [String]
+        setting :plain_username
+
+        # Plain password.
+        # @return [String]
+        setting :plain_password
+
+        # SCRAM username.
+        # @return [String]
+        setting :scram_username
+
+        # SCRAM password.
+        # @return [String]
+        setting :scram_password
+
+        # Scram mechanism, either "sha256" or "sha512".
+        # @return [String]
+        setting :scram_mechanism
+
+        # Whether to enforce SSL with SASL.
+        # @return [Boolean]
+        setting :enforce_ssl
+
+        # OAuthBearer Token Provider instance that implements
+        # method token. See {Sasl::OAuth#initialize}.
+        # @return [Object]
+        setting :oauth_token_provider
       end
     end
 
@@ -272,6 +324,14 @@ module Deimos
       # @return [String]
       setting :registry_url, 'http://localhost:8081'
 
+      # Basic Auth user.
+      # @return [String]
+      setting :user
+
+      # Basic Auth password.
+      # @return [String]
+      setting :password
+
       # Local path to look for schemas in.
       # @return [String]
       setting :path
@@ -287,11 +347,11 @@ module Deimos
 
     # The configured metrics provider.
     # @return [Metrics::Provider]
-    setting :metrics, Metrics::Mock.new
+    setting :metrics, default_proc: proc { Metrics::Mock.new }
 
     # The configured tracing / APM provider.
     # @return [Tracing::Provider]
-    setting :tracer, Tracing::Mock.new
+    setting :tracer, default_proc: proc { Tracing::Mock.new }
 
     setting :db_producer do
 

data/lib/deimos/config/phobos_config.rb

@@ -38,6 +38,7 @@ module Deimos
           connect_timeout: self.kafka.connect_timeout,
           socket_timeout: self.kafka.socket_timeout,
           ssl_verify_hostname: self.kafka.ssl.verify_hostname,
+          ssl_ca_certs_from_system: self.kafka.ssl.ca_certs_from_system,
           seed_brokers: Array.wrap(self.kafka.seed_brokers)
         },
         producer: {
@@ -84,6 +85,26 @@ module Deimos
           p_config[:kafka]["ssl_#{key}".to_sym] = ssl_var_contents(self.kafka.ssl.send(key))
         end
       end
+
+      if self.kafka.sasl.enabled
+        p_config[:kafka][:sasl_over_ssl] = self.kafka.sasl.enforce_ssl
+        %w(
+          gssapi_principal
+          gssapi_keytab
+          plain_authzid
+          plain_username
+          plain_password
+          scram_username
+          scram_password
+          scram_mechanism
+          oauth_token_provider
+        ).each do |key|
+          value = self.kafka.sasl.send(key)
+          next if value.blank?
+
+          p_config[:kafka]["sasl_#{key}".to_sym] = value
+        end
+      end
       p_config
     end
 
@@ -102,6 +123,9 @@ module Deimos
         if k.starts_with?('ssl')
           k = k.sub('ssl_', '')
           self.kafka.ssl.send("#{k}=", v)
+        elsif k.starts_with?('sasl')
+          k = (k == 'sasl_over_ssl') ? 'enforce_ssl' : k.sub('sasl_', '')
+          self.kafka.sasl.send("#{k}=", v)
         else
           self.kafka.send("#{k}=", v)
         end

data/lib/deimos/metrics/datadog.rb

@@ -13,7 +13,7 @@ module Deimos
         raise 'Metrics config must specify namespace' if config[:namespace].nil?
 
         logger.info("DatadogMetricsProvider configured with: #{config}")
-        @client = Datadog::Statsd.new(
+        @client = ::Datadog::Statsd.new(
           config[:host_ip],
           config[:host_port]
         )

data/lib/deimos/schema_backends/avro_schema_registry.rb

@@ -26,6 +26,8 @@ module Deimos
           schema_store: @schema_store,
           registry_url: Deimos.config.schema.registry_url,
           schemas_path: Deimos.config.schema.path,
+          user: Deimos.config.schema.user,
+          password: Deimos.config.schema.password,
           namespace: @namespace
         )
       end

data/lib/deimos/utils/schema_controller_mixin.rb

@@ -106,7 +106,7 @@ module Deimos
       def render_schema(payload, schema: nil, namespace: nil)
         namespace, schema = parse_namespace(:response) if !schema && !namespace
         encoder = Deimos.schema_backend(schema: schema, namespace: namespace)
-        encoded = encoder.encode(payload)
+        encoded = encoder.encode(payload, topic: "#{namespace}.#{schema}")
         response.headers['Content-Type'] = encoder.class.content_type
         send_data(encoded)
       end

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '1.12.3'
+  VERSION = '1.12.6'
 end

data/lib/generators/deimos/schema_class_generator.rb

@@ -53,10 +53,34 @@ module Deimos
           generate_class_from_schema_base(schema_base, key_schema_base: key_schema_base)
         end
 
+        # @param schema [Avro::Schema::NamedSchema]
+        # @return [Array<Avro::Schema::NamedSchema]
+        def child_schemas(schema)
+          if schema.respond_to?(:fields)
+            schema.fields.map(&:type)
+          elsif schema.respond_to?(:values)
+            [schema.values]
+          elsif schema.respond_to?(:items)
+            [schema.items]
+          else
+            []
+          end
+        end
+
+        # @param schemas [Array<Avro::Schema::NamedSchema>]
+        # @return [Array<Avro::Schema::NamedSchema>]
+        def collect_all_schemas(schemas)
+          schemas.dup.each do |schema|
+            schemas.concat(collect_all_schemas(child_schemas(schema)))
+          end
+          schemas.select { |s| s.respond_to?(:name) }.uniq
+        end
+
         # @param schema_base [Deimos::SchemaBackends::Base]
         # @param key_schema_base[Avro::Schema::NamedSchema]
         def generate_class_from_schema_base(schema_base, key_schema_base: nil)
-          schemas = schema_base.schema_store.schemas.values
+          schemas = collect_all_schemas(schema_base.schema_store.schemas.values)
+
           sub_schemas = schemas.reject { |s| s.name == schema_base.schema }
           @sub_schema_templates = sub_schemas.map do |schema|
             _generate_class_template_from_schema(schema)

data/spec/active_record_batch_consumer_spec.rb

@@ -315,7 +315,7 @@ module ActiveRecordBatchConsumerTest
         Class.new(described_class) do
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config schema: 'MySchemaCompound-key'
+          key_config schema: 'MySchemaCompound_key'
           record_class Widget
           compacted false
 

data/spec/active_record_consumer_spec.rb

@@ -76,7 +76,7 @@ module ActiveRecordConsumerTest
                                      updated_at: 1.day.ago.to_i,
                                      some_datetime_int: Time.zone.now.to_i,
                                      timestamp: 2.minutes.ago.to_s
-                                   }, { call_original: true, key: 5 })
+                                   }, call_original: true, key: 5)
 
               expect(Widget.count).to eq(1)
               widget = Widget.last
@@ -96,7 +96,7 @@ module ActiveRecordConsumerTest
                                      some_int: 3,
                                      some_datetime_int: Time.zone.now.to_i,
                                      timestamp: 2.minutes.ago.to_s
-                                   }, { call_original: true, key: 5 })
+                                   }, call_original: true, key: 5)
               expect(Widget.unscoped.count).to eq(1)
               widget = Widget.unscoped.last
               expect(widget.id).to eq(5)
@@ -120,7 +120,7 @@ module ActiveRecordConsumerTest
             test_consume_message(MyCustomFetchConsumer, {
                                    test_id: 'id1',
                                    some_int: 3
-                                 }, { call_original: true })
+                                 }, call_original: true)
             expect(widget1.reload.updated_at.in_time_zone).
               to eq(Time.local(2020, 5, 6, 5, 5, 5))
             travel_back
@@ -132,13 +132,13 @@ module ActiveRecordConsumerTest
             test_consume_message(MyCustomFetchConsumer, {
                                    test_id: 'id1',
                                    some_int: 3
-                                 }, { call_original: true })
+                                 }, call_original: true)
             expect(widget1.reload.some_int).to eq(3)
             expect(Widget.count).to eq(1)
             test_consume_message(MyCustomFetchConsumer, {
                                    test_id: 'id2',
                                    some_int: 4
-                                 }, { call_original: true })
+                                 }, call_original: true)
             expect(Widget.count).to eq(2)
             expect(Widget.find_by_test_id('id1').some_int).to eq(3)
             expect(Widget.find_by_test_id('id2').some_int).to eq(4)
@@ -153,7 +153,7 @@ module ActiveRecordConsumerTest
                                    updated_at: 1.day.ago.to_i,
                                    some_datetime_int: Time.zone.now.to_i,
                                    timestamp: 2.minutes.ago.to_s
-                                 }, { call_original: true, key: 5 })
+                                 }, call_original: true, key: 5)
             expect(Widget.count).to eq(0)
           end
         end

data/spec/active_record_producer_spec.rb

@@ -76,7 +76,7 @@ describe Deimos::ActiveRecordProducer do
 
         it 'should be able to call the record' do
           widget = Widget.create!(test_id: 'abc2', some_int: 3)
-          MyProducerWithID.send_event(id: widget.id, test_id: 'abc2', some_int: 3)
+          MyProducerWithID.send_event({id: widget.id, test_id: 'abc2', some_int: 3})
           expect('my-topic-with-id').to have_sent(
             test_id: 'abc2',
             some_int: 3,

data/spec/config/configuration_spec.rb

@@ -70,6 +70,7 @@ describe Deimos, 'configuration' do
         connect_timeout: 15,
         socket_timeout: 15,
         ssl_verify_hostname: true,
+        ssl_ca_certs_from_system: false,
         seed_brokers: ['localhost:9092']
       },
       listeners: [
@@ -138,10 +139,22 @@ describe Deimos, 'configuration' do
         connect_timeout 30
         socket_timeout 30
         ssl.enabled(true)
+        ssl.ca_certs_from_system(true)
         ssl.ca_cert('cert')
         ssl.client_cert('cert')
         ssl.client_cert_key('key')
         ssl.verify_hostname(false)
+        sasl.enabled true
+        sasl.gssapi_principal 'gssapi_principal'
+        sasl.gssapi_keytab 'gssapi_keytab'
+        sasl.plain_authzid 'plain_authzid'
+        sasl.plain_username 'plain_username'
+        sasl.plain_password 'plain_password'
+        sasl.scram_username 'scram_username'
+        sasl.scram_password 'scram_password'
+        sasl.scram_mechanism 'scram_mechanism'
+        sasl.enforce_ssl true
+        sasl.oauth_token_provider 'oauth_token_provider'
       end
       consumers do
         session_timeout 30
@@ -210,11 +223,22 @@ describe Deimos, 'configuration' do
           client_id: 'phobos2',
           connect_timeout: 30,
           socket_timeout: 30,
+          ssl_ca_certs_from_system: true,
           ssl_ca_cert: 'cert',
           ssl_client_cert: 'cert',
           ssl_client_cert_key: 'key',
           ssl_verify_hostname: false,
-          seed_brokers: ['my-seed-brokers']
+          seed_brokers: ['my-seed-brokers'],
+          sasl_gssapi_principal: 'gssapi_principal',
+          sasl_gssapi_keytab: 'gssapi_keytab',
+          sasl_plain_authzid: 'plain_authzid',
+          sasl_plain_username: 'plain_username',
+          sasl_plain_password: 'plain_password',
+          sasl_scram_username: 'scram_username',
+          sasl_scram_password: 'scram_password',
+          sasl_scram_mechanism: 'scram_mechanism',
+          sasl_over_ssl: true,
+          sasl_oauth_token_provider: 'oauth_token_provider',
         },
         listeners: [
           {

data/spec/consumer_spec.rb

@@ -32,8 +32,8 @@ module ConsumerTest
 
           it 'should consume a message' do
             test_consume_message(MyConsumer,
-                                 'test_id' => 'foo',
-                                 'some_int' => 123) do |payload, _metadata|
+                                 {'test_id' => 'foo',
+                                 'some_int' => 123}) do |payload, _metadata|
                                    expect(payload['test_id']).to eq('foo')
                                    expect(payload['some_int']).to eq(123)
                                  end
@@ -64,15 +64,15 @@ module ConsumerTest
 
           it 'should consume a message on a topic' do
             test_consume_message('my_consume_topic',
-                                 'test_id' => 'foo',
-                                 'some_int' => 123) do |payload, _metadata|
+                                 {'test_id' => 'foo',
+                                 'some_int' => 123}) do |payload, _metadata|
                                    expect(payload['test_id']).to eq('foo')
                                    expect(payload['some_int']).to eq(123)
                                  end
           end
 
           it 'should fail on invalid message' do
-            test_consume_invalid_message(MyConsumer, 'invalid' => 'key')
+            test_consume_invalid_message(MyConsumer, {'invalid' => 'key'})
           end
 
           it 'should fail if reraise is false but fatal_error is true' do
@@ -85,14 +85,14 @@ module ConsumerTest
               config.consumers.fatal_error = proc { true }
               config.consumers.reraise_errors = false
             end
-            test_consume_invalid_message(MyConsumer, 'invalid' => 'key')
+            test_consume_invalid_message(MyConsumer, {'invalid' => 'key'})
           end
 
           it 'should fail on message with extra fields' do
             test_consume_invalid_message(MyConsumer,
-                                         'test_id' => 'foo',
+                                         {'test_id' => 'foo',
                                          'some_int' => 123,
-                                         'extra_field' => 'field name')
+                                         'extra_field' => 'field name'})
           end
 
           it 'should not fail when before_consume fails without reraising errors' do
@@ -102,7 +102,7 @@ module ConsumerTest
                 MyConsumer,
                 { 'test_id' => 'foo',
                   'some_int' => 123 },
-                { skip_expectation: true }
+                skip_expectation: true
               ) { raise 'OH NOES' }
             }.not_to raise_error
           end
@@ -113,7 +113,7 @@ module ConsumerTest
               test_consume_message(
                 MyConsumer,
                 { 'invalid' => 'key' },
-                { skip_expectation: true }
+                skip_expectation: true
               )
             }.not_to raise_error
           end
@@ -122,7 +122,7 @@ module ConsumerTest
             expect {
               test_consume_message(MyConsumer,
                                    { 'test_id' => 'foo', 'some_int' => 123 },
-                                   { call_original: true })
+                                   call_original: true)
             }.to raise_error('This should not be called unless call_original is set')
           end
         end
@@ -189,10 +189,10 @@ module ConsumerTest
       it 'should consume a message' do
         expect(Deimos.config.metrics).to receive(:histogram).twice
         test_consume_message('my_consume_topic',
-                             'test_id' => 'foo',
+                             {'test_id' => 'foo',
                              'some_int' => 123,
                              'updated_at' => Time.now.to_i,
-                             'timestamp' => 2.minutes.ago.to_s) do |payload, _metadata|
+                             'timestamp' => 2.minutes.ago.to_s}) do |payload, _metadata|
                                expect(payload['test_id']).to eq('foo')
                              end
       end
@@ -200,17 +200,17 @@ module ConsumerTest
       it 'should fail nicely when timestamp wrong format' do
         expect(Deimos.config.metrics).to receive(:histogram).twice
         test_consume_message('my_consume_topic',
-                             'test_id' => 'foo',
+                             {'test_id' => 'foo',
                              'some_int' => 123,
                              'updated_at' => Time.now.to_i,
-                             'timestamp' => 'dffdf') do |payload, _metadata|
+                             'timestamp' => 'dffdf'}) do |payload, _metadata|
                                expect(payload['test_id']).to eq('foo')
                              end
         test_consume_message('my_consume_topic',
-                             'test_id' => 'foo',
+                             {'test_id' => 'foo',
                              'some_int' => 123,
                              'updated_at' => Time.now.to_i,
-                             'timestamp' => '') do |payload, _metadata|
+                             'timestamp' => ''}) do |payload, _metadata|
                                expect(payload['test_id']).to eq('foo')
                              end
       end

data/spec/generators/schema_class_generator_spec.rb

@@ -81,7 +81,7 @@ RSpec.describe Deimos::Generators::SchemaClassGenerator do
           topic 'MyTopic'
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config schema: 'MySchema-key'
+          key_config schema: 'MySchema_key'
         end
       end
       described_class.start
@@ -143,7 +143,7 @@ RSpec.describe Deimos::Generators::SchemaClassGenerator do
           topic 'MyTopic'
           schema 'MySchema'
           namespace 'com.my-namespace'
-          key_config schema: 'MySchema-key'
+          key_config schema: 'MySchema_key'
         end
 
         producer do

data/spec/producer_spec.rb

@@ -53,7 +53,7 @@ module ProducerTest
         schema 'MySchema'
         namespace 'com.my-namespace'
         topic 'my-topic2'
-        key_config schema: 'MySchema-key'
+        key_config schema: 'MySchema_key'
       end
       stub_const('MySchemaProducer', producer_class)
 
@@ -79,7 +79,7 @@ module ProducerTest
         expect(event.payload[:payloads]).to eq([{ 'invalid' => 'key' }])
       end
       expect(MyProducer.encoder).to receive(:validate).and_raise('OH NOES')
-      expect { MyProducer.publish('invalid' => 'key', :payload_key => 'key') }.
+      expect { MyProducer.publish({'invalid' => 'key', :payload_key => 'key'}) }.
         to raise_error('OH NOES')
       Deimos.unsubscribe(subscriber)
     end
@@ -294,7 +294,7 @@ module ProducerTest
 
     it 'should properly encode and coerce values with a nested record' do
       expect(MyNestedSchemaProducer.encoder).to receive(:encode_key).with('test_id', 'foo', topic: 'my-topic-key')
-      MyNestedSchemaProducer.publish(
+      MyNestedSchemaProducer.publish({
         'test_id' => 'foo',
         'test_float' => BigDecimal('123.456'),
         'test_array' => ['1'],
@@ -305,7 +305,7 @@ module ProducerTest
           'some_optional_int' => nil
         },
         'some_optional_record' => nil
-      )
+                                     })
       expect(MyNestedSchemaProducer.topic).to have_sent(
         'test_id' => 'foo',
         'test_float' => 123.456,
@@ -504,23 +504,23 @@ module ProducerTest
       it 'should disable globally' do
         Deimos.disable_producers do
           Deimos.disable_producers do # test nested
-            MyProducer.publish(
+            MyProducer.publish({
               'test_id' => 'foo',
               'some_int' => 123,
               :payload_key => '123'
-            )
-            MyProducerWithID.publish(
+                               })
+            MyProducerWithID.publish({
               'test_id' => 'foo', 'some_int' => 123
-            )
+                                     })
             expect('my-topic').not_to have_sent(anything)
             expect(Deimos).to be_producers_disabled
             expect(Deimos).to be_producers_disabled([MyProducer])
           end
         end
 
-        MyProducerWithID.publish(
+        MyProducerWithID.publish({
           'test_id' => 'foo', 'some_int' => 123, :payload_key => 123
-        )
+                                 })
         expect('my-topic').
           to have_sent('test_id' => 'foo', 'some_int' => 123,
                        'message_id' => anything, 'timestamp' => anything)
@@ -531,15 +531,15 @@ module ProducerTest
       it 'should disable a single producer' do
         Deimos.disable_producers(MyProducer) do # test nested
           Deimos.disable_producers(MyProducer) do
-            MySchemaProducer.publish(
-              'test_id' => 'foo', 'some_int' => 123,
-              :payload_key => { 'test_id' => 'foo_key' }
-            )
-            MyProducer.publish(
-              'test_id' => 'foo',
-              'some_int' => 123,
-              :payload_key => '123'
-            )
+            MySchemaProducer.publish({
+                                       'test_id' => 'foo', 'some_int' => 123,
+                                       :payload_key => { 'test_id' => 'foo_key' }
+                                     })
+            MyProducer.publish({
+                                 'test_id' => 'foo',
+                                 'some_int' => 123,
+                                 :payload_key => '123'
+                               })
             expect('my-topic').not_to have_sent(anything)
             expect('my-topic2').to have_sent('test_id' => 'foo', 'some_int' => 123)
             expect(Deimos).not_to be_producers_disabled
@@ -550,11 +550,11 @@ module ProducerTest
         expect(Deimos).not_to be_producers_disabled
         expect(Deimos).not_to be_producers_disabled(MyProducer)
         expect(Deimos).not_to be_producers_disabled(MySchemaProducer)
-        MyProducer.publish(
-          'test_id' => 'foo',
-          'some_int' => 123,
-          :payload_key => '123'
-        )
+        MyProducer.publish({
+                             'test_id' => 'foo',
+                             'some_int' => 123,
+                             :payload_key => '123'
+                           })
         expect('my-topic').
           to have_sent('test_id' => 'foo', 'some_int' => 123)
       end

data/spec/schema_backends/avro_base_shared.rb

@@ -87,13 +87,13 @@ RSpec.shared_examples_for('an Avro backend') do
   describe('#validate') do
     it 'should pass valid schemas' do
       expect {
-        backend.validate({ 'test_id' => 'hi', 'some_int' => 4 }, { schema: 'MySchema' })
+        backend.validate({ 'test_id' => 'hi', 'some_int' => 4 }, schema: 'MySchema')
       }.not_to raise_error
     end
 
     it 'should fail invalid schemas' do
       expect {
-        backend.validate({ 'test_id2' => 'hi', 'some_int' => 4 }, { schema: 'MySchema' })
+        backend.validate({ 'test_id2' => 'hi', 'some_int' => 4 }, schema: 'MySchema')
       }.to raise_error(Avro::SchemaValidator::ValidationError)
     end
 

data/spec/schema_classes/my_schema_key.rb

@@ -3,7 +3,7 @@
 # This file is autogenerated by Deimos, Do NOT modify
 module Schemas
   ### Primary Schema Class ###
-  # Autogenerated Schema for Record at com.my-namespace.MySchema-key
+  # Autogenerated Schema for Record at com.my-namespace.MySchema_key
   class MySchemaKey < Deimos::SchemaClass::Record
     ### Attribute Accessors ###
     # @param value [String]
@@ -17,7 +17,7 @@ module Schemas
 
     # @override
     def schema
-      'MySchema-key'
+      'MySchema_key'
     end
 
     # @override

data/spec/schemas/com/my-namespace/{MySchemaCompound-key.avsc → MySchemaCompound_key.avsc}

@@ -1,6 +1,6 @@
 {
   "namespace": "com.my-namespace",
-  "name": "MySchemaCompound-key",
+  "name": "MySchemaCompound_key",
   "type": "record",
   "doc": "Test schema",
   "fields": [

data/spec/schemas/com/my-namespace/{MySchema-key.avsc → MySchema_key.avsc}

@@ -1,6 +1,6 @@
 {
   "namespace": "com.my-namespace",
-  "name": "MySchema-key",
+  "name": "MySchema_key",
   "type": "record",
   "doc": "Test schema",
   "fields": [

data/spec/utils/inline_consumer_spec.rb

@@ -17,14 +17,14 @@ describe Deimos::Utils::SeekListener do
     it 'should seek offset' do
       allow(consumer).to receive(:seek)
       expect(consumer).to receive(:seek).once
-      seek_listener = described_class.new({ handler: handler, group_id: 999, topic: 'test_topic' })
+      seek_listener = described_class.new(handler: handler, group_id: 999, topic: 'test_topic')
       seek_listener.start_listener
     end
 
     it 'should retry on errors when seeking offset' do
       allow(consumer).to receive(:seek).and_raise(StandardError)
       expect(consumer).to receive(:seek).twice
-      seek_listener = described_class.new({ handler: handler, group_id: 999, topic: 'test_topic' })
+      seek_listener = described_class.new(handler: handler, group_id: 999, topic: 'test_topic')
       seek_listener.start_listener
     end
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.6
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: phobos
   requirement: !ruby/object:Gem::Requirement
@@ -342,11 +348,15 @@ description:
 email:
 - daniel.orner@wishabi.com
 executables:
+- console
 - deimos
 extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".gemfiles/avro_turf-0.gemfile"
+- ".gemfiles/avro_turf-1.gemfile"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -357,11 +367,11 @@ files:
 - CODE_OF_CONDUCT.md
 - Dockerfile
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.md
 - README.md
 - Rakefile
+- bin/console
 - bin/deimos
 - deimos-ruby.gemspec
 - docker-compose.yml
@@ -477,14 +487,14 @@ files:
 - spec/schema_classes/my_schema_with_complex_types.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
-- spec/schemas/com/my-namespace/MySchema-key.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
-- spec/schemas/com/my-namespace/MySchemaCompound-key.avsc
+- spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithDateTimes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithId.avsc
 - spec/schemas/com/my-namespace/MySchemaWithUniqueId.avsc
+- spec/schemas/com/my-namespace/MySchema_key.avsc
 - spec/schemas/com/my-namespace/Wibble.avsc
 - spec/schemas/com/my-namespace/Widget.avsc
 - spec/schemas/com/my-namespace/WidgetTheSecond.avsc
@@ -568,14 +578,14 @@ test_files:
 - spec/schema_classes/my_schema_with_complex_types.rb
 - spec/schemas/com/my-namespace/Generated.avsc
 - spec/schemas/com/my-namespace/MyNestedSchema.avsc
-- spec/schemas/com/my-namespace/MySchema-key.avsc
 - spec/schemas/com/my-namespace/MySchema.avsc
-- spec/schemas/com/my-namespace/MySchemaCompound-key.avsc
+- spec/schemas/com/my-namespace/MySchemaCompound_key.avsc
 - spec/schemas/com/my-namespace/MySchemaWithBooleans.avsc
 - spec/schemas/com/my-namespace/MySchemaWithComplexTypes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithDateTimes.avsc
 - spec/schemas/com/my-namespace/MySchemaWithId.avsc
 - spec/schemas/com/my-namespace/MySchemaWithUniqueId.avsc
+- spec/schemas/com/my-namespace/MySchema_key.avsc
 - spec/schemas/com/my-namespace/Wibble.avsc
 - spec/schemas/com/my-namespace/Widget.avsc
 - spec/schemas/com/my-namespace/WidgetTheSecond.avsc

data/Gemfile.lock

@@ -1,292 +0,0 @@
-PATH
-  remote: .
-  specs:
-    deimos-ruby (1.12.0)
-      avro_turf (~> 0.11)
-      fig_tree (~> 0.0.2)
-      phobos (>= 1.9, < 3.0)
-      ruby-kafka (< 2)
-      sigurd (~> 0.0.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      mail (>= 2.7.1)
-    actionmailer (6.1.3)
-      actionpack (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activesupport (= 6.1.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.3)
-      actionview (= 6.1.3)
-      activesupport (= 6.1.3)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3)
-      actionpack (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.3)
-      activesupport (= 6.1.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3)
-      activesupport (= 6.1.3)
-      globalid (>= 0.3.6)
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activerecord-import (1.0.8)
-      activerecord (>= 3.2)
-    activestorage (6.1.3)
-      actionpack (= 6.1.3)
-      activejob (= 6.1.3)
-      activerecord (= 6.1.3)
-      activesupport (= 6.1.3)
-      marcel (~> 0.3.1)
-      mimemagic (~> 0.3.2)
-    activesupport (6.1.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.2)
-    avro (1.9.2)
-      multi_json
-    avro_turf (0.11.0)
-      avro (>= 1.7.7, < 1.10)
-      excon (~> 0.45)
-    builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    concurrent-ruby-ext (1.1.8)
-      concurrent-ruby (= 1.1.8)
-    crass (1.0.6)
-    database_cleaner (1.99.0)
-    ddtrace (0.46.0)
-      msgpack
-    diff-lcs (1.4.4)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
-    dogstatsd-ruby (4.8.3)
-    erubi (1.10.0)
-    excon (0.85.0)
-    exponential-backoff (0.0.4)
-    ffi (1.15.0)
-    fig_tree (0.0.2)
-      activesupport (>= 3.0.0)
-    formatador (0.2.5)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    guard (2.16.2)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.4.0)
-      guard (~> 2.0)
-      rubocop (< 2.0)
-    i18n (1.8.9)
-      concurrent-ruby (~> 1.0)
-    listen (3.4.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    little-plugger (1.1.4)
-    logging (2.3.0)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.14)
-    loofah (2.9.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.2.8)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
-    mini_mime (1.0.2)
-    mini_portile2 (2.5.1)
-    minitest (5.14.4)
-    msgpack (1.4.2)
-    multi_json (1.15.0)
-    mysql2 (0.5.3)
-    nenv (0.3.0)
-    nio4r (2.5.7)
-    nokogiri (1.11.5)
-      mini_portile2 (~> 2.5.0)
-      racc (~> 1.4)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    pg (1.2.3)
-    phobos (2.1.0)
-      activesupport (>= 3.0.0)
-      concurrent-ruby (>= 1.0.2)
-      concurrent-ruby-ext (>= 1.0.2)
-      exponential-backoff
-      logging
-      ruby-kafka
-      thor
-    pry (0.14.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3)
-      actioncable (= 6.1.3)
-      actionmailbox (= 6.1.3)
-      actionmailer (= 6.1.3)
-      actionpack (= 6.1.3)
-      actiontext (= 6.1.3)
-      actionview (= 6.1.3)
-      activejob (= 6.1.3)
-      activemodel (= 6.1.3)
-      activerecord (= 6.1.3)
-      activestorage (= 6.1.3)
-      activesupport (= 6.1.3)
-      bundler (>= 1.15.0)
-      railties (= 6.1.3)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.3)
-      actionpack (= 6.1.3)
-      activesupport (= 6.1.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (4.1.1)
-      actionpack (>= 4.2)
-      activesupport (>= 4.2)
-      railties (>= 4.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    rspec_junit_formatter (0.4.1)
-      rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.89.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.8.0)
-      parser (>= 2.7.1.5)
-    rubocop-rspec (1.42.0)
-      rubocop (>= 0.87.0)
-    ruby-kafka (1.4.0)
-      digest-crc
-    ruby-progressbar (1.11.0)
-    shellany (0.0.1)
-    sigurd (0.0.3)
-      concurrent-ruby (~> 1)
-      exponential-backoff
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.1.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (1.7.0)
-    websocket-driver (0.7.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-import
-  avro (~> 1.9)
-  database_cleaner (~> 1.7)
-  ddtrace (~> 0.11)
-  deimos-ruby!
-  dogstatsd-ruby (~> 4.2)
-  guard (~> 2)
-  guard-rspec (~> 4)
-  guard-rubocop (~> 1)
-  mysql2 (~> 0.5)
-  pg (~> 1.1)
-  rails (~> 6)
-  rake (~> 13)
-  rspec (~> 3)
-  rspec-rails (~> 4)
-  rspec_junit_formatter (~> 0.3)
-  rubocop (= 0.89.0)
-  rubocop-rspec (= 1.42.0)
-  sqlite3 (~> 1.3)
-
-BUNDLED WITH
-   2.2.17