Update to Active Support 5.2.3.

f38
Pavel Valena 6 years ago
parent b67ee55a01
commit d491016c90

@ -1,28 +0,0 @@
From ab631b363e0bb4870fe535f3ef0d1751bfd14ae1 Mon Sep 17 00:00:00 2001
From: utilum <oz@utilum.com>
Date: Tue, 4 Dec 2018 13:46:00 +0100
Subject: [PATCH] Another Ruby 2.6 BigDecimal compatibility issue
This patch modifies XmlMini::Parsing["decimal"] to handle a string that
contains an invalid number. Since [ruby/ruby@a0e438c#diff-6b866d482baf2bdfd8433893fb1f6d36R144](https://github.com/ruby/ruby/commit/a0e438cd3c28d2eaf4efa18243d5b6edafa14d88#diff-6b866d482baf2bdfd8433893fb1f6d36R144) this case raises an `ArgumentError`. `String.to_f` returns 0.0 if there is not a valid number at the start of the argument, so current behavior is conserved.
See https://travis-ci.org/rails/rails/jobs/463180341#L6264
Related: #34600, #34601
---
activesupport/lib/active_support/xml_mini.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/activesupport/lib/active_support/xml_mini.rb b/activesupport/lib/active_support/xml_mini.rb
index e42eee07a3ce..be298bf0a1ec 100644
--- a/activesupport/lib/active_support/xml_mini.rb
+++ b/activesupport/lib/active_support/xml_mini.rb
@@ -71,7 +71,7 @@ def content_type
begin
BigDecimal(number)
rescue ArgumentError
- BigDecimal("0")
+ BigDecimal(number.to_f.to_s)
end
else
BigDecimal(number)

@ -2,7 +2,7 @@
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Epoch: 1 Epoch: 1
Version: 5.2.2.1 Version: 5.2.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: A support libraries and Ruby core extensions extracted from the Rails framework Summary: A support libraries and Ruby core extensions extracted from the Rails framework
License: MIT License: MIT
@ -13,17 +13,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Rails rpms, you may check it out like so # Rails rpms, you may check it out like so
# git clone http://github.com/rails/rails.git # git clone http://github.com/rails/rails.git
# cd rails/activesupport/ # cd rails/activesupport/
# git checkout v5.2.2.1 && tar czvf activesupport-5.2.2.1-tests.tgz test/ # git checkout v5.2.3 && tar czvf activesupport-5.2.3-tests.tgz test/
Source1: %{gem_name}-%{version}-tests.tgz Source1: %{gem_name}-%{version}-tests.tgz
# Fix Range compatibility with Ruby 2.6.
# https://github.com/rails/rails/pull/32938/commits/0fcb921a65e615c301450d7820b03473acd53898
Patch0: rubygem-activesupport-6.0.0.beta1-Ruby-2.6-Range-support.patch
# Fix BigDecimal Ruby 2.6 compatibility.
# https://github.com/rails/rails/pull/34612
Patch1: rubygem-activesupport-6.0.0.beta1-Fix-Ruby-2.6-BigDecimal-compatibility-issue.patch
# ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ruby package has just soft dependency on rubygem({bigdecimal,json}), while
# ActiveSupport always requires them. # ActiveSupport always requires them.
Requires: rubygem(bigdecimal) Requires: rubygem(bigdecimal)
@ -64,11 +56,6 @@ Documentation for %{name}.
%prep %prep
%setup -q -n %{gem_name}-%{version} %setup -q -n %{gem_name}-%{version}
%patch0 -p2
%gemspec_add_file 'lib/active_support/core_ext/range/compare_range.rb'
%patch1 -p2
%build %build
gem build ../%{gem_name}-%{version}.gemspec gem build ../%{gem_name}-%{version}.gemspec
@ -116,6 +103,9 @@ popd
%doc %{gem_instdir}/README.rdoc %doc %{gem_instdir}/README.rdoc
%changelog %changelog
* Thu Mar 28 2019 Pavel Valena <pvalena@redhat.com> - 1:5.2.3-1
- Update to Active Support 5.2.3.
* Thu Mar 14 2019 Pavel Valena <pvalena@redhat.com> - 1:5.2.2.1-1 * Thu Mar 14 2019 Pavel Valena <pvalena@redhat.com> - 1:5.2.2.1-1
- Update to Active Support 5.2.2.1. - Update to Active Support 5.2.2.1.

@ -1,2 +1,2 @@
SHA512 (activesupport-5.2.2.1.gem) = 083f5d4c4afae72d148d66aef7edf1348f5083b8c80c896879f9b570aa9d1220203e2720fdebc7b383eaefe4cfac6c25a2e3ae6cbbf86a11b2eeaa1a035bb8b2 SHA512 (activesupport-5.2.3.gem) = 8e0ab698f1b850c380ffc464fd48c942f4a46b9ca66055166949fa069740a4ff50f320d87f1040064a896c5ba1b8c00f0730592efec90d92a20c500d66b99589
SHA512 (activesupport-5.2.2.1-tests.tgz) = 20b24f5194e7e7f8f8eb8ef2a030b544f710f314cbddc9004561446fcc9737e0fa5eced91db419a260bc54ea041e4c482c771dd8882ad10f2713409d15932ab7 SHA512 (activesupport-5.2.3-tests.tgz) = 853650145304f21d37172097d8fa31866a33d754a61bcc4bebcb51e4ad4cda58d6757d2526ff073118cf3cd56494b93857050a9e2f1ea08ea0e361b7fec32be7

Loading…
Cancel
Save