fixture_dependencies 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844710257301d985c8f60539a30ff1bd9b1819d779da5891ed13ad5753b7966d
-  data.tar.gz: aba7f742f37df3939a391d43bf9ecc462058ba3d54af0ab25e3624d4b14b84e1
+  metadata.gz: 524ee808c516b0960cb838c58ad2b7cea8f240b91bd80f6bda6072ccbb363d64
+  data.tar.gz: ab570a5ebb17bdbb3d933d81e52758b0164591336f6303b7eb571821c2312181
 SHA512:
-  metadata.gz: 381d8c7eac5902496a24f294d2b2e0d7367c8502adc98f0697d34aed92be4e22231bdd9ec332dcb393628dac092b579b21f55a8b2191f64364972091f5320763
-  data.tar.gz: d6b7b5d3bac8327c21caeeb68c1559127f351988b5f88e3f15eaf993586e2eb8e8163fbf15c786eed29d6e5eef8999df0eda467588ecd92fd7745598ed4e0419
+  metadata.gz: 93d0d22666a86d8f6a18082ae462a030e7aff7788c8ee066a5fbdbab084008f5ca01b80031f481a73211a0236601b6555fcc6c5bddde4c1271fc79026c624a6d
+  data.tar.gz: d01b825c6af877502f424e030c2751c3cf8418bed26034a08fc95ad5bd030a8a8e90b2cf97853dd7495bf084b98a3a3c5759acff5afd8e5317d48618eb13447a

data/CHANGELOG

@@ -1,3 +1,11 @@
+# 1.12.0 (2026-05-25)
+
+* Make fixture_dependencies/rspec/sequel work with recent versions of rspec (jeremyevans) (#40)
+
+* Make FixtureDependencies.class_map handle model names that are not CamelCase (jeremyevans) (#39)
+
+* Add FixtureDependencies.use_unsafe_load to use YAML.unsafe_load to load YAML files (jeremyevans, tomasmiguez) (#37, #38)
+
 # 1.11.0 (2022-06-30)
 
 * Drop Ruby 1.8 support (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2022 Jeremy Evans
+Copyright (c) 2007-2026 Jeremy Evans and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files (the "Software"), to deal

data/lib/fixture_dependencies/rspec/sequel.rb

@@ -2,8 +2,14 @@ require_relative '../helper_methods'
 
 if defined?(RSpec)
   example_group = RSpec::Core::ExampleGroup
-  require 'rspec/version'
-  if RSpec::Version::STRING >= '2.8.0'
+  use_rspec_configure = begin
+    require 'rspec/core/version'
+  rescue LoadError
+    require 'rspec/version'
+    RSpec::Version::STRING >= '2.8.0'
+  end
+
+  if use_rspec_configure
     RSpec.configure do |c|
       c.around(:each) do |example|
         Sequel::Model.db.transaction(:rollback=>:always){example.run}

data/lib/fixture_dependencies.rb

@@ -7,6 +7,7 @@ class FixtureDependencies
   @loaded = {}
   @class_map = {}
   @verbose = 0
+  @use_unsafe_load = false
   
   # Load all record arguments into the database. If a single argument is
   # given and it corresponds to a single fixture, return the the model
@@ -62,8 +63,9 @@ class FixtureDependencies
       end
     end.flatten.compact.map do |record| 
       model_name, name = split_name(record)
-      unless class_map[model_name.to_sym].nil?
-        record = "#{class_map[model_name.to_sym].to_s.underscore}__#{name}"
+      if klass = class_map[model_name.to_sym]
+        opts = opts.dup
+        opts[:class] = klass
       end
       if name
         use(record.to_sym, opts)
@@ -85,7 +87,7 @@ require_relative 'fixture_dependencies/sequel' if defined?(Sequel::Model)
 
 class << FixtureDependencies
   attr_reader :fixtures, :loaded
-  attr_accessor :verbose, :fixture_path, :class_map
+  attr_accessor :verbose, :fixture_path, :class_map, :use_unsafe_load
   
   private
     
@@ -105,21 +107,23 @@ class << FixtureDependencies
   
   # Adds all fixtures in the yaml fixture file for the model to the fixtures
   # hash (does not add them to the database, see add).
-  def load_yaml(model_name)
+  def load_yaml(model_name, opts={})
     raise(ArgumentError, "No fixture_path set. Use FixtureDependencies.fixture_path = ...") unless fixture_path
 
-    klass = model_class(model_name)
+    klass = opts[:class] || model_class(model_name)
     filename = klass.send(klass.respond_to?(:fixture_filename) ? :fixture_filename : :table_name)
     yaml_path = File.join(fixture_path, "#{filename}.yml")
 
-    if File.exist?(yaml_path)
-      yaml = YAML.load(File.read(yaml_path))
+    yaml_data = if File.exist?(yaml_path)
+      File.read(yaml_path)
     elsif File.exist?("#{yaml_path}.erb")
-      yaml = YAML.load(ERB.new(File.read("#{yaml_path}.erb")).result)
+      ERB.new(File.read("#{yaml_path}.erb")).result
     else
       raise(ArgumentError, "No valid fixture found at #{yaml_path}[.erb]")
     end
 
+    yaml = parse_yaml_data(yaml_data)
+
     yaml.each do |name, attributes|
       symbol_attrs = {}
       attributes.each{|k,v| symbol_attrs[k.to_sym] = v}
@@ -127,6 +131,12 @@ class << FixtureDependencies
     end
     loaded[model_name.to_sym] = true
   end
+
+  # Parse the given data as YAML.  If use_unsafe_load has been safe, use
+  # YAML.unsafe_load instead of YAML.load for parsing.
+  def parse_yaml_data(yaml_data)
+    @use_unsafe_load ? YAML.unsafe_load(yaml_data) : YAML.load(yaml_data)
+  end
   
   # Delegate to the correct method based on mtype
   def model_method(meth, mtype, *args, &block)
@@ -171,10 +181,10 @@ class << FixtureDependencies
     puts "#{spaces}load stack:#{loading.inspect}" if verbose > 1
     loading.push(record)
     model_name, name = split_name(record)
-    model = model_class(model_name)
+    model = opts[:class] || model_class(model_name)
     unless loaded[model_name.to_sym]
       puts "#{spaces}loading #{model.table_name}.yml" if verbose > 0
-      load_yaml(model_name)
+      load_yaml(model_name, opts)
     end
     mtype = model_type(model)
     model_method(:raise_model_error, mtype, "Couldn't use fixture #{record.inspect}") unless attributes = fixtures[model_name.to_sym][name.to_sym]
@@ -203,7 +213,7 @@ class << FixtureDependencies
             value, polymorphic_class = polymorphic_association(value)
             dep_name = "#{polymorphic_class.to_s.underscore}__#{value}".to_sym
           else
-            dep_name = "#{model_method(:reflection_class, mtype, reflection).name.underscore}__#{value}".to_sym
+            dep_name = "#{dep_class(mtype, reflection)}__#{value}".to_sym
           end
 
           if dep_name == record
@@ -260,7 +270,7 @@ class << FixtureDependencies
     # Update the has_many and habtm associations
     many_associations.each do |attr, reflection, values|
       Array(values).each do |value|
-        dep_name = "#{model_method(:reflection_class, mtype, reflection).name.underscore}__#{value}".to_sym
+        dep_name = "#{dep_class(mtype, reflection)}__#{value}".to_sym
         rtype = model_method(:reflection_type, mtype, reflection) if verbose > 1
         if dep_name == record
           # Self referential, add association
@@ -282,6 +292,11 @@ class << FixtureDependencies
     obj
   end
 
+  def dep_class(mtype, reflection)
+    reflection_class = model_method(:reflection_class, mtype, reflection)
+    class_map.find{|k,v| break k if v == reflection_class} || reflection_class.name.underscore
+  end
+
   def fixture_pk(model)
     case pk = model.primary_key
     when Symbol, Array

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fixture_dependencies
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-global_expectations
@@ -24,7 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email: code@jeremyevans.net
 executables: []
 extensions: []
@@ -52,7 +50,6 @@ metadata:
   bug_tracker_uri: https://github.com/jeremyevans/fixture_dependencies/issues
   mailing_list_uri: https://github.com/jeremyevans/fixture_dependencies/discussions
   source_code_uri: https://github.com/jeremyevans/fixture_dependencies
-post_install_message: 
 rdoc_options:
 - "--inline-source"
 - "--line-numbers"
@@ -71,8 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Sequel/ActiveRecord fixture loader that handles dependency graphs
 test_files: []