fixture_kit 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad45a151930afb73f5c8ba3f22a93536046fa783d240ea703c248e5329d6ceae
-  data.tar.gz: fdcf019b31154c187c5057df7990647e2102c173cc6310236866202d549e846c
+  metadata.gz: 41dfc0a3fb06edb02068d8127c89708ec7e2c5792b40fb031ee553716a7c54ca
+  data.tar.gz: 4193bec6652924d99a7f564212087afa7f678b1f7995fca67f883dcfb1a45d24
 SHA512:
-  metadata.gz: 73e72901b28d7f55c7714cbb581b3fa4703533968d23b20c6d0e010be4001a7cc39655ad56726f125d7b655a9ad94ff770735a72eef54a50041b9f21a81511fd
-  data.tar.gz: b104a22228a595e9cac03e8facb58ca9174b62d22d15cb347b4fd9ef6c5fb11de1187b3d05c1c8cd9bd71ae0b417d965e1af436a0c4af9efdd6f4f06e75649ba
+  metadata.gz: e9d7108cd6bda22319c02ea76384772210bdbea00f3ac93c6f6263dd72f5d7475f4cb0087f57f2d316dd17bc2fe36ad3597e87a417dae8149b0404f9196e6a0f
+  data.tar.gz: 25c72f2db8d0c93e06e244acc12d224ec36a0cbb85cbbd65c9a4a9d92268b76847c9fb0150508f78d2a1446a7c66587b3c5d479b701c2f072d97e6df92ec289d

data/lib/fixture_kit/cache.rb

@@ -8,10 +8,11 @@ require "active_support/inflector"
 module FixtureKit
   class Cache
     ANONYMOUS_DIRECTORY = "_anonymous"
+    MemoryData = Data.define(:records, :exposed)
 
     include ConfigurationHelper
 
-    attr_reader :fixture
+    attr_reader :fixture, :data
 
     def initialize(fixture)
       @fixture = fixture
@@ -33,7 +34,7 @@ module FixtureKit
     end
 
     def exists?
-      @data || File.exist?(path)
+      data || File.exist?(path)
     end
 
     def load
@@ -41,8 +42,8 @@ module FixtureKit
         raise FixtureKit::CacheMissingError, "Cache does not exist for fixture '#{fixture.identifier}'"
       end
 
-      @data ||= JSON.parse(File.read(path))
-      statements_by_connection(@data.fetch("records")).each do |connection, statements|
+      @data ||= load_memory_data
+      statements_by_connection(data.records).each do |connection, statements|
         connection.disable_referential_integrity do
           # execute_batch is private in current supported Rails versions.
           # This should be revisited when Rails 8.2 makes it public.
@@ -50,31 +51,32 @@ module FixtureKit
         end
       end
 
-      Repository.new(@data.fetch("exposed"))
+      Repository.new(data.exposed)
     end
 
     def save
       FixtureKit.runner.adapter.execute do |context|
-        models = SqlSubscriber.capture do
-          fixture.definition.evaluate(context)
+        captured_models = SqlSubscriber.capture do
+          fixture.definition.evaluate(context, parent: fixture.parent&.mount)
         end
 
-        @data = {
-          "records" => generate_statements(models),
-          "exposed" => build_exposed_mapping(fixture.definition.exposed)
-        }
+        if fixture.parent
+          captured_models.concat(fixture.parent.cache.data.records.keys)
+        end
+
+        @data = MemoryData.new(
+          records: generate_statements(captured_models),
+          exposed: build_exposed_mapping(fixture.definition.exposed)
+        )
       end
 
-      FileUtils.mkdir_p(File.dirname(path))
-      File.write(path, JSON.pretty_generate(@data))
+      save_file_data
     end
 
     private
 
     def generate_statements(models)
-      statements_by_model = {}
-
-      models.each do |model|
+      models.uniq.each_with_object({}) do |model, statements|
         columns = model.column_names
 
         rows = []
@@ -87,10 +89,8 @@ module FixtureKit
         end
 
         sql = rows.empty? ? nil : build_insert_sql(model.table_name, columns, rows, model.connection)
-        statements_by_model[model.name] = sql
+        statements[model] = sql
       end
-
-      statements_by_model
     end
 
     def build_delete_sql(model)
@@ -105,17 +105,19 @@ module FixtureKit
     end
 
     def build_exposed_mapping(exposed)
-      exposed.each_with_object({}) do |(name, value), hash|
-        was_array = value.is_a?(Array)
-        records = Array.wrap(value).map { |record| { "model" => record.class.name, "id" => record.id } }
-        hash[name] = was_array ? records : records.first
+      exposed.each_with_object({}) do |(name, record), hash|
+        if record.is_a?(Array)
+          hash[name] = record.map { |record| { record.class => record.id } }
+        else
+          hash[name] = { record.class => record.id }
+        end
       end
     end
 
     def statements_by_connection(records)
       deleted_tables = Set.new
-      records.each_with_object({}) do |(model_name, sql), grouped|
-        model = ActiveSupport::Inflector.constantize(model_name)
+
+      records.each_with_object({}) do |(model, sql), grouped|
         connection = model.connection
         grouped[connection] ||= []
 
@@ -127,5 +129,27 @@ module FixtureKit
         grouped[connection] << sql if sql
       end
     end
+
+    def load_memory_data
+      file_data = JSON.parse(File.read(path))
+      records = file_data.fetch("records").transform_keys do |model_name|
+        ActiveSupport::Inflector.constantize(model_name)
+      end
+
+      exposed = file_data.fetch("exposed").each_with_object({}) do |(name, value), hash|
+        if value.is_a?(Array)
+          hash[name.to_sym] = value.map { |r| { ActiveSupport::Inflector.constantize(r.keys.first) => r.values.first } }
+        else
+          hash[name.to_sym] = { ActiveSupport::Inflector.constantize(value.keys.first) => value.values.first }
+        end
+      end
+
+      MemoryData.new(records: records, exposed: exposed)
+    end
+
+    def save_file_data
+      FileUtils.mkdir_p(File.dirname(path))
+      File.write(path, JSON.pretty_generate(data.to_h))
+    end
   end
 end

data/lib/fixture_kit/definition.rb

@@ -2,16 +2,16 @@
 
 module FixtureKit
   class Definition
-    attr_reader :exposed, :source_location
+    attr_reader :exposed, :extends
 
-    def initialize(&definition)
+    def initialize(extends: nil, &definition)
       @definition = definition
-      @source_location = definition.source_location
       @exposed = {}
+      @extends = extends
     end
 
-    def evaluate(context)
-      context.singleton_class.prepend(mixin)
+    def evaluate(context, parent: nil)
+      context.singleton_class.prepend(mixin(parent))
       context.instance_exec(&@definition)
     end
 
@@ -27,13 +27,17 @@ module FixtureKit
 
     private
 
-    def mixin
+    def mixin(parent)
       definition = self
 
       Module.new do
         define_method(:expose) do |**records|
           definition.expose(**records)
         end
+
+        define_method(:parent) do
+          parent
+        end
       end
     end
   end

data/lib/fixture_kit/fixture.rb

@@ -6,17 +6,23 @@ module FixtureKit
   class Fixture
     include ConfigurationHelper
 
-    attr_reader :identifier, :definition
+    attr_reader :identifier, :definition, :parent, :cache
 
     def initialize(identifier, definition)
       @identifier = identifier
       @definition = definition
       @cache = Cache.new(self)
+
+      if definition.extends
+        @parent = FixtureKit.runner.registry.add(definition.extends)
+      end
     end
 
-    def cache(force: false)
+    def generate(force: false)
       return if @cache.exists? && !force
 
+      parent&.generate
+
       emit(:cache_save)
       emit(:cache_saved) { @cache.save }
     end

data/lib/fixture_kit/minitest.rb

@@ -8,8 +8,10 @@ module FixtureKit
     DECLARATION_CLASS_ATTRIBUTE = :fixture_kit_declaration
 
     module ClassMethods
-      def fixture(name = nil, &definition_block)
-        self.fixture_kit_declaration = FixtureKit.runner.register(self, name, &definition_block)
+      def fixture(name = nil, extends: nil, &block)
+        definition = Definition.new(extends: extends, &block) if block_given?
+        declaration = FixtureKit.runner.register(name || definition, self)
+        self.fixture_kit_declaration = declaration
       end
 
       def run_suite(reporter, options = {})
@@ -17,7 +19,7 @@ module FixtureKit
         if declaration && !filter_runnable_methods(options).empty?
           runner = FixtureKit.runner
           runner.start unless runner.started?
-          declaration.cache
+          declaration.generate
         end
 
         super

data/lib/fixture_kit/registry.rb

@@ -7,22 +7,27 @@ module FixtureKit
     def initialize
       @declarations = {}
       @fixtures = {}
+      @resolving = []
     end
 
-    def add(scope, name_or_block)
-      if @declarations.key?(scope)
-        raise FixtureKit::MultipleFixtures, "cannot load multiple fixtures in the same context"
-      end
-
-      @declarations[scope] =
-        case name_or_block
+    def add(name_or_definition, scope = nil)
+      fixture =
+        case name_or_definition
         when String
-          fetch_named_fixture(name_or_block)
-        when Proc
-          fetch_anonymous_fixture(scope, name_or_block)
+          fetch_named_fixture(name_or_definition)
+        when Definition
+          raise ArgumentError, "scope is required for anonymous fixture declarations" unless scope
+          fetch_anonymous_fixture(scope, name_or_definition)
         else
-          raise FixtureKit::InvalidFixtureDeclaration, "unsupported fixture declaration type: #{name_or_block.class}"
+          raise FixtureKit::InvalidFixtureDeclaration, "unsupported fixture declaration type: #{name_or_definition.class}"
         end
+
+      if scope
+        raise FixtureKit::MultipleFixtures, "cannot load multiple fixtures in the same context" if @declarations.key?(scope)
+        @declarations[scope] = fixture
+      end
+
+      fixture
     end
 
     def fixtures
@@ -32,11 +37,23 @@ module FixtureKit
     private
 
     def fetch_named_fixture(name)
-      @fixtures[name] ||= Fixture.new(name, load_named_definition(name))
+      return @fixtures[name] if @fixtures.key?(name)
+
+      if @resolving.include?(name)
+        chain = @resolving + [name]
+        start = chain.index(name)
+        raise FixtureKit::CircularFixtureInheritance,
+          "circular fixture inheritance detected: #{chain[start..].join(" -> ")}"
+      end
+
+      @resolving.push(name)
+      @fixtures[name] = Fixture.new(name, load_named_definition(name))
+      @resolving.pop
+      @fixtures[name]
     end
 
     def fetch_anonymous_fixture(scope, definition)
-      @fixtures[scope] ||= Fixture.new(scope, Definition.new(&definition))
+      @fixtures[scope] ||= Fixture.new(scope, definition)
     end
 
     def load_named_definition(name)

data/lib/fixture_kit/repository.rb

@@ -5,7 +5,7 @@ require "active_support/inflector"
 module FixtureKit
   class Repository
     def initialize(exposed_records)
-      @records = exposed_records.transform_keys(&:to_sym)
+      @records = exposed_records
       @loaded_records = {}
       define_readers
     end
@@ -33,8 +33,7 @@ module FixtureKit
     end
 
     def load_record(record_info)
-      model = ActiveSupport::Inflector.constantize(record_info.fetch("model"))
-      model.find_by(id: record_info.fetch("id"))
+      record_info.keys.first.find_by(id: record_info.values.first)
     end
   end
 end

data/lib/fixture_kit/rspec.rb

@@ -27,12 +27,13 @@ module FixtureKit
       #       end
       #     end
       #   end
-      def fixture(name = nil, &definition_block)
-        declaration = ::RSpec.configuration.fixture_kit.register(self, name, &definition_block)
+      def fixture(name = nil, extends: nil, &block)
+        definition = Definition.new(extends: extends, &block) if block_given?
+        declaration = ::RSpec.configuration.fixture_kit.register(name || definition, self)
         metadata[DECLARATION_METADATA_KEY] = declaration
 
         prepend_before(:context) do
-          self.class.metadata[DECLARATION_METADATA_KEY].cache
+          self.class.metadata[DECLARATION_METADATA_KEY].generate
         end
       end
     end

data/lib/fixture_kit/runner.rb

@@ -15,8 +15,8 @@ module FixtureKit
       @started = false
     end
 
-    def register(scope, name = nil, &definition_block)
-      registry.add(scope, normalize_registration(name, definition_block))
+    def register(name_or_definition, scope)
+      registry.add(name_or_definition, scope)
     end
 
     def start
@@ -43,16 +43,5 @@ module FixtureKit
     def preserve_cache?
       ENV[PRESERVE_CACHE_ENV_KEY].to_s.match?(/\A(1|true|yes)\z/i)
     end
-
-    def normalize_registration(name, definition_block)
-      if name && definition_block
-        raise FixtureKit::InvalidFixtureDeclaration, "cannot provide both fixture name and definition block"
-      end
-
-      name_or_block = name || definition_block
-      return name_or_block if name_or_block
-
-      raise FixtureKit::InvalidFixtureDeclaration, "must provide fixture name or definition block"
-    end
   end
 end

data/lib/fixture_kit/singleton.rb

@@ -11,8 +11,8 @@ module FixtureKit
       @runner ||= Runner.new
     end
 
-    def define(&block)
-      Definition.new(&block)
+    def define(extends: nil, &block)
+      Definition.new(extends: extends, &block)
     end
 
     def reset

data/lib/fixture_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FixtureKit
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/lib/fixture_kit.rb

@@ -8,6 +8,7 @@ module FixtureKit
   class CacheMissingError < Error; end
   class FixtureDefinitionNotFound < Error; end
   class RunnerAlreadyStartedError < Error; end
+  class CircularFixtureInheritance < Error; end
 
   autoload :VERSION, File.expand_path("fixture_kit/version", __dir__)
   autoload :Configuration, File.expand_path("fixture_kit/configuration", __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixture_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Ngan Pham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-24 00:00:00.000000000 Z
+date: 2026-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport