fixturex 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea06be8bc96efed28b5178afcb2067df1f62e33ffcbab770b4e9f8981d7c4c7
-  data.tar.gz: bdf4a376118d64737bd158430543dfa8cd4f072f5b47f22aee79f9d5faf316c5
+  metadata.gz: 4ad838e7a474e177400e7dc181b273ec0ee88d3a785ad94e60348a8b6bb6e8d3
+  data.tar.gz: d5c896e40834be325036a219fe6955a672becfc7cc67283ae37be20457c2e1a4
 SHA512:
-  metadata.gz: a84ac2f32931c6302e3fe0f7d51e7857faf55ed82c84d333b6c9f5989737367859574e1c53a70a296bda588073e8233ad9f8b4e29b8a726b372957d75d7bdcb7
-  data.tar.gz: df1e9d6e317c08ffb17d1d657220486d499b78a3ac3630290ff9834787b4b1c598e58f29f9fdf8e661bb0a7a5aa23b2abc7cc9b41fadbdfbc6be4967de4d3ae0
+  metadata.gz: b5b4b7a1068f0e9b98e4780f6cdc21e93ca1544f7934103c87a528922d98374f9503b779561ea49fc3d2c18e028b7bccb61d6b361667ce6b8bc3607b5ed1e713
+  data.tar.gz: 72df98e71b21abfa80403ded5d8a5549a5fd134fc24b76ff80e18d8771c46e4aee23312113a94b55b9c53b2e214a090835e03d2d333b6995c48f9e4528e63767

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixturex (0.1.0)
+    fixturex (0.1.3)
       rails (>= 6.0)
 
 GEM
@@ -75,7 +75,7 @@ GEM
     diff-lcs (1.4.4)
     docile (1.4.0)
     erubi (1.10.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
@@ -84,9 +84,9 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     nio4r (2.5.8)
@@ -169,12 +169,12 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    sprockets (4.0.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     thor (1.1.0)

data/README.md

@@ -1,4 +1,4 @@
-# Fixturex [![Ruby](https://github.com/artemave/fixturex/actions/workflows/ruby.yml/badge.svg)](https://github.com/artemave/fixturex/actions/workflows/ruby.yml)
+# Fixturex [![Ruby](https://github.com/artemave/fixturex/actions/workflows/ruby.yml/badge.svg)](https://github.com/artemave/fixturex/actions/workflows/ruby.yml)  [![Gem Version](https://badge.fury.io/rb/fixturex.svg)](https://badge.fury.io/rb/fixturex)
 
 Rails fixtures explorer.
 

data/lib/fixturex/fixture_location.rb

@@ -10,7 +10,7 @@ module Fixturex
 
     def line
       @line ||= File.readlines(path).index do |line|
-        line.match?(/^#{name}:/)
+        line.match?(/^#{Regexp.escape(name)}:/)
       end + 1
     end
 

data/lib/fixturex/tree_builder.rb

@@ -11,30 +11,29 @@ module Fixturex
   class ModelFixtures
     Fixture = Struct.new(:name, :path, :attributes)
 
-    def self.load(class_name)
-      fixtures_paths(class_name).each_with_object([]) do |path, acc|
+    def self.load(model_class)
+      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'] == class_name
+          attributes['type'].nil? || attributes['type'] == model_class.name
         end
         acc.concat(fixtures.map { |name, attributes| Fixture.new(name, path, attributes) })
       end
     end
 
-    def self.fixtures_paths(class_name)
+    def self.fixtures_paths(model_class)
       fixtures_paths = []
-      klass = class_name.constantize
       # TODO: is there a better way to find out fixtures root directory?
       fixtures_root = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
 
-      while klass < ActiveRecord::Base
-        fixture_file = "#{klass.to_s.tableize}.yml"
+      while model_class < ActiveRecord::Base
+        fixture_file = "#{model_class.to_s.tableize}.yml"
         path = File.join(fixtures_root, *fixture_file.split('/'))
 
         fixtures_paths << path if File.exist?(path)
 
-        klass = klass.superclass
+        model_class = model_class.superclass
       end
       fixtures_paths
     end
@@ -55,6 +54,10 @@ module Fixturex
   end
 
   class TreeBuilder
+    def self.cache
+      @cache ||= {}
+    end
+
     def build_dependency_tree(fixture_path, fixture_name)
       TreeEntry.new(
         FixtureLocation.new(fixture_path, fixture_name),
@@ -64,10 +67,13 @@ module Fixturex
 
     private
 
+    # rubocop:disable Metrics/AbcSize
     def nested_fixtures_locations(parent_fixture_model_class, parent_fixture_name)
       associations_for_nested_models(parent_fixture_model_class).each_with_object([]) do |association, acc|
-        belongs_to_attribute = belongs_to_attribute_for_association(association)
-        model_fixtures = ModelFixtures.load(association.class_name)
+        next unless (belongs_to_attribute = belongs_to_attribute_for_association(association))
+
+        child_model_class = association_model_class(association)
+        model_fixtures = self.class.cache[association.class_name] ||= ModelFixtures.load(child_model_class)
 
         model_fixtures.each do |fixture|
           next if fixture.attributes.fetch(belongs_to_attribute, '').to_s.sub(/ .*/, '') != parent_fixture_name
@@ -78,6 +84,18 @@ module Fixturex
         end
       end
     end
+    # rubocop:enable Metrics/AbcSize
+
+    def association_model_class(association)
+      class_name = association.class_name
+
+      unless Object.const_defined?(class_name)
+        namespace = association.active_record.name.split('::')[0..-2].join('::')
+        class_name = "#{namespace}::#{class_name}"
+      end
+
+      class_name.constantize
+    end
 
     def fixture_already_collected(list, fixture)
       list.find do |tree_entry|
@@ -86,15 +104,22 @@ module Fixturex
     end
 
     def associations_for_nested_models(model_class)
-      model_class.reflect_on_all_associations(:has_many) +
+      (
+        model_class.reflect_on_all_associations(:has_many) +
         model_class.reflect_on_all_associations(:has_one)
+      ).reject do |association|
+        association.is_a?(ActiveRecord::Reflection::ThroughReflection)
+      end
     end
 
     def belongs_to_attribute_for_association(association)
       if association.type.present?
         association.type.sub('_type', '')
       else
-        association.active_record.name.tableize.singularize
+        child_model_class = association_model_class(association)
+        child_model_class.reflect_on_all_associations(:belongs_to).find do |belongs_to_association|
+          belongs_to_association.class_name == association.active_record.name
+        end&.name&.to_s
       end
     end
   end

data/lib/fixturex/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixturex
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - artemave
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails