avromatic 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edd31aa475804bf20a1f5b4ddbe90e8c98460617daeaf2e1641316c08cce505b
-  data.tar.gz: b20ae31b2aeff034f9fa99e2a90d4bb78dfe894967ab8e0267b1df6ee954a15d
+  metadata.gz: 7bec6621c5d35e04596185542eaa4d96d00ef67f86f24b26378c68b22ecb3b3c
+  data.tar.gz: 1468ebd3138c5dc63a5d18d86dab5757df5c67109867628d1161b01ef70db1f3
 SHA512:
-  metadata.gz: 6e4d441e7645b52840725041d361f699266a9e5dd974e8cd588c8f4750ba21eb4efd016b9c6c20e034a98ed79b673f9aa12a5f0b3a56312a57b344659b93606d
-  data.tar.gz: 5b8ba9cc0049f80a31f88399ca504796997038b969d728be5867d6fd5bc6868786e4ae9dffc0de8a7c1db99e129f9398e4f867794dbd449d54f74c69650735bb
+  metadata.gz: da43c835a7f56011c1ed194bba7a02e5f98a190f65a8ce025b67f8a23d9a43093e2e64f83cdaf520d847c37ecf66cfd6ed276aee7f195a9f3f2b0c248967f5bf
+  data.tar.gz: 920048102d5947af69eca3d4e4c357adf9eefaebbd83e8d70190d29a6fb8d30c65072c97fda65613d9ebed32e127f98d9f4952e1e91e081963e61a480a002af3

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @jturkel @kphelps @tjwp
+* @jturkel @tjwp @salsify/infrastructure-services

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # avromatic changelog
 
+## 4.1.1
+- Fix eager loading of nested models when using the Zeitwerk classloader with Rails.
+
 ## 4.1.0
 - Add support for specifying a subject for the avro schema when building an Avromatic model
 

data/README.md

@@ -286,7 +286,7 @@ correct order:
 Avromatic.configure do |config|
   config.eager_load_models = [
     # reference any extended models that should be defined first
-    MyNestedModel
+    'MyNestedModel'
   ]
 end
 ```

data/avromatic.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
   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', '~> 1.1.0'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.27.1'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
   # For AvroSchemaRegistry::FakeServer

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

@@ -60,11 +60,11 @@ module Avromatic
               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)
+                                  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)
+                                  use_custom_types: use_custom_types)
               Avromatic::Model::Types::MapType.new(
                 key_type: Avromatic::Model::Types::StringType.new,
                 value_type: value_type

data/lib/avromatic/railtie.rb

@@ -7,19 +7,8 @@ module Avromatic
         config.logger = Rails.logger
       end
 
-      # Rails calls the to_prepare hook once during boot-up, after running
-      # initializers. After the to_prepare call during boot-up, no code will
-      # we reloaded, so we need to retain the contents of the nested_models
-      # registry.
-      #
-      # For subsequent calls to to_prepare (in development), the nested_models
-      # registry is cleared and repopulated by explicitly referencing the
-      # eager_loaded_models.
-      first_prepare = true
-
       Rails.configuration.to_prepare do
-        Avromatic.prepare!(skip_clear: first_prepare)
-        first_prepare = false
+        Avromatic.prepare!
       end
     end
   end

data/lib/avromatic/version.rb

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

data/lib/avromatic.rb

@@ -29,7 +29,6 @@ module Avromatic
 
   def self.configure
     yield self
-    eager_load_models!
   end
 
   def self.build_schema_registry
@@ -66,18 +65,16 @@ module Avromatic
 
   # This method is called as a Rails to_prepare hook after the application
   # first initializes during boot-up and prior to each code reloading.
-  # For the first call during boot-up we do not want to clear the nested_models.
-  def self.prepare!(skip_clear: false)
-    unless skip_clear
-      nested_models.clear
-      if schema_store
-        if schema_store.respond_to?(:clear_schemas)
-          schema_store.clear_schemas
-        elsif schema_store.respond_to?(:clear)
-          schema_store.clear
-        end
+  def self.prepare!
+    nested_models.clear
+    if schema_store
+      if schema_store.respond_to?(:clear_schemas)
+        schema_store.clear_schemas
+      elsif schema_store.respond_to?(:clear)
+        schema_store.clear
       end
     end
+
     eager_load_models!
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avromatic
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -216,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.27.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.27.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Generate Ruby models from Avro schemas