fabrication 2.22.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5efca9d24fec1fce10f12981c38be52e1f848d180d0a6a3d8d873edeba23a5f
-  data.tar.gz: 9809d319c49147c4a6bc112035692083fc3ce7900b3c46c9c6caf79bbd6fb019
+  metadata.gz: 25bf46c387fd321a6b7fb9f35b7a67862ced410dd318ad2c29a0bca8dd61479b
+  data.tar.gz: 367a2d9d5bc7213443a4de423447c99f9141e92c47fecc5ea0092df2b7821dbe
 SHA512:
-  metadata.gz: 982151a8ccffa983acc0c73ccac23e289849d3171d87d8c2bb7eefe3f5b9e2bd3dceb6074d7ca7a0fa41b5ec371f6b1732acf5579c0dc0c7fa9b1a8171f7e50e
-  data.tar.gz: fa154309b92888850eb7c744741046c2b27dcf6cd358a9a0dbdd4f96d31d0d72e5f25637231d453457380fec2b29fe198fef03501d84d19cdd968d535165e364
+  metadata.gz: 3ad4fc489704de95e48fd156f043ef22638d5e910e1d684db9e09798e9eb2064003056616cfbd08ec944aab4e024ad65f6bdca6d993e6f5a04aaa395bb48cf2c
+  data.tar.gz: 2f1cbf6bc060c00578234773534148eac605271f32e08b636aa873e232bc532da3e531c301830577dd1a2842a9592d4976485226d6804296110fea358a923c01

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)

data/lib/fabrication/config.rb

@@ -21,7 +21,7 @@ module Fabrication
 
     def fabricator_dir
       puts 'DEPRECATION WARNING: Fabrication::Config.fabricator_dir has been ' \
-        'replaced by Fabrication::Config.fabricator_path'
+           'replaced by Fabrication::Config.fabricator_path'
       fabricator_path
     end
 
@@ -31,7 +31,7 @@ module Fabrication
 
     def fabricator_dir=(folders)
       puts 'DEPRECATION WARNING: Fabrication::Config.fabricator_dir has been ' \
-        'replaced by Fabrication::Config.fabricator_path'
+           'replaced by Fabrication::Config.fabricator_path'
       self.fabricator_path = folders
     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/active_record.rb

@@ -6,8 +6,8 @@ module Fabrication
         # so we can't assume because we have the ActiveRecord module that we also
         # have ActiveRecord::Base. Because defined? can return nil we ensure that nil
         # becomes false.
-        defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
-          klass.ancestors.include?(::ActiveRecord::Base) || false
+        (defined?(::ActiveRecord) && defined?(::ActiveRecord::Base) &&
+          klass.ancestors.include?(::ActiveRecord::Base)) || false
       end
 
       def build_instance

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
 
@@ -104,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/sequel.rb

@@ -7,7 +7,7 @@ module Fabrication
       end
 
       def self.supports?(klass)
-        defined?(::Sequel) && klass.ancestors.include?(::Sequel::Model)
+        defined?(::Sequel) && defined?(::Sequel::Model) && klass.ancestors.include?(::Sequel::Model)
       end
 
       def set_attributes

data/lib/fabrication/schematic/definition.rb

@@ -18,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/support.rb

@@ -40,14 +40,20 @@ module Fabrication
       end
 
       def variable_name_to_class_name(name)
-        name.to_s.gsub(%r{/(.?)}) do
-          "::#{Regexp.last_match(1).upcase}"
-        end.gsub(/(?:^|_)(.)/) { Regexp.last_match(1).upcase }
+        name_string = name.to_s
+
+        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 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.'
+             'by Fabrication.manager.load_definitions and will be removed in 3.0.0.'
         Fabrication.manager.load_definitions
       end
 

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.22.0'.freeze
+  VERSION = '2.25.0'.freeze
 end

data/lib/fabrication.rb

@@ -53,7 +53,7 @@ module Fabrication
 
   def self.schematics
     puts 'DEPRECATION WARNING: Fabrication.schematics has been replaced by '\
-      'Fabrication.manager and will be removed in 3.0.0.'
+         'Fabrication.manager and will be removed in 3.0.0.'
     manager
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Paul Elliott
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
   DataMapper, Sequel, or any other Ruby object.
@@ -63,14 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Implementing the factory pattern in Ruby so you don't have to.