fabrication 2.29.0 → 2.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c81aec7d3bdf1fd43d6b18d57edeb83b408f099eb403eb31b2caa17c715fa32e
-  data.tar.gz: 5945e9f77ced15f5de56749ae48c3b6f121ae4e3d941784ada4640d774957a08
+  metadata.gz: 3efaba7356d0a3fcade7fe08a68719f8d0f452bc8cd72a88e087c10434931745
+  data.tar.gz: 1beb71f4903b74255a06c46ee6ca15e464d3ed6b0400a02ba01cd65cefd205a7
 SHA512:
-  metadata.gz: 85ae12f9d4e95529411053591e8b80792afd639a32c9de705859f259e3c97725bb3b146c736381ec00a9b1daa16dd678466babc883e2eba797f50322deeac20b
-  data.tar.gz: cb07e8bf44438241f9500654755f2b350b5646b8e4fbf24b1d840147ffb074103e11bf230ca7e03d92f77c1d2c26d30ab292b70f96186e11a8098f7c230595f8
+  metadata.gz: 04bd08bc59c91ff463cac12869d0a4211b969f50635748e830842e62198c9f9ec7dad7bebbc1db32d6e65fd46d76559041da27c689d067d65835978ade6fb86d
+  data.tar.gz: 6a4259285d0c8f8787df5a8a6d9dcfe823de65282a50873e06d0660b94bd3f0051a0bfd5e64f6fe6b809637782404646e55c0889a793fd9f70dd7b19ef43a70c

data/lib/fabrication/generator/base.rb

@@ -11,6 +11,9 @@ module Fabrication
         if callbacks[:initialize_with]
           build_instance_with_constructor_override(callbacks[:initialize_with])
         elsif callbacks[:on_init]
+          Fabrication::Support.log_deprecation(
+            'The on_init callback has been replaced by initialize_with. Please see the documentation for usage'
+          )
           build_instance_with_init_callback(callbacks[:on_init])
         else
           build_instance
@@ -19,18 +22,29 @@ module Fabrication
         _instance
       end
 
-      def create(attributes = [], callbacks = [])
+      def create(attributes = [], callbacks = {})
         build(attributes, callbacks)
-        execute_callbacks(callbacks[:before_validation])
-        execute_callbacks(callbacks[:after_validation])
-        execute_callbacks(callbacks[:before_save])
+        execute_deprecated_callbacks(callbacks, :before_validation, :before_create)
+        execute_deprecated_callbacks(callbacks, :after_validation, :before_create)
+        execute_deprecated_callbacks(callbacks, :before_save, :before_create)
         execute_callbacks(callbacks[:before_create])
         persist
         execute_callbacks(callbacks[:after_create])
-        execute_callbacks(callbacks[:after_save])
+        execute_deprecated_callbacks(callbacks, :after_save, :after_create)
         _instance
       end
 
+      def execute_deprecated_callbacks(callbacks, callback_type, replacement_callback)
+        if callbacks[callback_type]
+          Fabrication::Support.log_deprecation(
+            "Using #{callback_type} is deprecated but you can replace it " \
+            "with #{replacement_callback} with the same result."
+          )
+        end
+
+        execute_callbacks(callbacks[callback_type])
+      end
+
       def execute_callbacks(callbacks)
         callbacks&.each { |callback| _instance.instance_exec(_instance, _transient_attributes, &callback) }
       end
@@ -96,18 +110,21 @@ module Fabrication
 
       protected
 
-      attr_accessor :resolved_class, :_instance, :_transient_attributes
+      attr_accessor :resolved_class, :_instance
 
       def _attributes
         @_attributes ||= {}
       end
 
+      def _transient_attributes
+        @_transient_attributes ||= {}
+      end
+
       def persist
         _instance.save! if _instance.respond_to?(:save!)
       end
 
       def process_attributes(attributes)
-        self._transient_attributes = ({})
         attributes.each do |attribute|
           _attributes[attribute.name] = attribute.processed_value(_attributes)
           _transient_attributes[attribute.name] = _attributes[attribute.name] if attribute.transient?

data/lib/fabrication/generator/sequel.rb

@@ -11,14 +11,11 @@ module Fabrication
       end
 
       def set_attributes
-        _attributes.each do |key, value|
-          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) }
-            end
+        _attributes.each do |field_name, value|
+          if value.is_a?(Array) && (association = association_for(field_name))
+            set_association(association, field_name, value)
           else
-            _instance.send("#{key}=", value)
+            set_attribute(field_name, value)
           end
         end
       end
@@ -29,6 +26,21 @@ module Fabrication
 
       private
 
+      def association_for(field_name)
+        resolved_class.association_reflections[field_name]
+      end
+
+      def set_attribute(field_name, value)
+        _instance.send("#{field_name}=", value)
+      end
+
+      def set_association(association, field_name, value)
+        _instance.associations[field_name] = value
+        _instance.after_save_hook do
+          value.each { |o| _instance.send(association.add_method, o) }
+        end
+      end
+
       def load_instance_hooks
         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

data/lib/fabrication/schematic/manager.rb

@@ -59,7 +59,7 @@ module Fabrication
             if File.file?(path)
               load path
             else
-              Dir.glob(File.join(prefix.to_s, path, '**', '*.rb')).sort.each do |file|
+              Dir.glob(File.join(prefix.to_s, path, '**', '*.rb')).each do |file|
                 load file
               end
             end

data/lib/fabrication/sequencer.rb

@@ -22,7 +22,7 @@ module Fabrication
       else
         sequence_blocks[name] ||= ->(i) { i }
       end.call(idx).tap do
-        sequences[name] += 1
+        sequences[name] = idx.succ
       end
     end
 

data/lib/fabrication/support.rb

@@ -34,9 +34,9 @@ module Fabrication
       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 }
+        name_string
+          .gsub(%r{/(.?)}) { "::#{Regexp.last_match(1).upcase}" }
+          .gsub(/(?:^|_)(.)/) { Regexp.last_match(1).upcase }
       end
     end
 

data/lib/fabrication/version.rb

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

data/lib/fabrication.rb

@@ -51,7 +51,7 @@ module Fabrication
   end
 
   def self.schematics
-    Support.log_deprecation('Fabrication.schematics has been replaced by '\
+    Support.log_deprecation('Fabrication.schematics has been replaced by ' \
                             'Fabrication.manager and will be removed in 3.0.0.')
     manager
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.31.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -70,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Generates object instances for test suites, seed files, etc.