fixturex 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 517987007a6e6ca80e06f5f2159c45ebdd81e6824c223219cfd55f6a1a07ebec
-  data.tar.gz: 0ae40367ec829d9adb8292ad32d61da2344c3afd8928696298764f33a219368e
+  metadata.gz: 969e8e5573328295b3bd63b0ec6ec2bef3f3462a613009f44ac5f8dfc9ba5c7d
+  data.tar.gz: 02c925a94649f82fb08c7d5c1b555b10a95546054db19a864216717239da213d
 SHA512:
-  metadata.gz: 165341e0beb555401e373a8c3314cfd5bfd5020aaf4cab69ed27726a8ee1aa2ce73bbdc98b6235c8d428e1fb70b8dd382a0e0b3f832fefc1005d3c2db714ed6e
-  data.tar.gz: 00a86359a92354f61caeacf69cdc1b7cccc800df9141a27aed9903d83152555824b60a76c77b3b7ec28bc25e0c0d4603bcef4534485255244dcdf338576e27e1
+  metadata.gz: 6477664978fff4a5ee9ceee56decf5c96ceadacba17f02c81f15adde91e1678b72b4bf183b64ddfd3333396cf5a3691c1015f0095c9e93f69e9bc29fe051f53f
+  data.tar.gz: d7f085be682df75a9dd849c7dd1473d97d56bea48090738def17095ec11f409fb23c43e32e33516f6c4158e546130de460ee3b332ebd83ee4db67045d8da9e71

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fixturex (0.1.0)
+    fixturex (0.1.2)
       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/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
@@ -68,10 +67,12 @@ module Fixturex
 
     private
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     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 = self.class.cache[association.class_name] ||= ModelFixtures.load(association.class_name)
+        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
@@ -82,6 +83,18 @@ module Fixturex
         end
       end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+    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|
@@ -98,7 +111,10 @@ module Fixturex
       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.1'
+  VERSION = '0.1.2'
 end

metadata

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