fixturex 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404ffc47cf8333c8e253ec3c9a2bc7f503239c4b522583824faf3f39d3181dd6
-  data.tar.gz: a171c81ab51265e86395af98c62935eca28f378d7836afd05462626d8e7af6f2
+  metadata.gz: ba442689cba33d6a107a78f02cce97607f69b122f14e7a47ed71466ebfb3ef51
+  data.tar.gz: 6aaa1d21d83b24a0346caf5d49df17954f08f5da559e8f1a897038d90e01c3dc
 SHA512:
-  metadata.gz: 3d40f03023164dc2aeed88092b8575eddb5a7196c52a0b75edc9c4a73431a961ddeb95b1f98fe40e9fc40061647398bc3f70177af1e269a89ce84e0b6416b854
-  data.tar.gz: fdaa79ae96ef13a30bb9504184df2e5197a606a1f1ee3896ee2132493c55cf331bd24e0eea05d88b55607fcb5e7464795839f6a754baf425cd90d16337783368
+  metadata.gz: 6fa6003d12a1e64a1b680b8780e468e5e54fe05fc6992887b7c1eacb408bb113f5510d738dd8020727607667a5728fb5b9109e3c89fba587a607ba5294c15196
+  data.tar.gz: 6f21761a41d8802e638121fae5051f6a69a6754eabcd3479a841e2a88668e80c94eb7ef390fcfe3627793a596cad741aabad8e9e4a134e1bceaf9128c0296d52

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixturex (0.1.5)
+    fixturex (0.1.6)
       rails (>= 6.0)
 
 GEM
@@ -118,7 +118,7 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.25.5)
-    net-imap (0.5.8)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)

data/lib/fixturex/tree_builder.rb

@@ -15,27 +15,31 @@ module Fixturex
       fixtures_paths(model_class).each_with_object([]) do |path, acc|
         fixtures = YAML.load_file(path)
         fixtures.select! do |_name, attributes|
-          # if fixture has `type` - STI - then we only want type == class_name
-          attributes['type'].nil? || attributes['type'] == model_class.name
+          attributes['type'].nil? || attributes['type'].constantize <= model_class
         end
         acc.concat(fixtures.map { |name, attributes| Fixture.new(name, path, attributes) })
       end
     end
 
     def self.fixtures_paths(model_class)
-      fixtures_paths = []
       # TODO: is there a better way to find out fixtures root directory?
       fixtures_root = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
 
-      while model_class < ActiveRecord::Base
-        fixture_file = "#{model_class.to_s.tableize}.yml"
-        path = File.join(fixtures_root, *fixture_file.split('/'))
+      # Make subclasses/ancestors discoverable
+      Rails.application.eager_load!
 
-        fixtures_paths << path if File.exist?(path)
+      superclasses = model_class.ancestors.select do |ancestor|
+        ancestor < ActiveRecord::Base
+      end
 
-        model_class = model_class.superclass
+      (
+        superclasses + [model_class] + model_class.subclasses
+      ).filter_map do |klass|
+        fixture_file = "#{klass.to_s.tableize}.yml"
+        path = File.join(fixtures_root, *fixture_file.split('/'))
+
+        path if File.exist?(path)
       end
-      fixtures_paths
     end
   end
 
@@ -94,6 +98,10 @@ module Fixturex
       namespace = association.active_record.name.split('::')[0..-2].join('::')
       class_name = [namespace, association.class_name].filter(&:present?).join('::')
 
+      unless Object.const_defined?(class_name)
+        class_name = association.class_name
+      end
+
       class_name.constantize
     end
 

data/lib/fixturex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fixturex
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixturex
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - artemave
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails