factory_bot_instrumentation 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b248a577b9cec82d72bbb47413e999e6aeb9d5c8abb2c5ebd859748335acaa43
-  data.tar.gz: f0fa32df2602e74ff666c9a8eedb2378d07a469844df0eed7ebb82f5e363bb9b
+  metadata.gz: 5e200ee9b6c940652aa1655e8be54bc38815e8ed59678315984320d34292e7c6
+  data.tar.gz: 0a74dd73fecc873a368010fdb6e445dda7d3be012452553bc552de1968140965
 SHA512:
-  metadata.gz: 1de14c66d5da657cd5035545341548816b25b76a26f926cbd488f51d5ade26c0d031d5495ea2bcfb07ac1b71c8387050e4a23be2278196a69af5cea7ea406d8f
-  data.tar.gz: 9b1cd170bdfda25d8cade7a06fe535f5db3584663de14b4c59c9dec162d3f8452931e55c0115975102ac2fc2ac7d71d98c5d82623a187ed455f3f59b57260724
+  metadata.gz: c79689fbe92b67f676532e0876b88352011193220409019dc630efdc75b6da971809a7d15333c8b6789f627e5b0239964ae0834c0f6748a71ae7860469f8b94b
+  data.tar.gz: d2bdbbf8c0e74e6335fa68a9b58f62dc48685e8a835bbcaaaca117e80cbfd89e61f48656030802afffd9ce202ee41f83ac9c245fbc2ddccf60cb0081c905f3e6

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 1.1.5
+
+* Added fallbacks for configuration processing (#19)
+
+### 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)

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/root_controller.rb

@@ -85,22 +85,19 @@ 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.
       #
       # @return [Hash{String => Array}] the grouped scenarios
       def scenarios
-        instrumentation['scenarios'].each_with_object({}) do |scenario, memo|
+        res = (instrumentation['scenarios'] || [])
+        res.each_with_object({}) do |scenario, memo|
           group = scenario_group(scenario['name'])
           scenario['group'] = group
           memo[group] = [] unless memo.key? group
@@ -112,7 +109,7 @@ module FactoryBot
       #
       # @return [Hash{Regexp => String}] the group mapping
       def groups
-        instrumentation['groups'].transform_keys do |key|
+        (instrumentation['groups'] || {}).transform_keys do |key|
           Regexp.new(Regexp.quote(key))
         end
       end

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/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.3'
+    VERSION = '1.1.5'
 
     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.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2024-02-18 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