fixture_seed 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3cd5453c25f8d850aa253af3a3be318d4f321d67ac8d08a47894bcaebc762a
-  data.tar.gz: 38f74d96fc45637798f95d0ab92948f9e399a6b447e96ea3d515862ebc61424a
+  metadata.gz: 3eac99125111c4643c61c6fb9a8437ff32efe5b5e695e241565078de54b46526
+  data.tar.gz: 3fc03ab1f49b6723ef304bbd7ea4a892150e474080c70d6182b069013b02eec7
 SHA512:
-  metadata.gz: eecab5f96b32f9311b2c453c7cdff9a1fc6a0000f0295310022bf3279dec380cb8509d81bc53a9b88d4691d55bd1ecb0ebc34982169d3533f273da7b790a209f
-  data.tar.gz: 3119f7c0827b348723a9534d9740802d47c35be613b4b883ac144837bae7d18983808d86eef1b361cde4d7fc745bdfa85e034d03e38a8823c6695f5824d1c6bc
+  metadata.gz: 248a11f90920c9fd60fc0e6931fd3adf29baa427eb9fd42a275e27e789cf58f35341786d93051e916409e765df6d341c0f3a6aeb6c8ec911816e6bcc7d491a34
+  data.tar.gz: cc63888523cab5b38d0fd4c4b72b5f03f1b478884895d6da29c4fee8b51c8f274bcc931d80f37bf65f3d986307b696b440080596a24e77c4444c98945d7f2659

data/lib/fixture_seed/loader.rb

@@ -9,43 +9,22 @@ module FixtureSeed
 
     class << self
       def load_fixtures(fixtures_path = nil)
-        fixtures_path ||= ENV["FIXTURES_PATH"] || DEFAULT_FIXTURES_PATH
+        fixtures_path ||= ENV["FIXTURES_PATH"] || "db/fixtures"
         fixtures_dir = Rails.root.join(fixtures_path)
+        fixture_names = discover_fixture_names(fixtures_dir)
 
-        return unless fixtures_directory_exists?(fixtures_dir, fixtures_path)
-
-        load_fixture_files(fixtures_dir, fixtures_path)
+        ActiveRecord::Base.connection.disable_referential_integrity do
+          ActiveRecord::FixtureSet.create_fixtures(fixtures_dir.to_s, fixture_names)
+        end
       end
 
       private
 
-      def fixtures_directory_exists?(fixtures_dir, fixtures_path)
-        return true if Dir.exist?(fixtures_dir)
-
-        Rails.logger&.info "[FixtureSeed] Fixtures directory not found: #{fixtures_path}"
-        false
-      end
-
-      def load_fixture_files(fixtures_dir, fixtures_path)
-        Rails.logger&.info "[FixtureSeed] Loading fixtures from #{fixtures_path}"
-
-        fixture_files = Dir.glob("#{fixtures_dir}/*.yml")
-        return if fixture_files.empty?
-
-        table_names = fixture_files.map { |f| File.basename(f, ".yml") }
-        Rails.logger&.info "[FixtureSeed] Found tables: #{table_names.join(', ')}"
-
-        # Check if FixtureSet is available
-        unless defined?(ActiveRecord::FixtureSet)
-          Rails.logger&.error "[FixtureSeed] ActiveRecord::FixtureSet is not available. Please ensure you're using Rails 4.0+ or include 'active_record/fixtures'."
-          return
-        end
-
-        ActiveRecord::Base.connection.disable_referential_integrity do
-          ActiveRecord::FixtureSet.create_fixtures(fixtures_dir.to_s, table_names)
+      def discover_fixture_names(fixtures_dir)
+        fixture_files = Dir[File.join(fixtures_dir, "**/*.yml")]
+        fixture_files.map do |file|
+          file[fixtures_dir.to_s.size..-5].delete_prefix("/")
         end
-
-        Rails.logger&.info "[FixtureSeed] Finished loading fixtures"
       end
     end
   end

data/lib/fixture_seed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FixtureSeed
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fixture_seed
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Masaki Komagata