fixturex 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffed47838ffeca2b48f07aedb9b3fde97e511d815cb26c43777d5da4b7a243f
-  data.tar.gz: 4b80bdaa446e189d01c18f2b1822c5ce4d0363b009488acd0f2ea41ce27e0baa
+  metadata.gz: ba442689cba33d6a107a78f02cce97607f69b122f14e7a47ed71466ebfb3ef51
+  data.tar.gz: 6aaa1d21d83b24a0346caf5d49df17954f08f5da559e8f1a897038d90e01c3dc
 SHA512:
-  metadata.gz: 620e13262446d7e3aa345dace7da41bd3ba5f84f9adb1e8449990225a269601744228ff7bc69ece0e0c1102931cd3899e1b27e5b05e6a232a8ba106edee80ee2
-  data.tar.gz: b7ceb8bebd224a3e9479ed96d09e17d338d5e015cbf15f253b4731398e147c63d7b802ddf075f1b8e266d5c9bcfe6d017c82446b5f9dcba86ea98a6f9a8bdabd
+  metadata.gz: 6fa6003d12a1e64a1b680b8780e468e5e54fe05fc6992887b7c1eacb408bb113f5510d738dd8020727607667a5728fb5b9109e3c89fba587a607ba5294c15196
+  data.tar.gz: 6f21761a41d8802e638121fae5051f6a69a6754eabcd3479a841e2a88668e80c94eb7ef390fcfe3627793a596cad741aabad8e9e4a134e1bceaf9128c0296d52

data/.github/workflows/ruby.yml

@@ -21,15 +21,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0']
+        ruby-version: ['3.3']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixturex (0.1.3)
+    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.6)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -240,7 +240,7 @@ GEM
     unicode-emoji (4.0.4)
     uri (1.0.3)
     useragent (0.16.11)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)

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!
+
+      superclasses = model_class.ancestors.select do |ancestor|
+        ancestor < ActiveRecord::Base
+      end
 
-        fixtures_paths << path if File.exist?(path)
+      (
+        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('/'))
 
-        model_class = model_class.superclass
+        path if File.exist?(path)
       end
-      fixtures_paths
     end
   end
 
@@ -91,11 +95,11 @@ module Fixturex
     # rubocop:enable Metrics/AbcSize
 
     def association_model_class(association)
-      class_name = association.class_name
+      namespace = association.active_record.name.split('::')[0..-2].join('::')
+      class_name = [namespace, association.class_name].filter(&:present?).join('::')
 
       unless Object.const_defined?(class_name)
-        namespace = association.active_record.name.split('::')[0..-2].join('::')
-        class_name = "#{namespace}::#{class_name}"
+        class_name = association.class_name
       end
 
       class_name.constantize

data/lib/fixturex/version.rb

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

metadata

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