usa 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8275113ba717d4dcd16a6ab69e75c3d2a0ae317138d4da57d3b6ceb5e534408
-  data.tar.gz: 4182c9028362c42327acd46f14cbad052c5074594820a7db581cf3aa9445561d
+  metadata.gz: 548ccad376f01003a206b1c4a9691fac0beba122f699b3215171aff74ad7bc6f
+  data.tar.gz: dc17540f0361f124ae91a6af8888c3af063cf290416e7abb9cc39e7a852548f2
 SHA512:
-  metadata.gz: 14589ea7e3c01ec46a705f3777c38bc11a0670733b6fd8c2551499955a32e274516c37d93f8668c632ade9c2aca925ea556e08ef5ce9344126bc4b51e22a2768
-  data.tar.gz: 6cecb88f8f456ad77f6a353ed1cafba16fb369ef46d4aa71b95af0e6e971dd9a1bc943042edab8d5e0e6496ec48c9d59274ad74cadff5d61773da31fba37e0ea
+  metadata.gz: fda77e35c1d90e41334f16203e7156ce1739b50a1fba3bab650ab894ce853c171d0054745736f77b1dea45afd6936b4886ed47ff33c7da5e0ad67e42adacf44f
+  data.tar.gz: 025b0c17a446ec5da6f19e6821e5c93e0ae3f9ecccc0d99bbc7198b6efd33df0e819bafb6a6e1f6f634e275cd7874ae7539c25b9a5660167d0ad04f2efd5719b

data/CHANGELOG.md

@@ -7,6 +7,16 @@ For more information about changelogs, check [Keep a Changelog](http://keepachan
 
 ## [Unreleased]
 
+## 0.4.2 - 2026-09-16
+
+* [Fix] The check that refuses a host's own class where one of these models should be asks the
+  files rather than the constants, and loads nothing to answer. 0.4.1 moved it onto
+  `ActiveSupport.on_load(:active_record)`, which fires long before an app is ready: a host whose
+  own load hook declares `belongs_to :market, counter_cache: true` had that class name resolved
+  on the spot, which reached `ApplicationRecord` before the database was configured and stopped
+  the boot. Zeitwerk is asked which directory holds a `city.rb` instead, which answers the same
+  question without loading a model or Active Record behind it
+
 ## 0.4.1 - 2026-09-16
 
 * [Fix] The check that refuses a host's own class where one of these models should be is asked

data/README.md

@@ -12,7 +12,7 @@ To install on your system, run
 
 To use inside a bundled Ruby project, add this line to the `Gemfile`:
 
-    gem 'usa', '~> 0.4.1'
+    gem 'usa', '~> 0.4.2'
 
 Below 1.0 the pin stops at the next minor rather than the next major, because that is where a
 breaking change may still land. It becomes `~> 1.0` once the API is settled on purpose.

data/lib/usa/engine.rb

@@ -4,11 +4,6 @@ require 'rails/engine'
 module USA
   # Teaches Rails where this gem's models live, and refuses a host that has taken their names.
   class Engine < ::Rails::Engine
-    # Asked when Active Record loads rather than while the app boots: reaching for these
-    # models pulls Active Record in behind them, and pulling it in before initialization is
-    # over slows every boot and can reorder a host's own -- which is what Rails warns about.
-    ActiveSupport.on_load(:active_record) do
-      USA.verify_models ::State, ::County, ::City, ::CityCounty, ::ZIP
-    end
+    config.to_prepare { USA.verify_models }
   end
 end

data/lib/usa/version.rb

@@ -1,4 +1,4 @@
 module USA
   # The version of this gem, as RubyGems knows it.
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/lib/usa.rb

@@ -34,18 +34,24 @@ module USA
     County.recount_zips
   end
 
+  # The file each of this gem's models is defined in, which is the name a host must not take.
+  MODELS = %w[city city_county county state zip]
+
   # Refuses a host's own class standing where one of this gem's models should be. Zeitwerk
   # gives an app's file precedence over an engine's, silently, so without this a host holding
   # `app/models/city.rb` would find every association of this gem's pointing at a class of its
-  # own.
-  # @param [Array<Class>] models the classes the names this gem takes answer to.
+  # own. Asked of the files rather than of the constants: loading a model to find out pulls
+  # Active Record in with it, long before an app is ready for either.
+  # @param [Array<String>] dirs the autoloaded directories to look through.
   # @return [void]
-  def self.verify_models(*models)
-    theirs = models.reject { |model| model < Record }
-    return if theirs.empty?
-
-    raise Error, "The usa gem defines #{theirs.to_sentence}, and a class of your own has " \
-      'taken the name. Rename yours: Rails gives an app’s file precedence over an engine’s, ' \
-      'silently, so the models this gem ships would point at a class it knows nothing about.'
+  def self.verify_models(dirs = Rails.autoloaders.main.dirs)
+    mine = Engine.root.join('app/models').to_s
+    taken = dirs.reject { |dir| dir == mine }.
+      flat_map { |dir| MODELS.select { |model| File.exist? File.join(dir, "#{model}.rb") } }
+    return if taken.empty?
+
+    raise Error, "The usa gem defines #{taken.uniq.map(&:camelize).to_sentence}, and a file " \
+      'of your own takes the name first. Rename yours: Rails gives an app’s file precedence ' \
+      'over an engine’s, silently, and the models this gem ships would point at your class.'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usa
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Claudio Baccigalupo