112 lines
3.8 KiB
Diff
112 lines
3.8 KiB
Diff
From ca6995a80cb526958001e18d3b06da6587cd07eb Mon Sep 17 00:00:00 2001
|
|
From: Jean Boussier <jean.boussier@gmail.com>
|
|
Date: Wed, 14 Feb 2024 09:52:55 +0100
|
|
Subject: [PATCH] Update Method#duplicable? to be consistent with Ruby 3.4
|
|
|
|
Fix: https://github.com/rails/rails/issues/51075
|
|
|
|
`Method` and `UnboundMethod` used to raise on `#dup`, but not `#clone`,
|
|
this wasn't so much a feature, but a bug.
|
|
|
|
It was fixed in https://github.com/ruby/ruby/pull/9926.
|
|
---
|
|
.../core_ext/object/duplicable.rb | 39 ++++++++++++-------
|
|
.../test/core_ext/object/duplicable_test.rb | 28 ++++++++-----
|
|
2 files changed, 42 insertions(+), 25 deletions(-)
|
|
|
|
diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb
|
|
index 6fdf6d810ffb9..505455fe54bf3 100644
|
|
--- a/activesupport/lib/active_support/core_ext/object/duplicable.rb
|
|
+++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb
|
|
@@ -28,23 +28,32 @@ def duplicable?
|
|
end
|
|
end
|
|
|
|
-class Method
|
|
- # Methods are not duplicable:
|
|
- #
|
|
- # method(:puts).duplicable? # => false
|
|
- # method(:puts).dup # => TypeError: allocator undefined for Method
|
|
- def duplicable?
|
|
- false
|
|
- end
|
|
+methods_are_duplicable = begin
|
|
+ Object.instance_method(:duplicable?).dup
|
|
+ true
|
|
+rescue TypeError
|
|
+ false
|
|
end
|
|
|
|
-class UnboundMethod
|
|
- # Unbound methods are not duplicable:
|
|
- #
|
|
- # method(:puts).unbind.duplicable? # => false
|
|
- # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod
|
|
- def duplicable?
|
|
- false
|
|
+unless methods_are_duplicable
|
|
+ class Method
|
|
+ # Methods are not duplicable:
|
|
+ #
|
|
+ # method(:puts).duplicable? # => false
|
|
+ # method(:puts).dup # => TypeError: allocator undefined for Method
|
|
+ def duplicable?
|
|
+ false
|
|
+ end
|
|
+ end
|
|
+
|
|
+ class UnboundMethod
|
|
+ # Unbound methods are not duplicable:
|
|
+ #
|
|
+ # method(:puts).unbind.duplicable? # => false
|
|
+ # method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod
|
|
+ def duplicable?
|
|
+ false
|
|
+ end
|
|
end
|
|
end
|
|
|
|
diff --git a/activesupport/test/core_ext/object/duplicable_test.rb b/activesupport/test/core_ext/object/duplicable_test.rb
|
|
index 07d9a3df4adc5..58de295719333 100644
|
|
--- a/activesupport/test/core_ext/object/duplicable_test.rb
|
|
+++ b/activesupport/test/core_ext/object/duplicable_test.rb
|
|
@@ -6,21 +6,26 @@
|
|
require "active_support/core_ext/numeric/time"
|
|
|
|
class DuplicableTest < ActiveSupport::TestCase
|
|
- RAISE_DUP = [method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance]
|
|
- ALLOW_DUP = ["1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new, Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1)]
|
|
+ OBJECTS = [
|
|
+ method(:puts), method(:puts).unbind, Class.new.include(Singleton).instance,
|
|
+ "1", "symbol_from_string".to_sym, Object.new, /foo/, [], {}, Time.now, Class.new,
|
|
+ Module.new, BigDecimal("4.56"), nil, false, true, 1, 2.3, Complex(1), Rational(1),
|
|
+ ]
|
|
|
|
- def test_duplicable
|
|
- rubinius_skip "* Method#dup is allowed at the moment on Rubinius\n" \
|
|
- "* https://github.com/rubinius/rubinius/issues/3089"
|
|
-
|
|
- RAISE_DUP.each do |v|
|
|
- assert_not v.duplicable?, "#{ v.inspect } should not be duplicable"
|
|
- assert_raises(TypeError, v.class.name) { v.dup }
|
|
- end
|
|
+ OBJECTS.each do |v|
|
|
+ test "#{v.class}#duplicable? matches #{v.class}#dup behavior" do
|
|
+ duplicable = begin
|
|
+ v.dup
|
|
+ true
|
|
+ rescue TypeError
|
|
+ false
|
|
+ end
|
|
|
|
- ALLOW_DUP.each do |v|
|
|
- assert v.duplicable?, "#{ v.class } should be duplicable"
|
|
- assert_nothing_raised { v.dup }
|
|
+ if duplicable
|
|
+ assert_predicate v, :duplicable?
|
|
+ else
|
|
+ assert_not_predicate v, :duplicable?
|
|
+ end
|
|
end
|
|
end
|
|
end
|