fabrication 2.28.0 → 2.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df854c441daf0accdb476682c98e8dcc2fab18fe239d182ccfe2946e16995921
-  data.tar.gz: d6cf1bfa72594c9255243643eed956f97af1fd976bb8768fe458410f54e4d1dd
+  metadata.gz: c81aec7d3bdf1fd43d6b18d57edeb83b408f099eb403eb31b2caa17c715fa32e
+  data.tar.gz: 5945e9f77ced15f5de56749ae48c3b6f121ae4e3d941784ada4640d774957a08
 SHA512:
-  metadata.gz: 4783af273421b7799092a0bcc75c86a66d8f85f22a98d18354935010ccabc4a8fd32aa0eef5c814bab7257ff29cfef8db3e58160016d04a6f77b1480b92a80f9
-  data.tar.gz: 6fdec94bac094143b78d8135b56219c8e2faaa9136035fc1dcd309e0d7b44978991c12664ae422722debadb13ffe4c2396cde01e3e384c495d08d29fb869fa8b
+  metadata.gz: 85ae12f9d4e95529411053591e8b80792afd639a32c9de705859f259e3c97725bb3b146c736381ec00a9b1daa16dd678466babc883e2eba797f50322deeac20b
+  data.tar.gz: cb07e8bf44438241f9500654755f2b350b5646b8e4fbf24b1d840147ffb074103e11bf230ca7e03d92f77c1d2c26d30ab292b70f96186e11a8098f7c230595f8

data/lib/fabrication/config.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Fabrication
   module Config
     extend self
@@ -14,14 +16,22 @@ module Fabrication
               nil
     end
 
+    attr_writer :logger, :sequence_start
+
+    def logger
+      @logger ||= Logger.new($stdout).tap do |logger|
+        logger.level = Logger::WARN
+      end
+    end
+
     def fabricator_path
       @fabricator_path ||= ['test/fabricators', 'spec/fabricators']
     end
     alias fabricator_paths fabricator_path
 
     def fabricator_dir
-      puts 'DEPRECATION WARNING: Fabrication::Config.fabricator_dir has been ' \
-           'replaced by Fabrication::Config.fabricator_path'
+      Support.log_deprecation('Fabrication::Config.fabricator_dir has been ' \
+                              'replaced by Fabrication::Config.fabricator_path')
       fabricator_path
     end
 
@@ -30,13 +40,11 @@ module Fabrication
     end
 
     def fabricator_dir=(folders)
-      puts 'DEPRECATION WARNING: Fabrication::Config.fabricator_dir has been ' \
-           'replaced by Fabrication::Config.fabricator_path'
+      Support.log_deprecation('Fabrication::Config.fabricator_dir has been ' \
+                              'replaced by Fabrication::Config.fabricator_path')
       self.fabricator_path = folders
     end
 
-    attr_writer :sequence_start
-
     def sequence_start
       @sequence_start ||= 0
     end
@@ -67,8 +75,10 @@ module Fabrication
     end
 
     def register_with_steps=(value)
-      puts 'DEPRECATION WARNING: Fabrication::Config.register_with_steps has been ' \
-           'deprecated. Please regenerate your cucumber steps with `rails g fabrication:cucumber_steps'
+      Support.log_deprecation(
+        'Fabrication::Config.register_with_steps has been deprecated. ' \
+        'Please regenerate your cucumber steps with `rails g fabrication:cucumber_steps'
+      )
 
       return unless value
 

data/lib/fabrication/cucumber/step_fabricator.rb

@@ -1,3 +1,5 @@
+require 'singleton'
+
 module Fabrication
   module Cucumber
     class StepFabricator
@@ -85,17 +87,23 @@ module Fabrication
       end
     end
 
-    module Fabrications
+    class Fabrications
+      include Singleton
+
       def self.fabrications
-        @fabrications ||= {}
+        instance.fabrications
       end
 
       def self.[](fabricator)
-        fabrications[fabricator.to_sym]
+        instance.fabrications[fabricator.to_sym]
       end
 
       def self.[]=(fabricator, fabrication)
-        fabrications[fabricator.to_sym] = fabrication
+        instance.fabrications[fabricator.to_sym] = fabrication
+      end
+
+      def fabrications
+        @fabrications ||= {}
       end
     end
   end

data/lib/fabrication/generator/active_record.rb

@@ -11,10 +11,10 @@ module Fabrication
       end
 
       def build_instance
-        self._instance = if _klass.respond_to?(:protected_attributes)
-                           _klass.new(_attributes, without_protection: true)
+        self._instance = if resolved_class.respond_to?(:protected_attributes)
+                           resolved_class.new(_attributes, without_protection: true)
                          else
-                           _klass.new(_attributes)
+                           resolved_class.new(_attributes)
                          end
       end
     end

data/lib/fabrication/generator/base.rb

@@ -1,7 +1,7 @@
 module Fabrication
   module Generator
     class Base
-      def self.supports?(_klass)
+      def self.supports?(_resolved_class)
         true
       end
 
@@ -59,12 +59,12 @@ module Fabrication
       end
 
       def build_instance_with_init_callback(callback)
-        self._instance = _klass.new(*callback.call(_transient_attributes))
+        self._instance = resolved_class.new(*callback.call(_transient_attributes))
         set_attributes
       end
 
       def build_instance
-        self._instance = _klass.new
+        self._instance = resolved_class.new
         set_attributes
       end
 
@@ -74,8 +74,8 @@ module Fabrication
         end
       end
 
-      def initialize(klass)
-        self._klass = klass
+      def initialize(resolved_class)
+        self.resolved_class = resolved_class
       end
 
       def respond_to_missing?(method_name, _include_private = false)
@@ -86,9 +86,17 @@ module Fabrication
         _attributes.fetch(method_name) { super }
       end
 
+      def _klass
+        Fabrication::Support.log_deprecation(
+          'The `_klass` method in fabricator definitions has been replaced by `resolved_class`'
+        )
+
+        resolved_class
+      end
+
       protected
 
-      attr_accessor :_klass, :_instance, :_transient_attributes
+      attr_accessor :resolved_class, :_instance, :_transient_attributes
 
       def _attributes
         @_attributes ||= {}

data/lib/fabrication/generator/data_mapper.rb

@@ -6,7 +6,7 @@ module Fabrication
       end
 
       def build_instance
-        self._instance = _klass.new(_attributes)
+        self._instance = resolved_class.new(_attributes)
       end
 
       protected

data/lib/fabrication/generator/mongoid.rb

@@ -6,10 +6,10 @@ module Fabrication
       end
 
       def build_instance
-        self._instance = if _klass.respond_to?(:protected_attributes)
-                           _klass.new(_attributes, without_protection: true)
+        self._instance = if resolved_class.respond_to?(:protected_attributes)
+                           resolved_class.new(_attributes, without_protection: true)
                          else
-                           _klass.new(_attributes)
+                           resolved_class.new(_attributes)
                          end
       end
     end

data/lib/fabrication/generator/sequel.rb

@@ -12,7 +12,7 @@ module Fabrication
 
       def set_attributes
         _attributes.each do |key, value|
-          if (reflection = _klass.association_reflections[key]) && value.is_a?(Array)
+          if (reflection = resolved_class.association_reflections[key]) && value.is_a?(Array)
             _instance.associations[key] = value
             _instance.after_save_hook do
               value.each { |o| _instance.send(reflection.add_method, o) }
@@ -30,7 +30,7 @@ module Fabrication
       private
 
       def load_instance_hooks
-        klass = _klass.respond_to?(:cti_base_model) ? _klass.cti_models.first : _klass
+        klass = resolved_class.respond_to?(:cti_base_model) ? resolved_class.cti_models.first : resolved_class
         klass.plugin :instance_hooks unless klass.new.respond_to? :after_save_hook
       end
     end

data/lib/fabrication/schematic/attribute.rb

@@ -43,8 +43,8 @@ module Fabrication
 
       private
 
-      def execute(*args, &block)
-        Fabrication::Schematic::Runner.new(klass).instance_exec(*args, &block)
+      def execute(...)
+        Fabrication::Schematic::Runner.new(klass).instance_exec(...)
       end
 
       def process_count

data/lib/fabrication/sequencer.rb

@@ -1,8 +1,21 @@
+require 'singleton'
+
 module Fabrication
   class Sequencer
+    include Singleton
+
     DEFAULT = :_default
 
     def self.sequence(name = DEFAULT, start = nil, &block)
+      instance.sequence(name, start, &block)
+    end
+
+    def self.clear
+      instance.sequences.clear
+      instance.sequence_blocks.clear
+    end
+
+    def sequence(name = DEFAULT, start = nil, &block)
       idx = sequences[name] ||= start || Fabrication::Config.sequence_start
       if block
         sequence_blocks[name] = block.to_proc
@@ -13,15 +26,15 @@ module Fabrication
       end
     end
 
-    def self.sequences
+    def sequences
       @sequences ||= {}
     end
 
-    def self.sequence_blocks
+    def sequence_blocks
       @sequence_blocks ||= {}
     end
 
-    def self.reset
+    def reset
       Fabrication::Config.sequence_start = nil
       @sequences = nil
       @sequence_blocks = nil

data/lib/fabrication/support.rb

@@ -1,79 +1,68 @@
 module Fabrication
-  class Support
-    class << self
-      def fabricatable?(name)
-        Fabrication.manager[name] || class_for(name)
-      end
+  module Support
+    extend self
 
-      def class_for(class_or_to_s)
-        class_name = variable_name_to_class_name(class_or_to_s)
-        constantize(class_name)
-      rescue NameError => e
-        raise Fabrication::UnfabricatableError.new(class_or_to_s, e)
-      end
+    def fabricatable?(name)
+      Fabrication.manager[name] || class_for(name)
+    end
 
-      def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        Object.const_get(camel_cased_word) if names.empty?
-        names.shift if names.size > 1 && names.first.empty?
-        names.inject(Object) do |constant, name|
-          if constant == Object
-            constant.const_get(name)
-          else
-            candidate = constant.const_get(name)
-            next candidate if constant.const_defined?(name, false)
-            next candidate unless Object.const_defined?(name)
+    def log_deprecation(message)
+      Config.logger.warn("[DEPRECATION][fabrication] #{message}")
+    end
 
-            constant = constant.ancestors.inject do |const, ancestor|
-              break const    if ancestor == Object
-              break ancestor if ancestor.const_defined?(name, false)
+    def class_for(class_or_to_s)
+      constantize(variable_name_to_class_name(class_or_to_s))
+    rescue NameError => e
+      raise Fabrication::UnfabricatableError.new(class_or_to_s, e)
+    end
 
-              const
-            end
-            constant.const_get(name, false)
-          end
-        end
-      end
+    def constantize(camel_cased_word)
+      return camel_cased_word if camel_cased_word.is_a?(Class)
 
-      def extract_options!(args)
-        args.last.is_a?(::Hash) ? args.pop : {}
+      camel_cased_word.to_s.split('::').reduce(Object) do |resolved_class, class_part|
+        resolved_class.const_get(class_part)
       end
+    end
 
-      def variable_name_to_class_name(name)
-        name_string = name.to_s
+    def extract_options!(args)
+      args.last.is_a?(::Hash) ? args.pop : {}
+    end
 
-        if name_string.respond_to?(:camelize)
-          name_string.camelize
-        else
-          name_string.gsub(%r{/(.?)}) do
-            "::#{Regexp.last_match(1).upcase}"
-          end.gsub(/(?:^|_)(.)/) { Regexp.last_match(1).upcase }
-        end
-      end
+    def variable_name_to_class_name(name)
+      name_string = name.to_s
 
-      def find_definitions
-        puts 'DEPRECATION WARNING: Fabrication::Support.find_definitions has been replaced ' \
-             'by Fabrication.manager.load_definitions and will be removed in 3.0.0.'
-        Fabrication.manager.load_definitions
+      if name_string.respond_to?(:camelize)
+        name_string.camelize
+      else
+        name_string.gsub(%r{/(.?)}) do
+          "::#{Regexp.last_match(1).upcase}"
+        end.gsub(/(?:^|_)(.)/) { Regexp.last_match(1).upcase }
       end
+    end
 
-      def hash_class
-        @hash_class ||= defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess : Hash
-      end
+    def find_definitions
+      log_deprecation('Fabrication::Support.find_definitions has been replaced by ' \
+                      'Fabrication.manager.load_definitions and will be removed in 3.0.0.')
 
-      def singularize(string)
-        string.singularize
-      rescue StandardError
-        string.end_with?('s') ? string[0..-2] : string
-      end
+      Fabrication.manager.load_definitions
+    end
 
-      def underscore(string)
-        string.gsub(/::/, '/')
-              .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-              .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-              .tr('-', '_')
-              .downcase
-      end
+    def hash_class
+      @hash_class ||= defined?(HashWithIndifferentAccess) ? HashWithIndifferentAccess : Hash
+    end
+
+    def singularize(string)
+      string.singularize
+    rescue StandardError
+      string.end_with?('s') ? string[0..-2] : string
+    end
+
+    def underscore(string)
+      string.gsub(/::/, '/')
+            .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+            .tr('-', '_')
+            .downcase
     end
   end
 end

data/lib/fabrication/transform.rb

@@ -1,37 +1,39 @@
+require 'singleton'
+
 module Fabrication
   class Transform
+    include Singleton
+
     class << self
       def apply_to(schematic, attributes_hash)
         Fabrication.manager.load_definitions if Fabrication.manager.empty?
-        attributes_hash.inject({}) { |h, (k, v)| h.update(k => apply_transform(schematic, k, v)) }
+        attributes_hash.inject({}) { |h, (k, v)| h.update(k => instance.apply_transform(schematic, k, v)) }
       end
 
       def clear_all
-        @transforms = nil
-        @overrides = nil
+        instance.transforms.clear
+        instance.overrides.clear
       end
 
       def define(attribute, transform)
-        transforms[attribute] = transform
+        instance.transforms[attribute] = transform
       end
 
       def only_for(schematic, attribute, transform)
-        overrides[schematic] = (overrides[schematic] || {}).merge!(attribute => transform)
+        instance.overrides[schematic] = (instance.overrides[schematic] || {}).merge!(attribute => transform)
       end
+    end
 
-      private
-
-      def overrides
-        @overrides ||= {}
-      end
+    def overrides
+      @overrides ||= {}
+    end
 
-      def apply_transform(schematic, attribute, value)
-        overrides.fetch(schematic, transforms)[attribute].call(value)
-      end
+    def apply_transform(schematic, attribute, value)
+      overrides.fetch(schematic, transforms)[attribute].call(value)
+    end
 
-      def transforms
-        @transforms ||= Hash.new(->(value) { value })
-      end
+    def transforms
+      @transforms ||= Hash.new(->(value) { value })
     end
   end
 end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.28.0'.freeze
+  VERSION = '2.29.0'.freeze
 end

data/lib/fabrication.rb

@@ -31,7 +31,6 @@ module Fabrication
 
   module Generator
     autoload :ActiveRecord,  'fabrication/generator/active_record'
-    autoload :ActiveRecord4, 'fabrication/generator/active_record_4'
     autoload :DataMapper,    'fabrication/generator/data_mapper'
     autoload :Mongoid,       'fabrication/generator/mongoid'
     autoload :Sequel,        'fabrication/generator/sequel'
@@ -40,7 +39,7 @@ module Fabrication
 
   def self.clear_definitions
     manager.clear
-    Sequencer.sequences.clear
+    Sequencer.clear
   end
 
   def self.configure(&block)
@@ -48,12 +47,12 @@ module Fabrication
   end
 
   def self.manager
-    @manager ||= Fabrication::Schematic::Manager.instance
+    Fabrication::Schematic::Manager.instance
   end
 
   def self.schematics
-    puts 'DEPRECATION WARNING: Fabrication.schematics has been replaced by '\
-         'Fabrication.manager and will be removed in 3.0.0.'
+    Support.log_deprecation('Fabrication.schematics has been replaced by '\
+                            'Fabrication.manager and will be removed in 3.0.0.')
     manager
   end
 end

data/lib/rails/generators/fabrication/cucumber_steps/cucumber_steps_generator.rb

@@ -8,7 +8,7 @@ module Fabrication
       end
 
       def self.source_root
-        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+        File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
     end
   end

data/lib/rails/generators/fabrication/model/model_generator.rb

@@ -19,7 +19,7 @@ module Fabrication
       end
 
       def self.source_root
-        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+        File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.29.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="