fabrication 2.23.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af00199fb86206bfaecee18e88668f63446301f7bfff776831ad26a18c092187
-  data.tar.gz: b63b7eb25cf5e98f9051befe7ffdb2c994a07c149a32af93e4f48b183f17fdfe
+  metadata.gz: 1fa068a804c3a1374125c849657ee519ce7b08662ea994c3a9b357e1a74ce56c
+  data.tar.gz: 94031042eb41382a40aa39877abfadaa3664893e3d5c94946a1022a483b68d93
 SHA512:
-  metadata.gz: bfc49c073e8a19855863b5da27ff6c45aa45cd80eea134611b40174fb9c4ac2f9df6ee44e8dd3613001c7662a4e1ece7db0d2df78a8b025d647546d0f0fa137d
-  data.tar.gz: b8802428e05897ec7a0b6dc0a0a01f4d0c33437d5b3d4a895e116664e00fd7f79904143cfd9a6c8db4fb135d6f0c1c4c54754fb7b35fc47d7962209a1fe7eb6a
+  metadata.gz: d5ca378dd07da6affa590ba5a798e91d2261228af1d016066c6fb82e686f9a8d6fb397e5080ba819a26884e2d17479c408de0ae88e83607c8a57f54c997bd78c
+  data.tar.gz: 496347a6e1279a2a62c10e6b77e9e4a9a2fc5ab32b6654b62fdb2a330b33cb8fe8712a56059540694d16bb221ef1ef1131e2f982f76880b3e9eb6721dc5efa02

data/lib/fabricate.rb

@@ -1,14 +1,14 @@
 class Fabricate
   def self.times(count, name, overrides = {}, &block)
-    count.times.map { Fabricate(name, overrides, &block) }
+    Array.new(count).map { Fabricate(name, overrides, &block) }
   end
 
   def self.build_times(count, name, overrides = {}, &block)
-    count.times.map { Fabricate.build(name, overrides, &block) }
+    Array.new(count).map { Fabricate.build(name, overrides, &block) }
   end
 
   def self.attributes_for_times(count, name, overrides = {}, &block)
-    count.times.map { Fabricate.attributes_for(name, overrides, &block) }
+    Array.new(count).map { Fabricate.attributes_for(name, overrides, &block) }
   end
 
   def self.attributes_for(name, overrides = {}, &block)
@@ -24,13 +24,19 @@ class Fabricate
   def self.build(name, overrides = {}, &block)
     fail_if_initializing(name)
     schematic(name).build(overrides, &block).tap do |object|
-      Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
+      Fabrication::Config.notifiers.each do |notifier|
+        notifier.call(name, object)
+      end
     end
   end
 
   def self.create(name, overrides = {}, &block)
     fail_if_initializing(name)
-    schematic(name).fabricate(overrides, &block)
+    schematic(name).fabricate(overrides, &block).tap do |object|
+      Fabrication::Config.notifiers.each do |notifier|
+        notifier.call(name, object)
+      end
+    end
   end
 
   def self.sequence(name = Fabrication::Sequencer::DEFAULT, start = nil, &block)

data/lib/fabrication/config.rb

@@ -35,7 +35,7 @@ module Fabrication
       self.fabricator_path = folders
     end
 
-    attr_writer :sequence_start, :register_with_steps
+    attr_writer :sequence_start
 
     def sequence_start
       @sequence_start ||= 0
@@ -50,10 +50,6 @@ module Fabrication
     end
     alias path_prefixes path_prefix
 
-    def register_with_steps?
-      @register_with_steps ||= nil
-    end
-
     def generators
       @generators ||= []
     end
@@ -69,5 +65,24 @@ module Fabrication
     def recursion_limit=(limit)
       @recursion_limit = limit
     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'
+
+      return unless value
+
+      register_notifier do |name, object|
+        Fabrication::Cucumber::Fabrications[name] = object
+      end
+    end
+
+    def notifiers
+      @notifiers ||= []
+    end
+
+    def register_notifier(&block)
+      notifiers.push(block)
+    end
   end
 end

data/lib/fabrication/cucumber/step_fabricator.rb

@@ -20,7 +20,7 @@ module Fabrication
       end
 
       def n(count, attrs = {})
-        count.times.map { make(attrs) }.tap { |o| remember(o) }
+        Array.new(count).map { make(attrs) }.tap { |o| remember(o) }
       end
 
       # rubocop:disable Naming/PredicateName

data/lib/fabrication/generator/base.rb

@@ -54,12 +54,12 @@ module Fabrication
       end
 
       def build_instance_with_constructor_override(callback)
-        self._instance = instance_eval(&callback)
+        self._instance = instance_exec(_transient_attributes, &callback)
         set_attributes
       end
 
       def build_instance_with_init_callback(callback)
-        self._instance = _klass.new(*callback.call)
+        self._instance = _klass.new(*callback.call(_transient_attributes))
         set_attributes
       end
 
@@ -69,12 +69,8 @@ module Fabrication
       end
 
       def set_attributes
-        if _instance.respond_to?(:attributes=)
-          _instance.attributes = _attributes
-        else
-          _attributes.each do |k, v|
-            _instance.send("#{k}=", v)
-          end
+        _attributes.each do |k, v|
+          _instance.send("#{k}=", v)
         end
       end
 
@@ -108,7 +104,7 @@ module Fabrication
           _attributes[attribute.name] = attribute.processed_value(_attributes)
           _transient_attributes[attribute.name] = _attributes[attribute.name] if attribute.transient?
         end
-        _attributes.reject! { |k| _transient_attributes.keys.include?(k) }
+        _attributes.reject! { |k| _transient_attributes.key?(k) }
       end
     end
   end

data/lib/fabrication/generator/mongoid.rb

@@ -0,0 +1,17 @@
+module Fabrication
+  module Generator
+    class Mongoid < Fabrication::Generator::Base
+      def self.supports?(klass)
+        defined?(::Mongoid) && klass.ancestors.include?(::Mongoid::Document)
+      end
+
+      def build_instance
+        self._instance = if _klass.respond_to?(:protected_attributes)
+                           _klass.new(_attributes, without_protection: true)
+                         else
+                           _klass.new(_attributes)
+                         end
+      end
+    end
+  end
+end

data/lib/fabrication/schematic/definition.rb

@@ -5,6 +5,7 @@ module Fabrication
         Fabrication::Generator::ActiveRecord,
         Fabrication::Generator::DataMapper,
         Fabrication::Generator::Sequel,
+        Fabrication::Generator::Mongoid,
         Fabrication::Generator::Base
       ].freeze
 
@@ -17,7 +18,7 @@ module Fabrication
       end
 
       def process_block(&block)
-        Fabrication::Schematic::Evaluator.new.process(self, &block) if block_given?
+        Fabrication::Schematic::Evaluator.new.process(self, &block) if block
       end
 
       def attribute(name)

data/lib/fabrication/schematic/manager.rb

@@ -55,14 +55,16 @@ module Fabrication
       def load_definitions
         preinitialize
         Fabrication::Config.path_prefixes.each do |prefix|
-          Fabrication::Config.fabricator_paths.each do |folder|
-            Dir.glob(File.join(prefix.to_s, folder, '**', '*.rb')).sort.each do |file|
-              load file
+          Fabrication::Config.fabricator_paths.each do |path|
+            if File.file?(path)
+              load path
+            else
+              Dir.glob(File.join(prefix.to_s, path, '**', '*.rb')).sort.each do |file|
+                load file
+              end
             end
           end
         end
-      rescue StandardError => e
-        raise e
       ensure
         freeze
       end

data/lib/fabrication/sequencer.rb

@@ -4,7 +4,7 @@ module Fabrication
 
     def self.sequence(name = DEFAULT, start = nil, &block)
       idx = sequences[name] ||= start || Fabrication::Config.sequence_start
-      if block_given?
+      if block
         sequence_blocks[name] = block.to_proc
       else
         sequence_blocks[name] ||= ->(i) { i }

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.23.0'.freeze
+  VERSION = '2.26.0'.freeze
 end

data/lib/fabrication.rb

@@ -33,6 +33,7 @@ module Fabrication
     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'
     autoload :Base,          'fabrication/generator/base'
   end
@@ -63,9 +64,7 @@ def Fabricator(name, options = {}, &block)
 end
 
 def Fabricate(name, overrides = {}, &block)
-  Fabricate.create(name, overrides, &block).tap do |object|
-    Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
-  end
+  Fabricate.create(name, overrides, &block)
 end
 # rubocop:enable Naming/MethodName
 

data/lib/rails/generators/fabrication/cucumber_steps/templates/fabrication_steps.rb

@@ -1,6 +1,8 @@
 World(FabricationMethods)
 
-Fabrication::Config.register_with_steps = true
+Fabrication::Config.register_notifier do |name, object|
+  Fabrication::Cucumber::Fabrications[name] = object
+end
 
 def with_ivars(fabricator)
   @they = yield fabricator

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -33,6 +33,7 @@ files:
 - lib/fabrication/generator/active_record.rb
 - lib/fabrication/generator/base.rb
 - lib/fabrication/generator/data_mapper.rb
+- lib/fabrication/generator/mongoid.rb
 - lib/fabrication/generator/sequel.rb
 - lib/fabrication/railtie.rb
 - lib/fabrication/schematic/attribute.rb
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Implementing the factory pattern in Ruby so you don't have to.