avromatic 2.2.1 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2506f67a4583f29252bd64effa9a5891e09d7ae6a6de458bdb5546592fd151f6
-  data.tar.gz: a32641d0bd7ca448bdc35226dcb795791c1c0c8aab3ea9770bc950e85b32a832
+  metadata.gz: 5038f6f83ba2ca87bc8cd16a96aae5528397ca5cf9ef01d955861459ae68391a
+  data.tar.gz: 83f5e8bb53086297882f77108480976292a2ca97b40dcb3da5a23c579a7c1edd
 SHA512:
-  metadata.gz: 427096144ac8c8d9544ea460a96eb93813fa977089b80c2616ad17e21784928b448bdb1a5d38aba0c4dde892e1caf3b331e444196ecc937c88bbbbc23eb14572
-  data.tar.gz: 3a220e5ad23058c054b43e872a3bb81ab1018fc4ef40714a723b31cd93ae560518fac6ab9475993503369d8a8950991f283e2fc113c09bc3c66cf40ecf6d9cb5
+  metadata.gz: 5d5f8501fc5e050db26475ea1205a1c08f864d6fae8272e54c4a04df4fb22bf634868dadde7eade371a6b22f5438423f84a6405808286b1c687fb7acb26859c3
+  data.tar.gz: 7025885a25ab59923d8efc08e494a51f3c6bc57f0e72eedc84c00b9b46c1ef1df085d99ba9135d6997a8370f3fb1497690a714ca067896faad1a2e9a25f0e970

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.8

data/.travis.yml

@@ -1,23 +1,16 @@
 language: ruby
 rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 before_script:
   - bundle exec rubocop
 gemfile:
-  - gemfiles/rails5_0.gemfile
-  - gemfiles/rails5_1.gemfile
-  - gemfiles/rails5_2.gemfile
-  - gemfiles/rails6_0.gemfile
-  - gemfiles/avro_patches_rails5_0.gemfile
-  - gemfiles/avro_patches_rails5_1.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
 script: bundle exec rspec
-matrix:
-  exclude:
-  - rvm: 2.4.6
-    gemfile: gemfiles/rails6_0.gemfile
-  - rvm: 2.4.6
-    gemfile: gemfiles/avro_patches_rails6_0.gemfile

data/Appraisals

@@ -1,43 +1,37 @@
 # frozen_string_literal: true
 
-appraise 'rails5_0' do
+appraise 'avro1_8-rails5_2' do
   gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 5.0.6'
-  gem 'activemodel', '~> 5.0.6'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails5_1' do
-  gem 'avro', '1.8.2'
-  gem 'activesupport', '~> 5.1.4'
-  gem 'activemodel', '~> 5.1.4'
+appraise 'avro1_9-rails5_2' do
+  gem 'avro', '1.9.2'
+  gem 'activesupport', '~> 5.2.0'
+  gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails5_2' do
-  gem 'avro', '1.8.2'
+appraise 'avro1_10-rails5_2' do
+  gem 'avro', '~> 1.10.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end
 
-appraise 'rails6_0' do
-  gem 'avro', '1.9.0'
+appraise 'avro1_9-rails6_0' do
+  gem 'avro', '1.9.2'
   gem 'activesupport', '~> 6.0.0'
   gem 'activemodel', '~> 6.0.0'
 end
 
-appraise 'avro-patches-rails5_0' do
-  gem 'avro-patches'
-  gem 'activesupport', '~> 5.0.6'
-  gem 'activemodel', '~> 5.0.6'
-end
-
-appraise 'avro-patches-rails5_1' do
-  gem 'avro-patches', '>= 0.4.1'
-  gem 'activesupport', '~> 5.1.4'
-  gem 'activemodel', '~> 5.1.4'
+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'
+  gem 'avro-patches', '>= 0.4.1', '< 1.0'
   gem 'activesupport', '~> 5.2.0'
   gem 'activemodel', '~> 5.2.0'
 end

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # avromatic changelog
 
+## v2.2.6
+- Optimize memory usage when serializing models.
+
+## v2.2.5
+- Optimize memory usage when serializing, deserializing and instantiating models.
+
+## v2.2.4
+- Compatibility with Avro v1.10.x.
+
+## v2.2.3
+- Fix bug where method `#referenced_model_classes` was declared as private instead of public.
+
+## v2.2.2
+- Fix missing models in the model registry when in development by loading the nested models of eager loaded models.
+- Fake schema registry support for stubbing URLs with usernames and passwords.
+
 ## v2.2.1
 - Avoid allocating default empty hash in `Avromatic::IO::DatumReader.read_data`
 

data/README.md

@@ -142,7 +142,7 @@ instance.eql?(MyModel.new(id: 123, name: 'Tesla Model 3', enabled: true)) # => t
 instance.hash # => -1279155042741869898
 
 # Retrieve a hash of the model's attributes via to_h, to_hash or attributes
-instance .to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
+instance.to_h # => {:id=>123, :name=>"Tesla Model 3", :enabled=>true}
 ```
 
 Or an `Avro::Schema` object can be specified directly:

data/avromatic.gemspec

@@ -24,20 +24,20 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'activemodel', '>= 5.0', '< 6.1'
   spec.add_runtime_dependency 'activesupport', '>= 5.0', '< 6.1'
-  spec.add_runtime_dependency 'avro', '>= 1.7.7', '< 1.10'
+  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 '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 'overcommit', '0.35.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   # For AvroSchemaRegistry::FakeServer
-  spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'overcommit', '0.35.0'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.52.1.1'
   spec.add_development_dependency 'sinatra'
 end

data/gemfiles/{rails5_0.gemfile → avro1_10_rails5_2.gemfile}

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

data/gemfiles/{rails5_1.gemfile → avro1_10_rails6_0.gemfile}

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

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

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

data/gemfiles/{rails6_0.gemfile → avro1_9_rails6_0.gemfile}

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

data/gemfiles/avro_patches_rails5_2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "avro-patches", ">= 0.4.1"
+gem "avro-patches", ">= 0.4.1", "< 1.0"
 gem "activesupport", "~> 5.2.0"
 gem "activemodel", "~> 5.2.0"
 

data/lib/avromatic.rb

@@ -85,9 +85,7 @@ module Avromatic
   end
 
   def self.eager_load_models!
-    (@eager_load_model_names || []).each do |model_name|
-      nested_models.ensure_registered_model(model_name.constantize)
-    end
+    @eager_load_model_names&.each { |model_name| model_name.constantize.register! }
   end
   private_class_method :eager_load_models!
 end

data/lib/avromatic/io/datum_reader.rb

@@ -25,7 +25,7 @@ module Avromatic
           optional = readers_schema.schemas.first.type_sym == :null
           union_info = if readers_schema.schemas.size == 2 && optional
                          # Avromatic does not treat the union of null and 1 other type as a union
-                         {}
+                         nil
                        elsif optional
                          # Avromatic does not treat the null of an optional field as part of the union
                          { UNION_MEMBER_INDEX => rs_index - 1 }

data/lib/avromatic/model/attributes.rb

@@ -74,23 +74,23 @@ module Avromatic
       def initialize(data = {})
         super()
 
-        valid_keys = []
+        num_valid_keys = 0
         attribute_definitions.each do |attribute_name, attribute_definition|
           if data.include?(attribute_name)
-            valid_keys << attribute_name
+            num_valid_keys += 1
             value = data.fetch(attribute_name)
             send(attribute_definition.setter_name, value)
           elsif data.include?(attribute_definition.name_string)
-            valid_keys << attribute_name
+            num_valid_keys += 1
             value = data[attribute_definition.name_string]
             send(attribute_definition.setter_name, value)
-          elsif !attributes.include?(attribute_name)
+          elsif !_attributes.include?(attribute_name)
             send(attribute_definition.setter_name, attribute_definition.default)
           end
         end
 
-        unless Avromatic.allow_unknown_attributes || valid_keys.size == data.size
-          unknown_attributes = (data.keys.map(&:to_s) - valid_keys.map(&:to_s)).sort
+        unless Avromatic.allow_unknown_attributes || num_valid_keys == data.size
+          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}"

data/lib/avromatic/model/configurable.rb

@@ -8,6 +8,17 @@ module Avromatic
     module Configurable
       extend ActiveSupport::Concern
 
+      # Wraps a reference to a field so we can access both the string and symbolized versions of the name
+      # without repeated memory allocations.
+      class FieldReference
+        attr_reader :name, :name_sym
+
+        def initialize(name)
+          @name = -name
+          @name_sym = name.to_sym
+        end
+      end
+
       module ClassMethods
         attr_accessor :config
         delegate :avro_schema, :value_avro_schema, :key_avro_schema, to: :config
@@ -20,6 +31,18 @@ module Avromatic
           @key_avro_field_names ||= key_avro_schema.fields.map(&:name).map(&:to_sym).freeze
         end
 
+        def value_avro_field_references
+          @value_avro_field_references ||= value_avro_schema.fields.map do |field|
+            Avromatic::Model::Configurable::FieldReference.new(field.name)
+          end.freeze
+        end
+
+        def key_avro_field_references
+          @key_avro_field_references ||= key_avro_schema.fields.map do |field|
+            Avromatic::Model::Configurable::FieldReference.new(field.name)
+          end.freeze
+        end
+
         def value_avro_fields_by_name
           @value_avro_fields_by_name ||= mapped_by_name(value_avro_schema)
         end
@@ -43,6 +66,7 @@ module Avromatic
 
       delegate :avro_schema, :value_avro_schema, :key_avro_schema,
                :value_avro_field_names, :key_avro_field_names,
+               :value_avro_field_references, :key_avro_field_references,
                to: :class
     end
   end

data/lib/avromatic/model/nested_models.rb

@@ -12,10 +12,21 @@ module Avromatic
       module ClassMethods
         # Register this model if it can be used as a nested model.
         def register!
-          if key_avro_schema.nil? && value_avro_schema.type_sym == :record
-            nested_models.register(self)
+          return unless key_avro_schema.nil? && value_avro_schema.type_sym == :record
+
+          roots = [self]
+          until roots.empty?
+            model = roots.shift
+            next if nested_models.registered?(model)
+
+            nested_models.register(model)
+            roots.concat(model.referenced_model_classes)
           end
         end
+
+        def referenced_model_classes
+          attribute_definitions.values.flat_map { |definition| definition.type.referenced_model_classes }.freeze
+        end
       end
     end
   end

data/lib/avromatic/model/raw_serialization.rb

@@ -29,34 +29,37 @@ module Avromatic
 
         def value_attributes_for_avro(validate: true)
           if self.class.config.mutable
-            avro_hash(value_avro_field_names, validate: validate)
+            avro_hash(value_avro_field_references, validate: validate)
           else
-            @value_attributes_for_avro ||= avro_hash(value_avro_field_names, validate: validate)
+            @value_attributes_for_avro ||= avro_hash(value_avro_field_references, validate: validate)
           end
         end
 
         def key_attributes_for_avro(validate: true)
-          avro_hash(key_avro_field_names, validate: validate)
+          avro_hash(key_avro_field_references, validate: validate)
         end
 
         def avro_value_datum(validate: true)
           if self.class.config.mutable
-            avro_hash(value_avro_field_names, strict: true, validate: validate)
+            avro_hash(value_avro_field_references, strict: true, validate: validate)
           else
-            @avro_datum ||= avro_hash(value_avro_field_names, strict: true, validate: validate)
+            @avro_datum ||= avro_hash(value_avro_field_references, strict: true, validate: validate)
           end
         end
 
         def avro_key_datum(validate: true)
-          avro_hash(key_avro_field_names, strict: true, validate: validate)
+          avro_hash(key_avro_field_references, strict: true, validate: validate)
         end
 
         private
 
-        def avro_hash(fields, strict: false, validate:)
+        def avro_hash(field_references, strict: false, validate:)
           avro_validate! if validate
-          attributes.slice(*fields).each_with_object(Hash.new) do |(key, value), result|
-            result[key.to_s] = attribute_definitions[key].serialize(value, strict: strict)
+          field_references.each_with_object(Hash.new) do |field_reference, result|
+            next unless _attributes.include?(field_reference.name_sym)
+
+            value = _attributes[field_reference.name_sym]
+            result[field_reference.name] = attribute_definitions[field_reference.name_sym].serialize(value, strict)
           end
         end
 

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

@@ -38,7 +38,7 @@ module Avromatic
           value.is_a?(::Time) && value.class != ActiveSupport::TimeWithZone && truncated?(value)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
 

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

@@ -4,6 +4,9 @@ module Avromatic
   module Model
     module Types
       class AbstractType
+        EMPTY_ARRAY = [].freeze
+        private_constant :EMPTY_ARRAY
+
         def value_classes
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
@@ -28,7 +31,13 @@ module Avromatic
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
 
-        def serialize(_value, **)
+        # Note we use positional args rather than keyword args to reduce
+        # memory allocations
+        def serialize(_value, _strict)
+          raise "#{__method__} must be overridden by #{self.class.name}"
+        end
+
+        def referenced_model_classes
           raise "#{__method__} must be overridden by #{self.class.name}"
         end
       end

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

@@ -40,13 +40,17 @@ module Avromatic
           value.nil? || (value.is_a?(::Array) && value.all? { |element| value_type.coerced?(element) })
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           else
-            value.map { |element| value_type.serialize(element, strict: strict) }
+            value.map { |element| value_type.serialize(element, strict) }
           end
         end
+
+        def referenced_model_classes
+          value_type.referenced_model_classes
+        end
       end
     end
   end

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

@@ -30,9 +30,13 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -55,9 +55,13 @@ module Avromatic
           false
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           @serializer.call(value)
         end
+
+        def referenced_model_classes
+          default_type.referenced_model_classes
+        end
       end
     end
   end

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

@@ -32,9 +32,13 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -47,9 +47,13 @@ module Avromatic
             (input.is_a?(::Symbol) && allowed_values.include?(input.to_s))
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -36,9 +36,13 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -39,9 +39,13 @@ module Avromatic
           input.nil? || input.is_a?(::Float)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -30,9 +30,13 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -59,15 +59,20 @@ module Avromatic
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           else
             value.each_with_object({}) do |(element_key, element_value), result|
-              result[key_type.serialize(element_key, strict: strict)] = value_type.serialize(element_value, strict: strict)
+              result[key_type.serialize(element_key, strict)] = value_type.serialize(element_value, strict)
             end
           end
         end
+
+        def referenced_model_classes
+          # According to Avro's spec, keys can only be strings, so we can safely disregard #key_type here.
+          value_type.referenced_model_classes
+        end
       end
     end
   end

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

@@ -30,9 +30,13 @@ module Avromatic
 
         alias_method :coerced?, :coercible?
 
-        def serialize(_value, **)
+        def serialize(_value, _strict)
           nil
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -39,7 +39,7 @@ module Avromatic
           value.nil? || value.is_a?(record_class)
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           if value.nil?
             value
           elsif !strict && Avromatic.use_custom_datum_writer && Avromatic.use_encoding_providers? && !record_class.config.mutable
@@ -51,6 +51,10 @@ module Avromatic
             strict ? value.avro_value_datum(validate: false) : value.value_attributes_for_avro(validate: false)
           end
         end
+
+        def referenced_model_classes
+          [record_class].freeze
+        end
       end
     end
   end

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

@@ -5,7 +5,7 @@ require 'avromatic/model/types/abstract_type'
 module Avromatic
   module Model
     module Types
-      class StringType
+      class StringType < AbstractType
         VALUE_CLASSES = [::String].freeze
         INPUT_CLASSES = [::String, ::Symbol].freeze
 
@@ -39,9 +39,13 @@ module Avromatic
           value.nil? || value.is_a?(::String)
         end
 
-        def serialize(value, **)
+        def serialize(value, _strict)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -13,6 +13,10 @@ module Avromatic
           'timestamp-micros'
         end
 
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
+
         private
 
         def truncated?(value)
@@ -25,7 +29,6 @@ module Avromatic
           # of time zone.
           ::Time.at(input.to_i, input.usec)
         end
-
       end
     end
   end

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

@@ -13,6 +13,10 @@ module Avromatic
           'timestamp-millis'
         end
 
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
+
         private
 
         def truncated?(value)
@@ -25,7 +29,6 @@ module Avromatic
           # of time zone.
           ::Time.at(input.to_i, input.usec / 1000 * 1000)
         end
-
       end
     end
   end

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

@@ -51,7 +51,7 @@ module Avromatic
           end
         end
 
-        def serialize(value, strict:)
+        def serialize(value, strict)
           # Avromatic does not treat the null of an optional field as part of the union
           return nil if value.nil?
 
@@ -60,13 +60,17 @@ module Avromatic
             raise ArgumentError.new("Expected #{value.inspect} to be one of #{value_classes.map(&:name)}")
           end
 
-          hash = member_types[member_index].serialize(value, strict: strict)
+          hash = member_types[member_index].serialize(value, strict)
           if !strict && Avromatic.use_custom_datum_writer && value.is_a?(Avromatic::Model::Attributes)
             hash[Avromatic::IO::UNION_MEMBER_INDEX] = member_index
           end
           hash
         end
 
+        def referenced_model_classes
+          member_types.flat_map(&:referenced_model_classes).tap(&:uniq!).freeze
+        end
+
         private
 
         def find_index(value)

data/lib/avromatic/model_registry.rb

@@ -29,7 +29,8 @@ module Avromatic
       @hash[name] = model
     end
 
-    def registered?(fullname)
+    def registered?(fullname_or_model)
+      fullname = fullname_or_model.is_a?(String) ? fullname_or_model : model_fullname(fullname_or_model)
       @hash.key?(fullname)
     end
 

data/lib/avromatic/rspec.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+require 'uri'
 require 'webmock/rspec'
 require 'avro_schema_registry/test/fake_server'
 
 RSpec.configure do |config|
   config.before(:each) do
-    WebMock.stub_request(:any, /^#{Avromatic.registry_url}/).to_rack(AvroSchemaRegistry::FakeServer)
+    # Strip the username/password from the URL so WebMock can match the URL
+    registry_uri = URI(Avromatic.registry_url)
+    registry_uri.userinfo = ''
+
+    WebMock.stub_request(:any, /^#{registry_uri}/).to_rack(AvroSchemaRegistry::FakeServer)
     AvroSchemaRegistry::FakeServer.clear
     Avromatic.build_messaging!
   end

data/lib/avromatic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.6
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -59,7 +59,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: 1.7.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: avro_schema_registry-client
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +112,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: avro-builder
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -169,21 +197,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.52.1.1
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,7 +225,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,34 +238,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: overcommit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.35.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.35.0
-- !ruby/object:Gem::Dependency
-  name: salsify_rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.52.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.52.1.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -276,14 +276,13 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/avro_patches_rails5_0.gemfile
-- gemfiles/avro_patches_rails5_1.gemfile
+- gemfiles/avro1_10_rails5_2.gemfile
+- gemfiles/avro1_10_rails6_0.gemfile
+- gemfiles/avro1_8_rails5_2.gemfile
+- gemfiles/avro1_9_rails5_2.gemfile
+- gemfiles/avro1_9_rails6_0.gemfile
 - gemfiles/avro_patches_rails5_2.gemfile
 - gemfiles/avro_patches_rails6_0.gemfile
-- gemfiles/rails5_0.gemfile
-- gemfiles/rails5_1.gemfile
-- gemfiles/rails5_2.gemfile
-- gemfiles/rails6_0.gemfile
 - lib/avromatic.rb
 - lib/avromatic/io.rb
 - lib/avromatic/io/datum_reader.rb
@@ -335,7 +334,7 @@ homepage: https://github.com/salsify/avromatic.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -350,8 +349,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Generate Ruby models from Avro schemas
 test_files: []

data/gemfiles/avro_patches_rails5_1.gemfile

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