[rpms/rubygem-factory_bot] f44: Backport upstream patch for ruby3.2 did_you_mean behavior change

[rpms/rubygem-factory_bot] f44: Backport upstream patch for ruby3.2 did_you_mean behavior change

[Mamoru TASAKA]

A new commit has been pushed.

Repo   : rpms/rubygem-factory_bot
Branch : f44
Commit : 7bef895e2e2138546f83d97c01a42358cb19507f
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date   : 2023-01-17T16:23:04+09:00
Stats  : +160/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rubygem-factory_bot/c/7bef895e2e2138546f83d97c01a42358cb19507f?branch=f44

Log:
Backport upstream patch for ruby3.2 did_you_mean behavior change

---
diff --git a/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch b/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch
new file mode 100644
index 0000000..8056e18
--- /dev/null
+++ b/rubygem-factory_bot-pr1561-ruby32-ruby32-did_you_mean-test.patch
@@ -0,0 +1,147 @@
+From f571e1906d805f021f68a721d2161fea7add2a3d Mon Sep 17 00:00:00 2001
+From: Daniel Colson <danieljamescolson@gmail.com>
+Date: Sun, 25 Dec 2022 21:03:29 -0500
+Subject: [PATCH] Pass key and receiver to custom key errors
+
+did_you_mean tests started failing on Ruby 3.2 because of
+https://bugs.ruby-lang.org/issues/18564.
+
+This gets did_you_mean working again for Ruby 3.2 by adding the original
+KeyError's key and receiver over to the custom KeyError. That way the
+did_you_mean can get added to the custom KeyError via the new
+detailed_message.
+---
+ lib/factory_bot/definition.rb                 | 29 +++++++++++++------
+ lib/factory_bot/registry.rb                   | 18 ++++++++++--
+ spec/acceptance/traits_spec.rb                |  8 +----
+ spec/factory_bot/registry_spec.rb             |  3 +-
+ .../matchers/raise_did_you_mean_error.rb      | 18 ++++++++++++
+ 5 files changed, 55 insertions(+), 21 deletions(-)
+ create mode 100644 spec/support/matchers/raise_did_you_mean_error.rb
+
+diff --git a/lib/factory_bot/definition.rb b/lib/factory_bot/definition.rb
+index ab6b34156..1294ac569 100644
+--- a/lib/factory_bot/definition.rb
++++ b/lib/factory_bot/definition.rb
+@@ -115,15 +115,26 @@ def base_traits
+       raise error_with_definition_name(error)
+     end
+ 
+-    def error_with_definition_name(error)
+-      message = error.message
+-      message.insert(
+-        message.index("\nDid you mean?") || message.length,
+-        " referenced within \"#{name}\" definition"
+-      )
+-
+-      error.class.new(message).tap do |new_error|
+-        new_error.set_backtrace(error.backtrace)
++    # detailed_message introduced in Ruby 3.2 for cleaner integration with
++    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
++    if KeyError.method_defined?(:detailed_message)
++      def error_with_definition_name(error)
++        message = error.message + " referenced within \"#{name}\" definition"
++
++        error.class.new(message, key: error.key, receiver: error.receiver)
++          .tap { |new_error| new_error.set_backtrace(error.backtrace) }
++      end
++    else
++      def error_with_definition_name(error)
++        message = error.message
++        message.insert(
++          message.index("\nDid you mean?") || message.length,
++          " referenced within \"#{name}\" definition"
++        )
++
++        error.class.new(message).tap do |new_error|
++          new_error.set_backtrace(error.backtrace)
++        end
+       end
+     end
+ 
+diff --git a/lib/factory_bot/registry.rb b/lib/factory_bot/registry.rb
+index c7eb03981..e58c4d5b8 100644
+--- a/lib/factory_bot/registry.rb
++++ b/lib/factory_bot/registry.rb
+@@ -39,9 +39,21 @@ def registered?(name)
+ 
+     def key_error_with_custom_message(key_error)
+       message = key_error.message.sub("key not found", "#{@name} not registered")
+-      error = KeyError.new(message)
+-      error.set_backtrace(key_error.backtrace)
+-      error
++      new_key_error(message, key_error).tap do |error|
++        error.set_backtrace(key_error.backtrace)
++      end
++    end
++
++    # detailed_message introduced in Ruby 3.2 for cleaner integration with
++    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
++    if KeyError.method_defined?(:detailed_message)
++      def new_key_error(message, key_error)
++        KeyError.new(message, key: key_error.key, receiver: key_error.receiver)
++      end
++    else
++      def new_key_error(message, _)
++        KeyError.new(message)
++      end
+     end
+   end
+ end
+diff --git a/spec/acceptance/traits_spec.rb b/spec/acceptance/traits_spec.rb
+index 293f9635a..24289cf7f 100644
+--- a/spec/acceptance/traits_spec.rb
++++ b/spec/acceptance/traits_spec.rb
+@@ -324,13 +324,7 @@ def build_user_factory_with_admin_trait(trait_name)
+         end
+       end
+ 
+-      expect { FactoryBot.build(:user) }.to raise_error(
+-        KeyError,
+-        <<~MSG.strip
+-          Trait not registered: "not_quite" referenced within "user" definition
+-          Did you mean?  "not_quit"
+-        MSG
+-      )
++      expect { FactoryBot.build(:user) }.to raise_did_you_mean_error
+     end
+   end
+ 
+diff --git a/spec/factory_bot/registry_spec.rb b/spec/factory_bot/registry_spec.rb
+index e793ec670..4749658a8 100644
+--- a/spec/factory_bot/registry_spec.rb
++++ b/spec/factory_bot/registry_spec.rb
+@@ -33,8 +33,7 @@
+     registered_object = double(:registered_object)
+     registry.register(:factory_bot, registered_object)
+ 
+-    expect { registry.find(:factory_bit) }
+-      .to raise_error(KeyError, /Did you mean\?  "factory_bot"/)
++    expect { registry.find(:factory_bit) }.to raise_did_you_mean_error
+   end
+ 
+   it "adds and returns the object registered" do
+diff --git a/spec/support/matchers/raise_did_you_mean_error.rb b/spec/support/matchers/raise_did_you_mean_error.rb
+new file mode 100644
+index 000000000..dd5579ffe
+--- /dev/null
++++ b/spec/support/matchers/raise_did_you_mean_error.rb
+@@ -0,0 +1,18 @@
++RSpec::Matchers.define :raise_did_you_mean_error do
++  supports_block_expectations
++
++  match do |actual|
++    # detailed_message introduced in Ruby 3.2 for cleaner integration with
++    # did_you_mean. See https://bugs.ruby-lang.org/issues/18564
++    matcher = if KeyError.method_defined?(:detailed_message)
++      raise_error(
++        an_instance_of(KeyError)
++        .and(having_attributes(detailed_message: /Did you mean\?/))
++      )
++    else
++      raise_error(KeyError, /Did you mean\?/)
++    end
++
++    expect(actual).to matcher
++  end
++end

diff --git a/rubygem-factory_bot.spec b/rubygem-factory_bot.spec
index 6b6c92d..03b72b2 100644
--- a/rubygem-factory_bot.spec
+++ b/rubygem-factory_bot.spec
@@ -2,7 +2,7 @@
 
 Name: rubygem-%{gem_name}
 Version: 6.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Framework and DSL for defining and using model instance factories
 License: MIT
 URL: https://github.com/thoughtbot/factory_bot
@@ -13,6 +13,9 @@ Source1: %{gem_name}-%{version}-specs.txz
 # git clone --no-checkout https://github.com/thoughtbot/factory_bot.git
 # git -C factory_bot archive -v -o factory_bot-6.2.1-features.txz v6.2.1 features/
 Source2: %{gem_name}-%{version}-features.txz
+# https://github.com/thoughtbot/factory_bot/pull/1561
+# ruby3.2 changes did_you_mean behavior
+Patch0:  %{name}-pr1561-ruby32-ruby32-did_you_mean-test.patch
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
@@ -43,6 +46,12 @@ Documentation for %{name}.
 %prep
 # Unpack Source1 and Source2
 %setup -q -n %{gem_name}-%{version} -b 1 -b 2
+(
+cd %{_builddir}
+mv %{gem_name}-%{version}/lib .
+%patch0 -p1
+mv lib %{gem_name}-%{version}
+)
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
@@ -86,6 +95,9 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Tue Jan 17 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.2.1-3
+- Backport upstream patch for ruby3.2 did_you_mean behavior change
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild