factory_bot_rails 4.10.0 → 6.1.0

data/lib/factory_bot_rails/reloader.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "factory_bot_rails/definition_file_paths"
+
+module FactoryBotRails
+  class Reloader
+    def initialize(app)
+      @app = app
+      @paths = DefinitionFilePaths.new(FactoryBot.definition_file_paths)
+    end
+
+    def run
+      return unless @paths.any?
+
+      register_reloader(build_reloader)
+    end
+
+    private
+
+    attr_reader :app
+
+    def build_reloader
+      reloader_class.new(@paths.files, @paths.directories) do
+        FactoryBot.reload
+      end
+    end
+
+    def reloader_class
+      app.config.file_watcher
+    end
+
+    def register_reloader(reloader)
+      app.reloader.to_prepare do
+        reloader.execute
+      end
+
+      app.reloaders << reloader
+    end
+  end
+end

data/lib/generators/factory_bot.rb

@@ -1,14 +1,27 @@
-require 'rails/generators/named_base'
+require "rails/generators/named_base"
 
 module FactoryBot
   module Generators
     class Base < Rails::Generators::NamedBase #:nodoc:
       def self.source_root
-        @_factory_bot_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'factory_bot', generator_name, 'templates'))
+        path = File.join(
+          File.dirname(__FILE__),
+          "factory_bot",
+          generator_name,
+          "templates"
+        )
+
+        File.expand_path(path)
+      end
+
+      def factory_name
+        class_name.gsub("::", "").underscore
       end
 
       def explicit_class_option
-        ", class: '#{class_name}'" unless class_name == singular_table_name.camelize
+        return if class_name.underscore == factory_name
+
+        ", class: '#{class_name}'"
       end
     end
   end

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

@@ -1,5 +1,5 @@
-require 'generators/factory_bot'
-require 'factory_bot_rails'
+require "generators/factory_bot"
+require "factory_bot_rails"
 
 module FactoryBot
   module Generators
@@ -49,36 +49,30 @@ module FactoryBot
 
       def create_factory_file
         file = File.join(options[:dir], "#{filename}.rb")
-        create_file(file, single_file_factory_definition)
+        template "factories.erb", file
       end
 
       def factory_definition
-<<-RUBY
-  factory :#{singular_table_name}#{explicit_class_option} do
-#{factory_attributes.gsub(/^/, "    ")}
-  end
-RUBY
-      end
+        <<~RUBY
+            factory :#{factory_name}#{explicit_class_option} do
+          #{factory_attributes.gsub(/^/, "    ")}
+            end
 
-      def single_file_factory_definition
-<<-RUBY
-FactoryBot.define do
-#{factory_definition.chomp}
-end
-RUBY
+        RUBY
       end
 
       def factory_attributes
-        attributes.map do |attribute|
-          "#{attribute.name} #{attribute.default.inspect}"
-        end.join("\n")
+        attributes.map { |attribute|
+          "#{attribute.name} { #{attribute.default.inspect} }"
+        }.join("\n")
       end
 
       def filename
         if factory_bot_options[:filename_proc].present?
           factory_bot_options[:filename_proc].call(table_name)
         else
-          [table_name, filename_suffix].compact.join('_')
+          name = File.join(class_path, plural_name)
+          [name, filename_suffix].compact.join("_")
         end
       end
 
@@ -91,8 +85,7 @@ RUBY
       end
 
       def generators
-        config = FactoryBot::Railtie.config
-        config.respond_to?(:app_generators) ? config.app_generators : config.generators
+        FactoryBotRails::Railtie.config.app_generators
       end
     end
   end

data/lib/generators/factory_bot/model/templates/factories.erb

@@ -0,0 +1,3 @@
+FactoryBot.define do
+<%= factory_definition.rstrip %>
+end

metadata

@@ -1,86 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot_rails
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Joe Ferris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.10.0
-description: |-
-  factory_bot_rails provides integration between
-      factory_bot and rails 3 or newer (currently just automatic factory definition
-      loading)
+        version: 5.0.0
+description: factory_bot_rails provides integration between factory_bot and rails
+  5.0 or newer
 email: jferris@thoughtbot.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Appraisals
 - CONTRIBUTING.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- NEWS
+- NEWS.md
 - README.md
-- Rakefile
-- bin/setup
-- factory_bot_rails.gemspec
-- factory_girl_rails.gemspec
-- features/fixture_replacement_config.feature
-- features/generators.feature
-- features/load_definitions.feature
-- features/step_definitions/appraisal.rb
-- features/step_definitions/rails_steps.rb
-- features/support/env.rb
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.1.gemfile.lock
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails4.2.gemfile.lock
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.0.gemfile.lock
 - lib/factory_bot_rails.rb
+- lib/factory_bot_rails/definition_file_paths.rb
 - lib/factory_bot_rails/generator.rb
 - lib/factory_bot_rails/generators/non_rspec_generator.rb
 - lib/factory_bot_rails/generators/null_generator.rb
 - lib/factory_bot_rails/generators/rspec_generator.rb
 - lib/factory_bot_rails/railtie.rb
+- lib/factory_bot_rails/reloader.rb
 - lib/generators/factory_bot.rb
 - lib/generators/factory_bot/model/model_generator.rb
-homepage: http://github.com/thoughtbot/factory_bot_rails
+- lib/generators/factory_bot/model/templates/factories.erb
+homepage: https://github.com/thoughtbot/factory_bot_rails
 licenses:
 - MIT
 metadata: {}
@@ -99,10 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: factory_bot_rails provides integration between factory_bot and rails 3 or
-  newer
+summary: factory_bot_rails provides integration between factory_bot and rails 5.0
+  or newer
 test_files: []

data/Appraisals

@@ -1,21 +0,0 @@
-# These are the versions of Rails we want to test against.
-appraise 'rails3.2' do
-  gem 'rails', '~> 3.2.21'
-  gem 'sass-rails'
-end
-
-appraise 'rails4.1' do
-  gem 'rails', '~> 4.1.9'
-  gem 'sass-rails'
-  gem 'spring'
-end
-
-appraise 'rails4.2' do
-  gem 'rails', '~> 4.2.0'
-end
-
-appraise "rails5.0" do
-  gem "activerecord", "~> 5.0.0"
-  gem "railties", "~> 5.0.0"
-  gem "rspec-rails", "~> 3.5.0.beta4"
-end

data/Gemfile

@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec name: 'factory_bot_rails'
-
-gem 'appraisal'
-gem 'aruba'
-gem 'coffee-rails'
-gem 'cucumber', '1.3.19'
-gem 'jquery-rails'
-gem 'rake'
-gem 'rspec-rails'
-gem 'uglifier'
-gem 'test-unit'
-
-gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-gem 'jdbc-sqlite3', platforms: :jruby
-gem 'therubyrhino', platforms: :jruby
-gem 'jruby-openssl', platforms: :jruby
-
-gem 'sqlite3', platforms: :ruby

data/Gemfile.lock

@@ -1,144 +0,0 @@
-PATH
-  remote: .
-  specs:
-    factory_bot_rails (4.10.0)
-      factory_bot (~> 4.10.0)
-      railties (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.15)
-      activerecord (>= 2.2)
-    activerecord-jdbcsqlite3-adapter (1.3.15)
-      activerecord-jdbc-adapter (~> 1.3.15)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    appraisal (1.0.3)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (5.0.1.20140414130214)
-    aruba (0.5.4)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    builder (3.2.2)
-    childprocess (0.5.3)
-      ffi (~> 1.0, >= 1.0.11)
-    coffee-rails (4.0.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.7.0)
-    cucumber (1.3.19)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    execjs (2.0.2)
-    factory_bot (4.10.0)
-      activesupport (>= 3.0.0)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    gherkin (2.12.2-java)
-      multi_json (~> 1.3)
-    i18n (0.7.0)
-    jdbc-sqlite3 (3.8.7)
-    jquery-rails (3.1.0)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jruby-openssl (0.9.6-java)
-    json (1.8.6)
-    json (1.8.6-java)
-    minitest (5.9.0)
-    multi_json (1.11.2)
-    multi_test (0.1.2)
-    power_assert (0.2.3)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    sqlite3 (1.3.9)
-    test-unit (3.0.9)
-      power_assert
-    therubyrhino (2.0.4)
-      therubyrhino_jar (>= 1.7.3)
-    therubyrhino_jar (1.7.4)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (2.5.0)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter
-  appraisal
-  aruba
-  coffee-rails
-  cucumber (= 1.3.19)
-  factory_bot_rails!
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  rake
-  rspec-rails
-  sqlite3
-  test-unit
-  therubyrhino
-  uglifier
-
-BUNDLED WITH
-   1.16.1