fixture_factory 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3cfc56492aba74f896ae46e75abc1444ea6dce64c836da9e24b046aebff9f43
-  data.tar.gz: d0e255b0c304c9763806f49acc00463d3b522f62db3356ab8703471befcca245
+  metadata.gz: d381248d146c43a6d012835ba18cc6a4e35eed54dac49e7bc1251835e3c7c067
+  data.tar.gz: 484dfa6915dcdfe39916de7550476629165c7b145f848d08731431a3ddfab9b7
 SHA512:
-  metadata.gz: 78368269a25209bd0dac219b4680879456353ab490300facf0a6ac427cc6df3400295ae24dfb7059ff4148c4221b06719794b6403ebacf095bc0e0f21f8b97b9
-  data.tar.gz: 82e7039c1d6b27c570239627020cc28c130ea576120bda2cfa6b64ff17b28ecc134d832c22c212af92653be68823ed398036998fef74e0d10548f0f989717bf6
+  metadata.gz: 2b1178163cd32b43d455c6d832d0211fc09eefaa92b7677e7fbc59b14eb07fdde7e19af582c196c6eb981570973b629aec6aa0ad8b1a9d16e7faafdcd73604f4
+  data.tar.gz: faa5c0d04ae035afbd89e2211a902b02b4ddccc8152ec2dc2fc7b4ca0558f012f8ac963a0bbe4651f02f33da91cf21012b15b62c74cf94068cb74571255f0450

data/lib/fixture_factory/definition.rb

@@ -5,14 +5,14 @@ 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
 
@@ -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

@@ -46,12 +46,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]]

data/lib/fixture_factory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixture_factory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Shopify Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord