fixture_factory 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3cfc56492aba74f896ae46e75abc1444ea6dce64c836da9e24b046aebff9f43
-  data.tar.gz: d0e255b0c304c9763806f49acc00463d3b522f62db3356ab8703471befcca245
+  metadata.gz: c3dd15d0c2961a9b7faf54aa2c96eb7a251b2fcaef8d54de0979716875d9ed92
+  data.tar.gz: 629b71fe3025fa1e2c9c9168e8a84e54e0f24753b81f9641c6a30d4c59407e96
 SHA512:
-  metadata.gz: 78368269a25209bd0dac219b4680879456353ab490300facf0a6ac427cc6df3400295ae24dfb7059ff4148c4221b06719794b6403ebacf095bc0e0f21f8b97b9
-  data.tar.gz: 82e7039c1d6b27c570239627020cc28c130ea576120bda2cfa6b64ff17b28ecc134d832c22c212af92653be68823ed398036998fef74e0d10548f0f989717bf6
+  metadata.gz: 9f6f47491dad7bfe82f35d88093f912599b5fb28488808b1830ded445da43a27156984cf0f0c45eee762693a98edf5adc2409a72191dc64c2a5f2dafbd2d633b
+  data.tar.gz: e885a929f6b8505d64568640738b5969e641d94a48e57aa235e0c572fe69f9344c72f7ae5ffb5865de3904862bb85bdcef52cbeffb6b8af4f9ce432782dc1c8c

data/lib/fixture_factory/definition.rb

@@ -5,20 +5,20 @@ module FixtureFactory
     EMPTY_BLOCK = proc {}
 
     attr_writer   :block
-    attr_accessor :class_name, :fixture_method, :fixture_name, :parent, :sequence
+    attr_accessor :fixture_method, :fixture_name, :parent, :sequence, :proc_class
 
     def initialize(name, options = {})
-      self.parent         = options.fetch(:parent)     { default_parent_for(name) }
-      self.class_name     = options.fetch(:class_name) { parent.class_name }
-      self.fixture_method = options.fetch(:via)        { parent.fixture_method }
-      self.fixture_name   = options.fetch(:like)       { parent.fixture_name }
-      self.block          = options.fetch(:block)      { EMPTY_BLOCK }
+      self.parent         = options.fetch(:parent) { default_parent_for(name) }
+      self.proc_class     = options.fetch(:class)  { parent.proc_class }
+      self.fixture_method = options.fetch(:via)    { parent.fixture_method }
+      self.fixture_name   = options.fetch(:like)   { parent.fixture_name }
+      self.block          = options.fetch(:block)  { EMPTY_BLOCK }
       self.sequence       = Sequence.new
     end
 
     def block
       all_blocks = [parent&.block, @block].compact
-      -> (*args) do
+      ->(*args) do
         all_blocks.reduce({}) do |attributes, block|
           block_attributes = FixtureFactory.evaluate(
             block, args: args, context: self
@@ -29,9 +29,9 @@ module FixtureFactory
     end
 
     def klass
-      @klass ||= class_name.to_s.constantize
+      @klass ||= proc_class.call
     rescue NameError
-      raise WrongClassError, class_name
+      raise WrongClassError, proc_class
     end
 
     def fixture_args
@@ -70,7 +70,7 @@ module FixtureFactory
         name,
         parent: nil,
         like: nil,
-        class_name: name.to_s.classify,
+        class: -> { name.to_s.classify.safe_constantize },
         via: name.to_s.pluralize,
       )
     end

data/lib/fixture_factory/errors.rb

@@ -30,14 +30,32 @@ module FixtureFactory
   end
 
   class WrongClassError < Error
-    def initialize(class_name)
-      super(
-        <<~MSG.squish
-          No class named "#{class_name}".
-          Try using the `class_name` option in your definition to specify a valid class name.
-          https://github.com/Shopify/fixture_factory/blob/master/README.md#naming
-        MSG
-      )
+    def initialize(klass)
+      message = if klass.is_a?(String)
+        string_class_error_message(klass)
+      else
+        proc_class_error_message(klass)
+      end
+      super(message)
+    end
+
+    private
+
+    def proc_class_error_message(proc_class)
+      location, line_number = proc_class.source_location
+      <<~MSG.squish
+        Constant defined in file #{location} on line #{line_number} is not defined.
+        Try using the `class` option in your definition to specify a valid class name.
+        https://github.com/Shopify/fixture_factory/blob/master/README.md#naming
+      MSG
+    end
+
+    def string_class_error_message(class_name)
+      <<~MSG.squish
+        No class named "#{class_name}".
+        Try using the `class_name` option in your definition to specify a valid class name.
+        https://github.com/Shopify/fixture_factory/blob/master/README.md#naming
+      MSG
     end
   end
 end

data/lib/fixture_factory/registry.rb

@@ -6,10 +6,6 @@ module FixtureFactory
   module Registry
     extend ActiveSupport::Concern
 
-    included do
-      class_attribute(:fixture_factory_definitions) # :nodoc:
-    end
-
     class_methods do
       # Defines a fixture given a name, options, and a block.
       #
@@ -46,12 +42,13 @@ module FixtureFactory
       #   factory(:admin, via: :users, like: :bob_admin, class: 'User')
       # end
       def factory(name, options = {}, &block)
-        if options.key?(:class)
-          ActiveSupport::Deprecation.warn(<<~MSG.squish)
-            factory class: option is deprecated and will be removed.
-            Please use the class_name: option instead.
-          MSG
-          options[:class_name] ||= options.delete(:class)
+        if options.key?(:class_name)
+          options[:class] ||= -> do
+            class_name = options.delete(:class_name).to_s
+            class_name.constantize
+          rescue NameError
+            raise WrongClassError, class_name
+          end
         end
 
         parent = all_factory_definitions[options[:parent]]
@@ -61,7 +58,7 @@ module FixtureFactory
       end
 
       # Sets up factories definitions for the current class scope. Accepts an
-      # optional block to define factories in.
+      # optional block to define factories in. Calling this method multiple times appends to existing definitions.
       #
       # === Example
       #
@@ -75,10 +72,18 @@ module FixtureFactory
       #   factory(:post)
       # end
       def define_factories(&block)
-        self.fixture_factory_definitions = {}.with_indifferent_access
+        fixture_factory_definitions
         instance_exec(&block) if block.present?
       end
 
+      def fixture_factory_definitions # :nodoc:
+        @fixture_factory_definitions ||= {}.with_indifferent_access
+      end
+
+      def fixture_factory_definitions=(value) # :nodoc:
+        @fixture_factory_definitions = value
+      end
+
       def all_factory_definitions # :nodoc:
         fixtury_ancestors = ancestors.select do |ancestor|
           ancestor.respond_to?(:fixture_factory_definitions)

data/lib/fixture_factory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FixtureFactory
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

data/lib/fixture_factory.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'fixture_factory/version'
-require 'fixture_factory/definition'
-require 'fixture_factory/methods'
-require 'fixture_factory/registry'
-require 'fixture_factory/sequence'
-require 'fixture_factory/errors'
+require "fixture_factory/version"
+require "fixture_factory/definition"
+require "fixture_factory/methods"
+require "fixture_factory/registry"
+require "fixture_factory/sequence"
+require "fixture_factory/errors"
 
 module FixtureFactory
   class << self
@@ -32,6 +32,7 @@ module FixtureFactory
 
     def extract_attributes(object)
       raise ArgumentError, "FixtureFactory blocks must return a hash-like object" unless object.respond_to?(:to_h)
+
       object.to_h.symbolize_keys
     end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fixture_factory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Shopify Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2026-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - gems@shopify.com
 executables: []
@@ -141,7 +141,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,15 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Factories via fixtures
 test_files: []