avromatic 2.4.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7401c0e72992925f02234f5d3d2ab8e762a36bc62aa25c631569d6f4d9918d2
-  data.tar.gz: f2121b2a62bf60893ea0eb143ed83a142ea069d07839fb8121d0618483b469d5
+  metadata.gz: 6b0efb11db848986a5f33f4d499ac919bb1e217b8e1d0b06311f485a26f0c94a
+  data.tar.gz: 2aee989c64a77e875894146a98ebdcd8a15409ba556b86a1d4bce9c18ee977fa
 SHA512:
-  metadata.gz: 42be85747686fca4ec66d6e178f7e5aab6d9e9ab88cd4d107ed1c5de8a83017f083a510889ced33a2eb284f45865b3c32b3a9edad200011aed5b17c284f3a593
-  data.tar.gz: be13122bca8693d33e20d1317ae5cd88d8c1c975c08d94ed522d0330d70f202bc43d79d7f2941032bc7540ad83b2d647d3c7d29bb5b72c03a560dfedb85e62f7
+  metadata.gz: a84b530d3d65135ff5520e412cb8517062dfa964bc3cff4511f81d310429d6b804f93a392c5a6add8c9f7c278207ed38e19a0117b3e17b2dfec948ffb2a10748
+  data.tar.gz: 7a1e707977d52b68b2bcd78de6bf8db5db097c7afc32493db2d242c1733aa1b3610d53fd640e68db0d23f9192f9e6e7910793512a6001b36976e700d66ae36ee

data/.circleci/config.yml

@@ -2,14 +2,14 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: salsify/ruby_ci:2.5.8
+      - image: salsify/ruby_ci:2.7.4
     working_directory: ~/avromatic
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v2-gems-ruby-2.5.8-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
-            - v2-gems-ruby-2.5.8-
+            - v2-gems-ruby-2.7.4-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-gems-ruby-2.7.4-
       - run:
           name: Install Gems
           command: |
@@ -18,7 +18,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v2-gems-ruby-2.5.8-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v2-gems-ruby-2.7.4-{{ checksum "avromatic.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -69,17 +69,20 @@ workflows:
           matrix:
             parameters:
               gemfile:
-              - "gemfiles/avro1_8_rails5_2.gemfile"
-              - "gemfiles/avro1_9_rails5_2.gemfile"
               - "gemfiles/avro1_10_rails5_2.gemfile"
-              - "gemfiles/avro1_9_rails6_0.gemfile"
               - "gemfiles/avro1_10_rails6_0.gemfile"
-              - "gemfiles/avro_patches_rails5_2.gemfile"
-              - "gemfiles/avro_patches_rails6_0.gemfile"
               - "gemfiles/avro1_10_rails6_1.gemfile"
-              - "gemfiles/avro1_9_rails6_1.gemfile"
-              - "gemfiles/avro_patches_rails6_1.gemfile"
+              - "gemfiles/avro1_10_rails7_0.gemfile"
+              - "gemfiles/avro1_11_rails7_0.gemfile"
               ruby-version:
-              - "2.5.8"
-              - "2.6.6"
-              - "2.7.1"
+              - "2.7.4"
+      - test:
+          matrix:
+            parameters:
+              gemfile:
+                - "gemfiles/avro1_10_rails6_1.gemfile"
+                - "gemfiles/avro1_10_rails7_0.gemfile"
+                - "gemfiles/avro1_11_rails7_0.gemfile"
+              ruby-version:
+                - "3.0.3"
+                - "3.1.0"

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @jturkel @kphelps @tjwp

data/.gitignore

@@ -9,3 +9,6 @@
 /tmp/
 /gemfiles/*.lock
 /log/*
+
+*.iml
+.idea

data/.rubocop.yml

@@ -2,10 +2,10 @@ inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
   Exclude:
     - 'vendor/**/*'
-    - 'gemfiles/vendor/**/*'
+    - 'gemfiles/**/*'
 
 Style/MultilineBlockChain:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.7.4

data/Appraisals

@@ -1,61 +1,37 @@
 # frozen_string_literal: true
 
-appraise 'avro1_8-rails5_2' do
-  gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 5.2.0'
-  gem 'activemodel', '~> 5.2.0'
-end
-
-appraise 'avro1_9-rails5_2' do
-  gem 'avro', '1.9.2'
-  gem 'activesupport', '~> 5.2.0'
-  gem 'activemodel', '~> 5.2.0'
-end
-
 appraise 'avro1_10-rails5_2' do
   gem 'avro', '~> 1.10.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'avro1_9-rails6_0' do
-  gem 'avro', '1.9.2'
-  gem 'activesupport', '~> 6.0.0'
-  gem 'activemodel', '~> 6.0.0'
-end
-
 appraise 'avro1_10-rails6_0' do
   gem 'avro', '~> 1.10.0'
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
 end
 
-appraise 'avro-patches-rails5_2' do
-  gem 'avro-patches', '>= 0.4.1', '< 1.0'
-  gem 'activesupport', '~> 5.2.0'
-  gem 'activemodel', '~> 5.2.0'
-end
-
-appraise 'avro-patches-rails6_0' do
-  gem 'avro-patches', '>= 1.0.0'
-  gem 'activesupport', '~> 6.0.0'
-  gem 'activemodel', '~> 6.0.0'
-end
-
-appraise 'avro1_9-rails6_1' do
-  gem 'avro', '1.9.2'
+appraise 'avro1_10-rails6_1' do
+  gem 'avro', '~> 1.10.0'
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'
 end
 
-appraise 'avro1_10-rails6_1' do
+appraise 'avro1_10-rails7_0' do
   gem 'avro', '~> 1.10.0'
-  gem 'activesupport', '~> 6.1.0'
-  gem 'activemodel', '~> 6.1.0'
+  gem 'activesupport', '~> 7.0.0'
+  gem 'activemodel', '~> 7.0.0'
 end
 
-appraise 'avro-patches-rails6_1' do
-  gem 'avro-patches', '>= 1.0.0'
+appraise 'avro1_11-rails6_1' do
+  gem 'avro', '~> 1.11.0'
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'
 end
+
+appraise 'avro1_11-rails7_0' do
+  gem 'avro', '~> 1.11.0'
+  gem 'activesupport', '~> 7.0.0'
+  gem 'activemodel', '~> 7.0.0'
+end

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # avromatic changelog
 
+## 4.0.0
+- Drop support for Ruby 2.6.
+- Drop support for Avro 1.9.
+- Add support for Avro 1.11.
+- Add support for Rails 7.0.
+
+## 3.0.2
+- Reset the schema registry client between RSpec tests to ensure any cached values are
+  consistent with the fake schema registry.
+
+## 3.0.1
+- Raise an error when registering a nested model that has already been auto-generated.
+  This avoids hard to troubleshoot coercion errors when instantiating models and fixes 
+  a regression introduced in Avromatic 2.2.2.
+
+## 3.0.0
+- Drop support for Ruby 2.4.
+- Add support for Ruby 3.0.
+- Drop support for Avro < 1.9.
+- Drop support for Rails < 5.2.
+- Fix decoding of unions containing false boolean values.
+
 ## v2.4.0
 - Ignore the `validate` argument and always validate during serialization. This
   argument will be removed in Avromatic 3.0.

data/README.md

@@ -72,7 +72,9 @@ and the [Messaging API](#messaging-api).
   so that they can be referenced by id. Either `schema_registry` or
   `registry_url` must be configured.
 * **registry_url**: URL for the schema registry. Either `schema_registry` or 
-  `registry_url` must be configured.
+  `registry_url` must be configured.  The `build_schema_registry!` method may 
+  be used to create a caching schema registry client instance based on other 
+  configuration values.
 * **use_schema_fingerprint_lookup**: Avromatic supports a Schema Registry
   [extension](https://github.com/salsify/avro-schema-registry#extensions) that
   provides an endpoint to lookup existing schema ids by fingerprint.
@@ -91,6 +93,7 @@ Example using a schema registry:
 Avromatic.configure do |config|
   config.schema_store = AvroTurf::SchemaStore.new(path: 'avro/schemas')
   config.registry_url = Rails.configuration.x.avro_schema_registry_url
+  config.build_schema_registry!
   config.build_messaging!
 end
 ```
@@ -430,23 +433,6 @@ Validation of required fields is done automatically when serializing a model to
 explicitly by calling the `valid?` or `invalid?` methods from the 
 [ActiveModel::Validations](https://edgeapi.rubyonrails.org/classes/ActiveModel/Validations.html) interface.
 
-### Logical Types
-
-Currently the official Apache Avro Ruby library does not support logical types ([AVRO-1695](https://issues.apache.org/jira/browse/AVRO-1695)).
-That feature is in progress and will hopefully be merged soon.
-
-Avromatic supports logical types as implemented in the [pull request](https://github.com/apache/avro/pull/116) referenced in AVRO-1695.
-
-Until that change is included in the official library, you can
-use the [avro-patches gem](https://github.com/salsify/avro-patches) which includes
-the changes from the above pull request.
-
-To use this gem, reference it in your Gemfile instead of `avro`:
-
-```ruby
-gem 'avro-patches'
-````
-
 ### RSpec Support
 
 This gem also includes an `"avromatic/rspec"` file that can be required to support

data/avromatic.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avromatic/version'
 
@@ -15,28 +15,37 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/salsify/avromatic.git'
   spec.license       = 'MIT'
 
+  if spec.respond_to?(:metadata)
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['rubygems_mfa_required'] = 'true'
+  else
+    raise 'RubyGems 2.0 or newer is required to set allowed_push_host.'
+  end
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.4'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'activemodel', '>= 5.0', '< 6.2'
-  spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.2'
-  spec.add_runtime_dependency 'avro', '>= 1.7.7', '< 1.11'
-  spec.add_runtime_dependency 'avro_schema_registry-client', '>= 0.3.0'
+  spec.add_runtime_dependency 'activemodel', '>= 5.2', '< 7.1'
+  spec.add_runtime_dependency 'activesupport', '>= 5.2', '< 7.1'
+  spec.add_runtime_dependency 'avro', '>= 1.10.0', '< 1.12'
+  spec.add_runtime_dependency 'avro_schema_registry-client', '>= 0.4.0'
   spec.add_runtime_dependency 'avro_turf'
   spec.add_runtime_dependency 'ice_nine'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'avro-builder', '>= 0.12.0'
-  spec.add_development_dependency 'bundler', '>= 1.11'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'overcommit', '0.35.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1.1'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.1.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   # For AvroSchemaRegistry::FakeServer

data/gemfiles/{avro1_8_rails5_2.gemfile → avro1_10_rails7_0.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.8.2"
-gem "activesupport", "~> 5.2.0"
-gem "activemodel", "~> 5.2.0"
+gem "avro", "~> 1.10.0"
+gem "activesupport", "~> 7.0.0"
+gem "activemodel", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/{avro1_9_rails6_1.gemfile → avro1_11_rails6_1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.9.2"
+gem "avro", "~> 1.11.0"
 gem "activesupport", "~> 6.1.0"
 gem "activemodel", "~> 6.1.0"
 

data/gemfiles/{avro1_9_rails5_2.gemfile → avro1_11_rails7_0.gemfile}

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.9.2"
-gem "activesupport", "~> 5.2.0"
-gem "activemodel", "~> 5.2.0"
+gem "avro", "~> 1.11.0"
+gem "activesupport", "~> 7.0.0"
+gem "activemodel", "~> 7.0.0"
 
 gemspec path: "../"

data/lib/avromatic/io/datum_writer.rb

@@ -21,9 +21,7 @@ module Avromatic
           end
         end
 
-        unless index_of_schema
-          raise Avro::IO::AvroTypeError.new(writers_schema, datum)
-        end
+        raise Avro::IO::AvroTypeError.new(writers_schema, datum) unless index_of_schema
 
         encoder.write_long(index_of_schema)
         write_data(writers_schema.schemas[index_of_schema], datum, encoder)

data/lib/avromatic/messaging.rb

@@ -16,12 +16,10 @@ module Avromatic
       # The first byte is MAGIC!!!
       magic_byte = decoder.read(1)
 
-      if magic_byte != MAGIC_BYTE
-        raise "Expected data to begin with a magic byte, got `#{magic_byte.inspect}`"
-      end
+      raise "Expected data to begin with a magic byte, got `#{magic_byte.inspect}`" if magic_byte != MAGIC_BYTE
 
       # The schema id is a 4-byte big-endian integer.
-      schema_id = decoder.read(4).unpack('N').first
+      schema_id = decoder.read(4).unpack1('N')
 
       writers_schema = @schemas_by_id.fetch(schema_id) do
         schema_json = @registry.fetch(schema_id)

data/lib/avromatic/model/attributes.rb

@@ -22,6 +22,7 @@ module Avromatic
 
       class AttributeDefinition
         attr_reader :name, :name_string, :setter_name, :type, :field, :default, :owner
+
         delegate :serialize, to: :type
 
         def initialize(owner:, field:, type:)
@@ -58,21 +59,31 @@ module Avromatic
         def coerce(input)
           type.coerce(input)
         rescue Avromatic::Model::UnknownAttributeError => e
-          raise Avromatic::Model::CoercionError.new("Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
+          raise Avromatic::Model::CoercionError.new(
+            "Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
             "because the following unexpected attributes were provided: #{e.unknown_attributes.join(', ')}. " \
             "Only the following attributes are allowed: #{e.allowed_attributes.join(', ')}. " \
-            "Provided argument: #{input.inspect}")
+            "Provided argument: #{input.inspect}"
+          )
         rescue StandardError
           if type.input_classes && type.input_classes.none? { |input_class| input.is_a?(input_class) }
-            raise Avromatic::Model::CoercionError.new("Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
-              "because a #{input.class.name} was provided but expected a #{type.input_classes.map(&:name).to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')}. " \
-              "Provided argument: #{input.inspect}")
+            raise Avromatic::Model::CoercionError.new(
+              "Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
+              "because a #{input.class.name} was provided but expected a #{type.input_classes.map(&:name).to_sentence(
+                two_words_connector: ' or ', last_word_connector: ', or '
+              )}. " \
+              "Provided argument: #{input.inspect}"
+            )
           elsif input.is_a?(Hash) && type.is_a?(Avromatic::Model::Types::UnionType)
-            raise Avromatic::Model::CoercionError.new("Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
-              "because no union member type matches the provided attributes: #{input.inspect}")
+            raise Avromatic::Model::CoercionError.new(
+              "Value for #{owner.name}##{name} could not be coerced to a #{type.name} " \
+              "because no union member type matches the provided attributes: #{input.inspect}"
+            )
           else
-            raise Avromatic::Model::CoercionError.new("Value for #{owner.name}##{name} could not be coerced to a #{type.name}. " \
-              "Provided argument: #{input.inspect}")
+            raise Avromatic::Model::CoercionError.new(
+              "Value for #{owner.name}##{name} could not be coerced to a #{type.name}. " \
+              "Provided argument: #{input.inspect}"
+            )
           end
         end
       end
@@ -106,7 +117,8 @@ module Avromatic
           unknown_attributes = (data.keys.map(&:to_s) - _attributes.keys.map(&:to_s)).sort
           allowed_attributes = attribute_definitions.keys.map(&:to_s).sort
           message = "Unexpected arguments for #{self.class.name}#initialize: #{unknown_attributes.join(', ')}. " \
-            "Only the following arguments are allowed: #{allowed_attributes.join(', ')}. Provided arguments: #{data.inspect}"
+            "Only the following arguments are allowed: #{allowed_attributes.join(', ')}. " \
+            "Provided arguments: #{data.inspect}"
           raise Avromatic::Model::UnknownAttributeError.new(message, unknown_attributes: unknown_attributes,
                                                             allowed_attributes: allowed_attributes)
         end
@@ -136,8 +148,8 @@ module Avromatic
             begin
               define_avro_attributes(key_avro_schema, generated_methods_module,
                                      allow_optional: config.allow_optional_key_fields)
-            rescue OptionalFieldError => ex
-              raise "Optional field '#{ex.field.name}' not allowed in key schema."
+            rescue OptionalFieldError => e
+              raise "Optional field '#{e.field.name}' not allowed in key schema."
             end
           end
           define_avro_attributes(avro_schema, generated_methods_module)
@@ -155,6 +167,7 @@ module Avromatic
           conflicts =
             (key_avro_field_names & value_avro_field_names).each_with_object([]) do |name, msgs|
               next unless schema_fields_differ?(name)
+
               msgs << "Field '#{name}' has a different type in each schema: "\
                       "value #{value_avro_fields_by_name[name]}, "\
                       "key #{key_avro_fields_by_name[name]}"
@@ -190,7 +203,11 @@ module Avromatic
 
             # Add all generated methods to a module so they can be overridden
             generated_methods_module.send(:define_method, field.name) { _attributes[symbolized_field_name] }
-            generated_methods_module.send(:define_method, "#{field.name}?") { !!_attributes[symbolized_field_name] } if FieldHelper.boolean?(field)
+            if FieldHelper.boolean?(field)
+              generated_methods_module.send(:define_method, "#{field.name}?") do
+                !!_attributes[symbolized_field_name]
+              end
+            end
 
             generated_methods_module.send(:define_method, "#{field.name}=") do |value|
               _attributes[symbolized_field_name] = attribute_definition.coerce(value)

data/lib/avromatic/model/configuration.rb

@@ -27,6 +27,7 @@ module Avromatic
       def initialize(**options)
         @avro_schema = find_avro_schema(**options)
         raise ArgumentError.new('value_schema(_name) or schema(_name) must be specified') unless avro_schema
+
         @key_avro_schema = find_schema_by_option(:key_schema, **options)
         @nested_models = options[:nested_models]
         @mutable = options.fetch(:mutable, false)
@@ -46,6 +47,7 @@ module Avromatic
           (options[:schema] || options[:schema_name])
           raise ArgumentError.new('Only one of value_schema(_name) and schema(_name) can be specified')
         end
+
         find_schema_by_option(:value_schema, **options) || find_schema_by_option(:schema, **options)
       end
 

data/lib/avromatic/model/message_decoder.rb

@@ -89,6 +89,7 @@ module Avromatic
         message_key, message_value = extract_key_and_value(*args)
         model_key = model_key_for_message(message_key, message_value)
         raise UnexpectedKeyError.new(*model_key) unless model_map.key?(model_key)
+
         [model_map[model_key], message_key, message_value]
       end
 
@@ -106,7 +107,7 @@ module Avromatic
       end
 
       def extract_schema_id(data)
-        data[1..4].unpack('N').first
+        data[1..4].unpack1('N')
       end
 
       def validate_magic_byte!(data)
@@ -118,6 +119,7 @@ module Avromatic
         models.each_with_object(Hash.new) do |model, map|
           key = model_key(model)
           raise DuplicateKeyError.new(map[key], model) if map.key?(key) && !model.equal?(map[key])
+
           map[key] = model
         end
       end

data/lib/avromatic/model/messaging_serialization.rb

@@ -22,6 +22,7 @@ module Avromatic
 
         def avro_message_key
           raise 'Model has no key schema' unless key_avro_schema
+
           avro_messaging.encode(
             key_attributes_for_avro,
             schema_name: key_avro_schema.fullname

data/lib/avromatic/model/nested_models.rb

@@ -14,12 +14,14 @@ module Avromatic
         def register!
           return unless key_avro_schema.nil? && value_avro_schema.type_sym == :record
 
+          processed = Set.new
           roots = [self]
           until roots.empty?
             model = roots.shift
-            next if nested_models.registered?(model)
+            # Avoid any nested model dependency cycles by ignoring already processed models
+            next unless processed.add?(model)
 
-            nested_models.register(model)
+            nested_models.ensure_registered_model(model)
             roots.concat(model.referenced_model_classes)
           end
         end

data/lib/avromatic/model/raw_serialization.rb

@@ -36,6 +36,7 @@ module Avromatic
           end
 
           raise 'Model has no key schema' unless key_avro_schema
+
           avro_raw_encode(key_attributes_for_avro, :key)
         end
 
@@ -118,7 +119,7 @@ module Avromatic
         # If supplied then the key_schema and value_schema are used as the writer's
         # schema for the corresponding value. The model's schemas are always used
         # as the reader's schemas.
-        def avro_raw_decode(key: nil, value:, key_schema: nil, value_schema: nil)
+        def avro_raw_decode(value:, key: nil, key_schema: nil, value_schema: nil)
           key_attributes = key && decode_avro_datum(key, key_schema, :key)
           value_attributes = decode_avro_datum(value, value_schema, :value)
           value_attributes.merge!(key_attributes) if key_attributes
@@ -150,10 +151,10 @@ module Avromatic
 
         def datum_writer
           @datum_writer ||= begin
-                              hash = { value: datum_writer_class.new(value_avro_schema) }
-                              hash[:key] = datum_writer_class.new(key_avro_schema) if key_avro_schema
-                              hash
-                            end
+            hash = { value: datum_writer_class.new(value_avro_schema) }
+            hash[:key] = datum_writer_class.new(key_avro_schema) if key_avro_schema
+            hash
+          end
         end
 
         def datum_reader

data/lib/avromatic/model/types/array_type.rb

@@ -11,6 +11,7 @@ module Avromatic
         attr_reader :value_type
 
         def initialize(value_type:)
+          super()
           @value_type = value_type
         end
 

data/lib/avromatic/model/types/custom_type.rb

@@ -11,6 +11,7 @@ module Avromatic
         attr_reader :custom_type_configuration, :value_classes, :default_type
 
         def initialize(custom_type_configuration:, default_type:)
+          super()
           @custom_type_configuration = custom_type_configuration
           @default_type = default_type
           @deserializer = custom_type_configuration.deserializer || IDENTITY_PROC
@@ -27,7 +28,11 @@ module Avromatic
         end
 
         def name
-          custom_type_configuration.value_class ? custom_type_configuration.value_class.name.to_s.freeze : default_type.name
+          if custom_type_configuration.value_class
+            custom_type_configuration.value_class.name.to_s.freeze
+          else
+            default_type.name
+          end
         end
 
         def coerce(input)

data/lib/avromatic/model/types/enum_type.rb

@@ -12,6 +12,7 @@ module Avromatic
         attr_reader :allowed_values
 
         def initialize(allowed_values)
+          super()
           @allowed_values = allowed_values.to_set
         end
 

data/lib/avromatic/model/types/fixed_type.rb

@@ -11,6 +11,7 @@ module Avromatic
         attr_reader :size
 
         def initialize(size)
+          super()
           @size = size
         end
 

data/lib/avromatic/model/types/map_type.rb

@@ -11,6 +11,7 @@ module Avromatic
         attr_reader :value_type, :key_type
 
         def initialize(key_type:, value_type:)
+          super()
           @key_type = key_type
           @value_type = value_type
         end

data/lib/avromatic/model/types/record_type.rb

@@ -9,6 +9,7 @@ module Avromatic
         attr_reader :record_class, :value_classes, :input_classes
 
         def initialize(record_class:)
+          super()
           @record_class = record_class
           @value_classes = [record_class].freeze
           @input_classes = [record_class, Hash].freeze

data/lib/avromatic/model/types/type_factory.rb

@@ -59,10 +59,12 @@ module Avromatic
             when :enum
               Avromatic::Model::Types::EnumType.new(schema.symbols)
             when :array
-              value_type = create(schema: schema.items, nested_models: nested_models, use_custom_types: use_custom_types)
+              value_type = create(schema: schema.items, nested_models: nested_models,
+use_custom_types: use_custom_types)
               Avromatic::Model::Types::ArrayType.new(value_type: value_type)
             when :map
-              value_type = create(schema: schema.values, nested_models: nested_models, use_custom_types: use_custom_types)
+              value_type = create(schema: schema.values, nested_models: nested_models,
+use_custom_types: use_custom_types)
               Avromatic::Model::Types::MapType.new(
                 key_type: Avromatic::Model::Types::StringType.new,
                 value_type: value_type
@@ -97,8 +99,10 @@ module Avromatic
           if nested_models.registered?(fullname)
             nested_model = nested_models[fullname]
             unless schema_fingerprint(schema) == schema_fingerprint(nested_model.avro_schema)
-              raise "The #{nested_model.name} model is already registered with an incompatible version of the #{schema.fullname} schema"
+              raise "The #{nested_model.name} model is already registered with an incompatible version of the " \
+                    "#{schema.fullname} schema"
             end
+
             nested_model
           else
             Avromatic::Model.model(schema: schema, nested_models: nested_models)

data/lib/avromatic/model/types/union_type.rb

@@ -10,6 +10,7 @@ module Avromatic
         attr_reader :member_types, :value_classes, :input_classes
 
         def initialize(member_types:)
+          super()
           @member_types = member_types
           @value_classes = member_types.flat_map(&:value_classes)
           @input_classes = member_types.flat_map(&:input_classes).uniq
@@ -31,9 +32,7 @@ module Avromatic
             end
           end
 
-          unless result
-            raise ArgumentError.new("Could not coerce '#{input.inspect}' to #{name}")
-          end
+          raise ArgumentError.new("Could not coerce '#{input.inspect}' to #{name}") if result.nil?
 
           result
         end

data/lib/avromatic/model/validation.rb

@@ -64,9 +64,7 @@ module Avromatic
           end
         end
 
-        if recursively_immutable?
-          @missing_attributes = missing_attributes.freeze
-        end
+        @missing_attributes = missing_attributes.freeze if recursively_immutable?
 
         missing_attributes
       end

data/lib/avromatic/model_registry.rb

@@ -24,8 +24,10 @@ module Avromatic
 
     def register(model)
       raise 'models with a key schema are not supported' if model.key_avro_schema
+
       name = model_fullname(model)
       raise "'#{name}' has already been registered" if registered?(name)
+
       @hash[name] = model
     end
 
@@ -42,8 +44,11 @@ module Avromatic
     def ensure_registered_model(model)
       name = model_fullname(model)
       if registered?(name)
-        unless fetch(name).equal?(model)
-          raise "attempted to replace existing model #{fetch(name)} with new model #{model} as '#{name}'"
+        existing_model = fetch(name)
+        unless existing_model.equal?(model)
+          raise "Attempted to replace existing Avromatic model #{model_debug_name(existing_model)} with new model " \
+            "#{model_debug_name(model)} as '#{name}'. Perhaps '#{model_debug_name(model)}' needs to be eager loaded " \
+            'via the Avromatic eager_load_models setting?'
         end
       else
         register(model)
@@ -65,5 +70,11 @@ module Avromatic
 
       value.start_with?('.') ? value.from(1) : value
     end
+
+    private
+
+    def model_debug_name(model)
+      model.name || model.to_s
+    end
   end
 end

data/lib/avromatic/rspec.rb

@@ -12,6 +12,7 @@ RSpec.configure do |config|
 
     WebMock.stub_request(:any, /^#{registry_uri}/).to_rack(AvroSchemaRegistry::FakeServer)
     AvroSchemaRegistry::FakeServer.clear
+    Avromatic.build_schema_registry!
     Avromatic.build_messaging!
   end
 end

data/lib/avromatic/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Avromatic
-  VERSION = '2.4.0'
+  VERSION = '4.0.0'
 end

data/lib/avromatic.rb

@@ -34,6 +34,7 @@ module Avromatic
 
   def self.build_schema_registry
     raise 'Avromatic must be configured with a registry_url' unless registry_url
+
     if use_schema_fingerprint_lookup
       AvroSchemaRegistry::CachedClient.new(
         AvroSchemaRegistry::Client.new(registry_url, logger: logger)
@@ -45,8 +46,13 @@ module Avromatic
     end
   end
 
+  def self.build_schema_registry!
+    self.schema_registry = build_schema_registry
+  end
+
   def self.build_messaging
     raise 'Avromatic must be configured with a schema_store' unless schema_store
+
     Avromatic::Messaging.new(
       registry: schema_registry || build_schema_registry,
       schema_store: schema_store,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,74 +16,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: avro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: 1.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: avro_schema_registry-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: avro_turf
   requirement: !ruby/object:Gem::Requirement
@@ -144,16 +144,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -174,28 +174,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -216,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +274,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
@@ -293,13 +294,9 @@ files:
 - gemfiles/avro1_10_rails5_2.gemfile
 - gemfiles/avro1_10_rails6_0.gemfile
 - gemfiles/avro1_10_rails6_1.gemfile
-- gemfiles/avro1_8_rails5_2.gemfile
-- gemfiles/avro1_9_rails5_2.gemfile
-- gemfiles/avro1_9_rails6_0.gemfile
-- gemfiles/avro1_9_rails6_1.gemfile
-- gemfiles/avro_patches_rails5_2.gemfile
-- gemfiles/avro_patches_rails6_0.gemfile
-- gemfiles/avro_patches_rails6_1.gemfile
+- gemfiles/avro1_10_rails7_0.gemfile
+- gemfiles/avro1_11_rails6_1.gemfile
+- gemfiles/avro1_11_rails7_0.gemfile
 - lib/avromatic.rb
 - lib/avromatic/io.rb
 - lib/avromatic/io/datum_reader.rb
@@ -349,8 +346,10 @@ files:
 homepage: https://github.com/salsify/avromatic.git
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -358,15 +357,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.22
+signing_key: 
 specification_version: 4
 summary: Generate Ruby models from Avro schemas
 test_files: []

data/gemfiles/avro1_9_rails6_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro", "1.9.2"
-gem "activesupport", "~> 6.0.0"
-gem "activemodel", "~> 6.0.0"
-
-gemspec path: "../"

data/gemfiles/avro_patches_rails5_2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 0.4.1", "< 1.0"
-gem "activesupport", "~> 5.2.0"
-gem "activemodel", "~> 5.2.0"
-
-gemspec path: "../"

data/gemfiles/avro_patches_rails6_0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 1.0.0"
-gem "activesupport", "~> 6.0.0"
-gem "activemodel", "~> 6.0.0"
-
-gemspec path: "../"

data/gemfiles/avro_patches_rails6_1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro-patches", ">= 1.0.0"
-gem "activesupport", "~> 6.1.0"
-gem "activemodel", "~> 6.1.0"
-
-gemspec path: "../"