avromatic 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2506f67a4583f29252bd64effa9a5891e09d7ae6a6de458bdb5546592fd151f6
-  data.tar.gz: a32641d0bd7ca448bdc35226dcb795791c1c0c8aab3ea9770bc950e85b32a832
+  metadata.gz: cba28133aa9a1a1ce5bb9a03c54fc4aa01f90d6dd3a72b98d74e5eb47276925e
+  data.tar.gz: 4fc8e33b860c6213fdda238946799164f8f52655b8cd3d5995f2c095e63aa2e1
 SHA512:
-  metadata.gz: 427096144ac8c8d9544ea460a96eb93813fa977089b80c2616ad17e21784928b448bdb1a5d38aba0c4dde892e1caf3b331e444196ecc937c88bbbbc23eb14572
-  data.tar.gz: 3a220e5ad23058c054b43e872a3bb81ab1018fc4ef40714a723b31cd93ae560518fac6ab9475993503369d8a8950991f283e2fc113c09bc3c66cf40ecf6d9cb5
+  metadata.gz: a027c37208e834dee9772ea0fc2cfdd0f0a65699426e4e89b00e32268f3938a2842d1b4101fdd50f04f0b61d151f8ea9a2dd08bba168875b47b39636053eebe6
+  data.tar.gz: 7568eb10634ab6dc9e80236c8cedccd18a7259858c4a4834797e91f3349f43cf34d0dec81b5cf3fec4c2cb9c8400002d4066c9240a27eca6d0751f470a1faffa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # avromatic changelog
 
+## 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/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/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/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
@@ -31,6 +34,10 @@ module Avromatic
         def serialize(_value, **)
           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
     end
   end

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

@@ -47,6 +47,10 @@ module Avromatic
             value.map { |element| value_type.serialize(element, strict: strict) }
           end
         end
+
+        def referenced_model_classes
+          value_type.referenced_model_classes
+        end
       end
     end
   end

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

@@ -33,6 +33,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -58,6 +58,10 @@ module Avromatic
         def serialize(value, **)
           @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

@@ -35,6 +35,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -50,6 +50,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -39,6 +39,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -42,6 +42,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -33,6 +33,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -68,6 +68,11 @@ module Avromatic
             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

@@ -33,6 +33,10 @@ module Avromatic
         def serialize(_value, **)
           nil
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -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
 
@@ -42,6 +42,10 @@ module Avromatic
         def serialize(value, **)
           value
         end
+
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -26,6 +26,9 @@ module Avromatic
           ::Time.at(input.to_i, input.usec)
         end
 
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -26,6 +26,9 @@ module Avromatic
           ::Time.at(input.to_i, input.usec / 1000 * 1000)
         end
 
+        def referenced_model_classes
+          EMPTY_ARRAY
+        end
       end
     end
   end

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

@@ -67,6 +67,10 @@ module Avromatic
           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.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel