factory_bot_instrumentation 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fad506387bc8c52339b3868ba4026a436bb3b4602747eabd30dcf3f41ecd855
-  data.tar.gz: a6c8adffc73924cbea80296c721ed264ba9378bba8f7bee7a1ec296871f17b79
+  metadata.gz: df9495f96882f162c18ca1c8467d09c34d8dc40981ed1a7ba541a7d5200867a9
+  data.tar.gz: 2ae4e05a4dbd3e729d56ffbfeafb2c14aeef6b6a8e825a6b94023bb6fa379823
 SHA512:
-  metadata.gz: 24790a2a645d22cc50edefb2ee19c3215cfd173ac88bf3bced467a1b71ec73a984ae28e88e57d09f6ff938266c38d89262dfec1596a55516b74449e6e6de0437
-  data.tar.gz: 741ac435c5ed84bcc622ac327598be7b37e1b98757772ee189eb5f01446ae766ee8b443380dbc97767d240b6ba329416d988f6d8dd1e1a8420b7ea83345a598f
+  metadata.gz: c598dcbc2cf1cfc4f7e7c6d9a1e0389f7c9583e9208ae008db35cf320ba740232a9038fb6c00b92b06d95ca5483fee5663b88e70b39c6e7371624494d337f21f
+  data.tar.gz: dd88ab7d48335f79c874005ea50ee76a6878af89cc3ebbb5333ade70059f084654c20ae83a2200d1d6c2730ced8e58859a4358c8934703f19fa2dfe5f29e766b

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 1.0.2
+
+* When used in combination with the `factory_bot_rails` gem (>= 6.0) we do not
+  force a `FactoryBot.reload` at Rails engine initialization as it breaks with
+  an `FactoryBot::DuplicateDefinitionError` (#14)
+
+### 1.0.1
+
+* Added a retry logic to the FactoryBot reloading on the POST/create endpoint
+  in order to handle parallel requests properly (#13)
+
 ### 1.0.0
 
 * Bundler >= 2.3 is from now on required as minimal version (#12)

data/app/controllers/factory_bot/instrumentation/root_controller.rb

@@ -37,8 +37,11 @@ module FactoryBot
       #
       # The result is the API v1 representation of the created entity.
       def create
-        # Reload the factories to improve the test development experience
-        FactoryBot.reload
+        # Reload the factories to improve the test development experience.
+        # In parallel request conditions this may lead to +Factory already
+        # registered+ errors as this call is not thread safe as it seems,
+        # so we retry it multiple times.
+        with_retries(max_tries: 15) { FactoryBot.reload }
         # Call the factory construction with the user given parameters
         entity = FactoryBot.create(*factory_params)
         # Render the resulting entity with the configured rendering block

data/factory_bot_instrumentation.gemspec

@@ -35,10 +35,12 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'factory_bot', '~> 6.2'
   spec.add_runtime_dependency 'rails', '>= 5.2'
+  spec.add_runtime_dependency 'retries', '>= 0.0.5'
 
   spec.add_development_dependency 'appraisal', '~> 2.4'
   spec.add_development_dependency 'bundler', '~> 2.3'
   spec.add_development_dependency 'countless', '~> 1.1'
+  spec.add_development_dependency 'factory_bot_rails', '~> 6.2'
   spec.add_development_dependency 'guard-rspec', '~> 4.7'
   spec.add_development_dependency 'railties', '>= 5.2'
   spec.add_development_dependency 'rspec-rails', '~> 5.1'

data/lib/factory_bot/instrumentation/engine.rb

@@ -7,11 +7,16 @@ module FactoryBot
       isolate_namespace FactoryBot::Instrumentation
 
       # Fill in some dynamic settings (application related)
-      initializer 'factory_bot_instrumentation.config' do
-        # Ensure the FactoryBot gem loads its factories to ensure they are
-        # also available in the rails console and other places in the app
-        # and not only via instrumentation frontend.
-        FactoryBot.reload
+      initializer 'factory_bot_instrumentation.config' do |app|
+        # Ensure the FactoryBot gem loads its factories to ensure they are also
+        # available in the rails console and other places in the app and not
+        # only via instrumentation frontend. We skip this step as in
+        # combination with the +factory_bot_rails+ gem (>=6.0) the FactoryBot
+        # initializing occurs after the Rails application initializing, which
+        # leads to +FactoryBot::DuplicateDefinitionError+s.
+        initializer_names = app.initializers.map(&:name).map(&:to_s)
+        FactoryBot.reload \
+          if initializer_names.grep(/^factory_bot\./).count.zero?
 
         FactoryBot::Instrumentation.configure do |conf|
           # Set the application name dynamically

data/lib/factory_bot/instrumentation/version.rb

@@ -4,7 +4,7 @@ module FactoryBot
   # The gem version details.
   module Instrumentation
     # The version of the +factory_bot_instrumentation+ gem
-    VERSION = '1.0.0'
+    VERSION = '1.0.2'
 
     class << self
       # Returns the version of gem as a string.

data/lib/factory_bot_instrumentation.rb

@@ -7,6 +7,7 @@ require 'active_support/cache'
 require 'active_support/core_ext/hash'
 require 'active_support/time'
 require 'active_support/time_with_zone'
+require 'retries'
 
 require 'factory_bot'
 require 'factory_bot/instrumentation/configuration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot_instrumentation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement