fabrication 2.28.0 → 3.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df854c441daf0accdb476682c98e8dcc2fab18fe239d182ccfe2946e16995921
-  data.tar.gz: d6cf1bfa72594c9255243643eed956f97af1fd976bb8768fe458410f54e4d1dd
+  metadata.gz: 20a02618a5107ba5850de6da2bd58ae428d33d8163ab3c71f9233574780998df
+  data.tar.gz: 33bac0b9d796da2d94adf3a8eb8940ff8766c36c9435429a03a1da0dd1efb8ad
 SHA512:
-  metadata.gz: 4783af273421b7799092a0bcc75c86a66d8f85f22a98d18354935010ccabc4a8fd32aa0eef5c814bab7257ff29cfef8db3e58160016d04a6f77b1480b92a80f9
-  data.tar.gz: 6fdec94bac094143b78d8135b56219c8e2faaa9136035fc1dcd309e0d7b44978991c12664ae422722debadb13ffe4c2396cde01e3e384c495d08d29fb869fa8b
+  metadata.gz: e0d2aa56f7153981b3be287dde1204a1050b964e5bdba14314d7f7cda4d7af7a4960cb2670bd2c58b7615768fdea84c4dbd15da2d1db95b5b4371e86091b336d
+  data.tar.gz: a182aecb4c3d38e36cd0e8f282dfd575b7234427a15e7f575cdbc84ca090848f162de9becc0989cef3baaa76c986a946c467b53adb937c5011932af774735b25

data/lib/fabricate.rb

@@ -1,14 +1,14 @@
 class Fabricate
   def self.times(count, name, overrides = {}, &block)
-    Array.new(count).map { Fabricate(name, overrides, &block) }
+    count.times.map { Fabricate(name, overrides, &block) }
   end
 
   def self.build_times(count, name, overrides = {}, &block)
-    Array.new(count).map { Fabricate.build(name, overrides, &block) }
+    count.times.map { Fabricate.build(name, overrides, &block) }
   end
 
   def self.attributes_for_times(count, name, overrides = {}, &block)
-    Array.new(count).map { Fabricate.attributes_for(name, overrides, &block) }
+    count.times.map { Fabricate.attributes_for(name, overrides, &block) }
   end
 
   def self.attributes_for(name, overrides = {}, &block)
@@ -24,19 +24,13 @@ class Fabricate
   def self.build(name, overrides = {}, &block)
     fail_if_initializing(name)
     schematic(name).build(overrides, &block).tap do |object|
-      Fabrication::Config.notifiers.each do |notifier|
-        notifier.call(name, object)
-      end
+      Fabrication::Cucumber::Fabrications[name] = object if Fabrication::Config.register_with_steps?
     end
   end
 
   def self.create(name, overrides = {}, &block)
     fail_if_initializing(name)
-    schematic(name).fabricate(overrides, &block).tap do |object|
-      Fabrication::Config.notifiers.each do |notifier|
-        notifier.call(name, object)
-      end
-    end
+    schematic(name).fabricate(overrides, &block)
   end
 
   def self.sequence(name = Fabrication::Sequencer::DEFAULT, start = nil, &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,11 +31,11 @@ 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
 
-    attr_writer :sequence_start
+    attr_writer :sequence_start, :register_with_steps
 
     def sequence_start
       @sequence_start ||= 0
@@ -50,6 +50,10 @@ module Fabrication
     end
     alias path_prefixes path_prefix
 
+    def register_with_steps?
+      @register_with_steps ||= nil
+    end
+
     def generators
       @generators ||= []
     end
@@ -65,24 +69,5 @@ 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 = {})
-        Array.new(count).map { make(attrs) }.tap { |o| remember(o) }
+        count.times.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_exec(_transient_attributes, &callback)
+        self._instance = instance_eval(&callback)
         set_attributes
       end
 
       def build_instance_with_init_callback(callback)
-        self._instance = _klass.new(*callback.call(_transient_attributes))
+        self._instance = _klass.new(*callback.call)
         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.key?(k) }
+        _attributes.reject! { |k| _transient_attributes.keys.include?(k) }
       end
     end
   end

data/lib/fabrication/generator/sequel.rb

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

data/lib/fabrication/schematic/definition.rb

@@ -3,7 +3,6 @@ module Fabrication
     class Definition
       GENERATORS = [
         Fabrication::Generator::ActiveRecord,
-        Fabrication::Generator::DataMapper,
         Fabrication::Generator::Sequel,
         Fabrication::Generator::Mongoid,
         Fabrication::Generator::Base
@@ -18,7 +17,7 @@ module Fabrication
       end
 
       def process_block(&block)
-        Fabrication::Schematic::Evaluator.new.process(self, &block) if block
+        Fabrication::Schematic::Evaluator.new.process(self, &block) if block_given?
       end
 
       def attribute(name)

data/lib/fabrication/schematic/manager.rb

@@ -55,16 +55,14 @@ module Fabrication
       def load_definitions
         preinitialize
         Fabrication::Config.path_prefixes.each do |prefix|
-          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
+          Fabrication::Config.fabricator_paths.each do |folder|
+            Dir.glob(File.join(prefix.to_s, folder, '**', '*.rb')).sort.each do |file|
+              load file
             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
+      if block_given?
         sequence_blocks[name] = block.to_proc
       else
         sequence_blocks[name] ||= ->(i) { i }

data/lib/fabrication/support.rb

@@ -40,20 +40,14 @@ module Fabrication
       end
 
       def variable_name_to_class_name(name)
-        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
+        name.to_s.gsub(%r{/(.?)}) do
+          "::#{Regexp.last_match(1).upcase}"
+        end.gsub(/(?:^|_)(.)/) { Regexp.last_match(1).upcase }
       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.28.0'.freeze
+  VERSION = '3.0.0.beta.1'.freeze
 end

data/lib/fabrication.rb

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

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

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

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

@@ -33,8 +33,6 @@ module Fabrication
         end
       rescue StandardError
         # no table? no problem!
-      rescue LoadError
-        # cannot find model file. This means it was already destroyed, so just continue.
       end
     end
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Paul Elliott
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies: []
 description: Fabrication is an object generation framework for ActiveRecord, Mongoid,
-  DataMapper, Sequel, or any other Ruby object.
+  Sequel, or any other Ruby object.
 email:
 - paul@codingfrontier.com
 executables: []
@@ -32,7 +32,6 @@ files:
 - lib/fabrication/errors/unknown_fabricator_error.rb
 - 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
@@ -54,14 +53,7 @@ files:
 homepage: http://fabricationgem.org
 licenses:
 - MIT
-metadata:
-  bug_tracker_uri: https://gitlab.com/fabrication-gem/fabrication/-/issues
-  changelog_uri: https://gitlab.com/fabrication-gem/fabrication/-/blob/master/Changelog.markdown
-  documentation_uri: https://fabricationgem.org
-  homepage_uri: https://fabricationgem.org
-  mailing_list_uri: https://groups.google.com/g/fabricationgem
-  rubygems_mfa_required: 'true'
-  source_code_uri: https://gitlab.com/fabrication-gem/fabrication
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -70,15 +62,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Generates object instances for test suites, seed files, etc.
+summary: Implementing the factory pattern in Ruby so you don't have to.
 test_files: []

data/lib/fabrication/generator/data_mapper.rb

@@ -1,19 +0,0 @@
-module Fabrication
-  module Generator
-    class DataMapper < Fabrication::Generator::Base
-      def self.supports?(klass)
-        defined?(::DataMapper) && klass.ancestors.include?(::DataMapper::Hook)
-      end
-
-      def build_instance
-        self._instance = _klass.new(_attributes)
-      end
-
-      protected
-
-      def persist
-        _instance.save
-      end
-    end
-  end
-end