avromatic 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90a142c407a453ef9007373f215d8acd137937e54b46aa2c29e8edcf8440aef
-  data.tar.gz: c8eecbb9860859346d9a67e3e2a78a2e38447bdff4d4fb9208f57bcf89940215
+  metadata.gz: d4938e400e426cf06497e5819b1f92c9c3f12920ada5ed999a1a826bd19c7efb
+  data.tar.gz: e37322f05ec5adaff55e28bc8e15a2e2164dc3d8575fb8ed0dad6e5b283fa440
 SHA512:
-  metadata.gz: 77b078294c887e298e4ede5f1f47cfccaccffd0b065ad1d4bad9820d2af8c77e522462282d1d44db35acefaf6fc301ccb7a59dfda844c5ebee297d51792ee912
-  data.tar.gz: 8f57c2afee1266f790c031920efb7e1690420e4c6de36d22af3e11361bc5bf7eaabb3eba4e2974a994a7f7509e3db01335c954895c981db4069a8c7828b483de
+  metadata.gz: 258766a91f94e209f18e0f2060bb2590d606bb973b93bd702a2acc45535d2591e7688b5d14695c004621a5eddf8d328528518447ccf26521c10d2fb3821dfdb6
+  data.tar.gz: fd1aea43406300f106aba81a9be6212e50d4e6bab68b4a3a25bb5f7aafaa01400bb1712bfe7a9a4206a6dc8fa7bf31491988bd43a69755b2582f6c44d26603ba

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # avromatic changelog
 
+## 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.

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_registry.rb

@@ -42,8 +42,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 +68,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -346,7 +346,7 @@ homepage: https://github.com/salsify/avromatic.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -361,8 +361,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Generate Ruby models from Avro schemas
 test_files: []