factory_bot_rails 5.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb1373ed349326df96513782505d2e7e19171d063633723785fa8b19d004334e
-  data.tar.gz: 85afaa7e96c4196ac2104b8d7937b55840e53ec18752809b885f23fb3b9d3a7f
+  metadata.gz: c54ddb791dcf6eccf0e7ffe73cad7294a72b7d84a7c9b1c8be1b858e6ff0f209
+  data.tar.gz: 5c5b2bd9f09413c8a2cbbf5bba8c46f927c717de9caa798f3dd161cc464961cf
 SHA512:
-  metadata.gz: 7fc069195491977c8a878d8368db76a25cd3085f767fb1275de049a3a4d5acd88d68c5684b8d5c0d935a5d720ddaaf393d4304147ae357c4a0488c16009a9b4a
-  data.tar.gz: 884ac558b9f118f6883b09241e58d08b42fdb85d6f18c3ade81699caad2769c43e47384da9e43219e1f5956b0a57e91899800d6c4bebc45cf751bb4007f305c9
+  metadata.gz: 7fa8bcf45b0a9ac5bf032676109d341b7ec773479f53e71e3606a39b52a307b60c49d31ada524f25e77822a97724849a475afb5da0fffcefe7a91bb23d01f5cf
+  data.tar.gz: 7c78b5c2c241080b9bdbc59f402cb68034df1efe26ede947cc620118b67389272c14f063442946a1f5ea28c64204c273791c276c7b3c363b4cfa3b253bfdf611

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Joe Ferris and thoughtbot, inc.
+Copyright (c) 2008-2020 Joe Ferris and thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -0,0 +1,88 @@
+factory\_bot\_rails versioning is synced with factory\_bot releases. For this reason
+there might not be any notable changes in new versions of this project.
+
+# NEWS
+
+## 6.1.0 (July 8, 2020)
+
+* Changed: factory\_bot dependency to ~> 6.1.0
+
+## 6.0.0 (June 18, 2020)
+
+* Fixed: generate a plural factory name when the --force-plural flag is provided
+* Changed: factory\_bot dependency to ~> 6.0.0
+* Removed: `"factory_bot.register_reloader"` initializer, now registering the
+  reloader after application initialization
+* Removed: support for EOL versions of Ruby (2.3, 2.4) and Rails (4.2)
+
+## 5.1.1 (September 24, 2019)
+
+* Fixed: Ensure definitions do not load before I18n is initialized
+
+## 5.1.0 (September 24, 2019)
+
+* Changed: factory\_bot dependency to ~> 5.1.0
+
+## 5.0.2 (April 14, 2019)
+
+* Bugfix: Reload factory\_bot whenever the application changes to avoid holding
+  onto stale object references
+* Bugfix: Avoid watching project root when no factory definitions exist
+
+## 5.0.1 (February 9, 2019)
+
+* Bugfix: Avoid watching files and directories that don't exist (to avoid a
+  file watching bug in Rails https://github.com/rails/rails/issues/32700)
+
+## 5.0.0 (February 1, 2019)
+
+* Added: calling reload! in the Rails console will reload any factory definition files that have changed
+* Added: support for custom generator templates
+* Added: `definition_file_paths` configuration option, making it easier to place factories in custom locations
+* Changed: namespaced models are now generated inside a directory matching the namespace
+* Changed: added newline between factories generated into the same file
+* Removed: support for EOL version of Ruby and Rails
+
+## 4.11.1 (September 7, 2018)
+
+* Update generator to use dynamic attributes instead of deprecated static attributes
+
+## 4.11.0 (August 16, 2018)
+
+* No notable changes
+
+## 4.10.0 (May 25, 2018)
+
+* No notable changes
+
+## 4.8.2 (October 20, 2017)
+
+* Rename factory\_girl\_rails to factory\_bot\_rails
+
+## 4.7.0 (April 1, 2016)
+
+* No notable changes
+
+## 4.6.0 (February 1, 2016)
+
+* No notable changes
+
+## 4.5.0 (October 17, 2014)
+
+* Improved README
+
+## 4.4.1 (February 26, 2014)
+
+* Support Spring
+
+## 4.2.1 (February 8, 2013)
+
+* Fix bug when configuring FG and RSpec fixture directory
+* Remove debugging
+* Require factory\_girl\_rails explicitly in generator
+
+## 4.2.0 (January 25, 2013)
+
+* Add appraisal and get test suite working reliably with turn gem
+* Support MiniTest
+* Allow a custom directory for factories to be specified

data/README.md

@@ -1,4 +1,4 @@
-# factory_bot_rails [![Build Status][ci-image]][ci] [![Code Climate][grade-image]][grade] [![Gem Version][version-image]][version] [![Reviewed by Hound][hound-image]][hound]
+# factory_bot_rails [![Build Status][ci-image]][ci] [![Code Climate][grade-image]][grade] [![Gem Version][version-image]][version]
 
 [factory_bot][fb] is a fixtures replacement with a straightforward definition
 syntax, support for multiple build strategies (saved instances, unsaved
@@ -66,9 +66,14 @@ This will cause factory\_bot\_rails to automatically load factories in
 It is possible to use this setting to share factories from a gem:
 
 ```rb
+begin
+  require 'factory_bot_rails'
+rescue LoadError
+end
+
 class MyEngine < ::Rails::Engine
-  config.factory_bot.definition_file_paths =
-    File.expand_path('../factories', __FILE__) if defined?(FactoryBotRails)
+  config.factory_bot.definition_file_paths +=
+    [File.expand_path('../factories', __FILE__)] if defined?(FactoryBotRails)
 end
 ```
 
@@ -109,7 +114,7 @@ end
 ```
 
 Note that factory\_bot\_rails will not automatically load files in custom
-locations unless you add them to `config.factory_bot.defintion_file_paths` as
+locations unless you add them to `config.factory_bot.definition_file_paths` as
 well.
 
 The suffix option allows you to customize the name of the generated file with a
@@ -145,19 +150,18 @@ generating all of your factories in `test/factories.rb` or `spec/factories.rb`.
 
 Please see [CONTRIBUTING.md](CONTRIBUTING.md).
 
-factory_bot_rails was originally written by Joe Ferris and is now maintained by Josh
-Clayton. Many improvements and bugfixes were contributed by the [open source
+factory_bot_rails was originally written by Joe Ferris and is maintained by thoughtbot. Many improvements and bugfixes were contributed by the [open source
 community](https://github.com/thoughtbot/factory_bot_rails/graphs/contributors).
 
 ## License
 
-factory_bot_rails is Copyright © 2008-2016 Joe Ferris and thoughtbot. It is free
+factory_bot_rails is Copyright © 2008-2020 Joe Ferris and thoughtbot. It is free
 software, and may be redistributed under the terms specified in the
 [LICENSE](LICENSE) file.
 
 ## About thoughtbot
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](https://thoughtbot.com/brand_assets/93:44.svg)
 
 factory_bot_rails is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

data/lib/factory_bot_rails/definition_file_paths.rb

@@ -2,8 +2,6 @@
 
 module FactoryBotRails
   class DefinitionFilePaths
-    attr_reader :files, :directories
-
     def initialize(definition_file_paths)
       @files = []
       @directories = {}
@@ -13,5 +11,17 @@ module FactoryBotRails
         @directories[path.to_s] = [:rb]
       end
     end
+
+    def directories
+      @directories.select { |path| Dir.exist?(path) }
+    end
+
+    def files
+      @files.select { |file| File.exist?(file) }
+    end
+
+    def any?
+      directories.any? || files.any?
+    end
   end
 end

data/lib/factory_bot_rails/generators/non_rspec_generator.rb

@@ -9,7 +9,7 @@ module FactoryBotRails
         @generators.test_framework(
           test_framework,
           fixture: false,
-          fixture_replacement: :factory_bot,
+          fixture_replacement: :factory_bot
         )
       end
 

data/lib/factory_bot_rails/generators/rspec_generator.rb

@@ -8,7 +8,7 @@ module FactoryBotRails
       def run
         @generators.fixture_replacement(
           fixture_replacement_setting,
-          dir: factory_bot_directory,
+          dir: factory_bot_directory
         )
       end
 

data/lib/factory_bot_rails/railtie.rb

@@ -18,12 +18,9 @@ module FactoryBotRails
       FactoryBot.definition_file_paths = definition_file_paths
     end
 
-    initializer "factory_bot.register_reloader" do |app|
-      Reloader.new(app, config).run
-    end
-
-    config.after_initialize do
+    config.after_initialize do |app|
       FactoryBot.find_definitions
+      Reloader.new(app).run
     end
 
     private

data/lib/factory_bot_rails/reloader.rb

@@ -4,23 +4,23 @@ require "factory_bot_rails/definition_file_paths"
 
 module FactoryBotRails
   class Reloader
-    def initialize(app, config)
+    def initialize(app)
       @app = app
-      @config = config
+      @paths = DefinitionFilePaths.new(FactoryBot.definition_file_paths)
     end
 
     def run
+      return unless @paths.any?
+
       register_reloader(build_reloader)
     end
 
     private
 
-    attr_reader :app, :config
+    attr_reader :app
 
     def build_reloader
-      paths = DefinitionFilePaths.new(FactoryBot.definition_file_paths)
-
-      reloader_class.new(paths.files, paths.directories) do
+      reloader_class.new(@paths.files, @paths.directories) do
         FactoryBot.reload
       end
     end
@@ -30,8 +30,8 @@ module FactoryBotRails
     end
 
     def register_reloader(reloader)
-      config.to_prepare do
-        reloader.execute_if_updated
+      app.reloader.to_prepare do
+        reloader.execute
       end
 
       app.reloaders << reloader

data/lib/generators/factory_bot.rb

@@ -8,14 +8,18 @@ module FactoryBot
           File.dirname(__FILE__),
           "factory_bot",
           generator_name,
-          "templates",
+          "templates"
         )
 
         File.expand_path(path)
       end
 
+      def factory_name
+        class_name.gsub("::", "").underscore
+      end
+
       def explicit_class_option
-        return if class_name == singular_table_name.camelize
+        return if class_name.underscore == factory_name
 
         ", class: '#{class_name}'"
       end

data/lib/generators/factory_bot/model/model_generator.rb

@@ -8,21 +8,21 @@ module FactoryBot
         :attributes,
         type: :array,
         default: [],
-        banner: "field:type field:type",
+        banner: "field:type field:type"
       )
 
       class_option(
         :dir,
         type: :string,
         default: "test/factories",
-        desc: "The directory or file root where factories belong",
+        desc: "The directory or file root where factories belong"
       )
 
       class_option(
         :suffix,
         type: :string,
         default: nil,
-        desc: "Suffix to add factory file",
+        desc: "Suffix to add factory file"
       )
 
       def create_fixture_file
@@ -43,7 +43,7 @@ module FactoryBot
         insert_into_file(
           factories_file,
           factory_definition,
-          after: "FactoryBot.define do\n",
+          after: "FactoryBot.define do\n"
         )
       end
 
@@ -54,17 +54,17 @@ module FactoryBot
 
       def factory_definition
         <<~RUBY
-            factory :#{singular_table_name}#{explicit_class_option} do
-          #{factory_attributes.gsub(/^/, '    ')}
+            factory :#{factory_name}#{explicit_class_option} do
+          #{factory_attributes.gsub(/^/, "    ")}
             end
 
         RUBY
       end
 
       def factory_attributes
-        attributes.map do |attribute|
+        attributes.map { |attribute|
           "#{attribute.name} { #{attribute.default.inspect} }"
-        end.join("\n")
+        }.join("\n")
       end
 
       def filename

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot_rails
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -16,30 +16,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.0.0
 description: factory_bot_rails provides integration between factory_bot and rails
-  4.2 or newer
+  5.0 or newer
 email: jferris@thoughtbot.com
 executables: []
 extensions: []
@@ -47,7 +47,7 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING.md
 - LICENSE
-- NEWS
+- NEWS.md
 - README.md
 - lib/factory_bot_rails.rb
 - lib/factory_bot_rails/definition_file_paths.rb
@@ -79,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: factory_bot_rails provides integration between factory_bot and rails 4.2
+summary: factory_bot_rails provides integration between factory_bot and rails 5.0
   or newer
 test_files: []

data/NEWS

@@ -1,44 +0,0 @@
-factory_bot_rails versioning is synced with factory_bot releases. For this reason
-there might not be any notable changes in new versions of this project.
-
-5.0.0
-  Added: calling reload! in the Rails console will reload any factory definition files that have changed
-  Added: support for custom generator templates
-  Added: definition_file_paths configuration option, making it easier to place factories in custom locations
-  Changed: namespaced models are now generated inside a directory matching the namespace
-  Changed: added newline between factories generated into the same file
-  Removed: support for EOL version of Ruby and Rails
-
-4.11.1 (September 7, 2018)
-  Update generator to use dynamic attributes instead of deprecated static attributes
-
-4.11.0 (August 16, 2018)
-  No notable changes
-
-4.10.0 (May 25, 2018)
-  No notable changes
-
-4.8.2 (October 20, 2017)
-  Rename factory_girl_rails to factory_bot_rails
-
-4.7.0 (April 1, 2016)
-  No notable changes
-
-4.6.0 (February 1, 2016)
-  No notable changes
-
-4.5.0 (October 17, 2014)
-  Improved README
-
-4.4.1 (February 26, 2014)
-  Support Spring
-
-4.2.1 (February 8, 2013)
-  Fix bug when configuring FG and RSpec fixture directory
-  Remove debugging
-  Require factory_girl_rails explicitly in generator
-
-4.2.0 (January 25, 2013)
-  Add appraisal and get test suite working reliably with turn gem
-  Support MiniTest
-  Allow a custom directory for factories to be specified