factory_bot_instrumentation 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71c4ed3a9ed6cb1053a73c132a5da84f17f39ea9bd3caca361a190e5d00e988
-  data.tar.gz: f72ca36c607d3f301d7062520d55bed52c47eb33d522a444071f7149701c2ed4
+  metadata.gz: 571f3fa6ccb358bd6e926c3836305e445e1912c72af314f41aec833d4284be09
+  data.tar.gz: dce90925108b1c152139285393fa62fd6a12591caea8a84962fb1a2573583a0a
 SHA512:
-  metadata.gz: 1029988890892b3e2dbc67301793ddf227a70987f00bcc043ced996f2bb4c474fd506d588ca52d400750fc328f1ec8a501f0b39c8d3e1ec92be36f92f9cf6fef
-  data.tar.gz: 9769d814eea416af200fcb29a361d8f20e93a486397014d9e84f224713efdaa961a84cb1767c5f16cfd9bf5f2b34846cc77fa39de295fd1d56e0b6da79248f96
+  metadata.gz: b5b5a3de3c236e84626584810483896ad5be96c36d0ea80e5cc1136768b3540b222686362510576b77fe14cfadf7e738042baad5d0ac06d84a2d12c40c732ad2
+  data.tar.gz: 131b882d7b7a0ddd8838a942c4afb982a6fefb1cacd552667d71baf23db002ee40bba4c78fd786f7b966d0195d2566112937a24d2a9a9090bca4a1708c471c08

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 1.1.4
+
+* Pinned factory_bot down to < 6.4.5 in order to support Ruby 2.5 (#18)
+* Added handling to support Psych 4 and 5 (#18)
+
+### 1.1.3
+
+* Corrected the fallback view path configuration (#17)
+
 ### 1.1.2
 
 * Moved the development dependencies from the gemspec to the Gemfile (#15)

data/Makefile

@@ -29,6 +29,7 @@ ID ?= id
 MKDIR ?= mkdir
 RM ?= rm
 SORT ?= sort
+TEST ?= test
 XARGS ?= xargs
 
 # Container binaries
@@ -39,6 +40,7 @@ RAKE ?= rake
 RSPEC ?= rspec
 RUBOCOP ?= rubocop
 YARD ?= yard
+RUBY_VERSION := ruby-version
 
 # Files
 GEMFILES ?= $(subst _,-,$(patsubst $(GEMFILES_DIR)/%.gemfile,%,\
@@ -117,7 +119,8 @@ test-style: \
 
 test-style-ruby:
 	# Run the static code analyzer (rubocop)
-	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a)
+	@$(call run-shell,$(BUNDLE) exec $(RUBOCOP) -a \
+		|| ($(TEST) $$($(RUBY_VERSION)) != '2.5' && true))
 
 clean:
 	# Clean the dependencies

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

@@ -9,11 +9,6 @@ module FactoryBot
       include ActionController::HttpAuthentication::Digest::ControllerMethods
       include ActionController::HttpAuthentication::Token::ControllerMethods
 
-      # For some reason the Rails engine may not find its partial templates as
-      # it looks for wrong paths, so we add a fallback path to the view paths
-      base_path = Pathname.new(File.expand_path('../../../views', __dir__))
-      append_view_path base_path.join('factory_bot/instrumentation')
-
       # Allow the users to implement additional instrumentation-wide before
       # action logic, like authentication
       before_action do |_controller|

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

@@ -85,16 +85,12 @@ module FactoryBot
       # to get always a fresh state.
       #
       # @return [Hash{String => Mixed}] the instrumentation scenarios
-      #
-      # rubocop:disable Security/YAMLLoad because we just load
-      #   local configuration files here
       def instrumentation
         config_file = FactoryBot::Instrumentation.configuration.config_file.to_s
-        content = Pathname.new(config_file).read
-        template = ERB.new(content)
-        YAML.load(template.result(binding))[Rails.env]
+        template = ERB.new(Pathname.new(config_file).read)
+        load_method = YAML.respond_to?(:unsafe_load) ? :unsafe_load : :load
+        YAML.send(load_method, template.result(binding))[Rails.env]
       end
-      # rubocop:enable Security/YAMLLoad
 
       # Map all the instrumentation scenarios into groups and pass them back.
       #

data/factory_bot_instrumentation.gemspec

@@ -33,7 +33,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.5'
 
-  spec.add_runtime_dependency 'factory_bot', '~> 6.2'
+  # TODO: Remove the upper lock when
+  #       https://github.com/thoughtbot/factory_bot/issues/1614 is solved.
+  spec.add_runtime_dependency 'factory_bot', '~> 6.2', '< 6.4.5'
   spec.add_runtime_dependency 'rails', '>= 5.2'
   spec.add_runtime_dependency 'retries', '>= 0.0.5'
 end

data/lib/factory_bot/instrumentation/engine.rb

@@ -29,6 +29,14 @@ module FactoryBot
           end
         end
       end
+
+      # For some reason the Rails engine may not find its partial templates
+      # as it looks for wrong paths, so we add a fallback path to the view
+      # paths
+      app_path = Pathname.new(File.expand_path('../../../app', __dir__))
+      paths['app/views'].push(
+        app_path.join('views/factory_bot/instrumentation').to_s
+      )
     end
   end
 end

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.1.2'
+    VERSION = '1.1.4'
 
     class << self
       # Returns the version of gem as a string.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bot_instrumentation
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.4.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement