From 09b46c7dbea6ac2ac09ba4a41fae0bf628a775f3 Mon Sep 17 00:00:00 2001 From: Gourav Tiwari Date: Mon, 29 Jun 2015 20:20:50 +0000 Subject: Fixed slice! behavior: return nil for out-of-bound parameters --- activesupport/lib/active_support/multibyte/chars.rb | 3 ++- activesupport/test/multibyte_chars_test.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'activesupport') diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb index f6a2e7e949..a76692ec4b 100644 --- a/activesupport/lib/active_support/multibyte/chars.rb +++ b/activesupport/lib/active_support/multibyte/chars.rb @@ -94,7 +94,8 @@ module ActiveSupport #:nodoc: # string.mb_chars.slice!(0..3) # => # # string # => 'me' def slice!(*args) - chars(@wrapped_string.slice!(*args)) + string_sliced = @wrapped_string.slice!(*args) + string_sliced ? chars(string_sliced) : nil end # Reverses all characters in the string. diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb index e1c4b705f8..42829c6a8e 100644 --- a/activesupport/test/multibyte_chars_test.rb +++ b/activesupport/test/multibyte_chars_test.rb @@ -413,6 +413,10 @@ class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase assert_equal 'にち', @chars.slice!(1..2) end + def test_slice_bang_returns_nil_on_out_of_bound_arguments + assert_equal nil, @chars.mb_chars.slice!(9..10) + end + def test_slice_bang_removes_the_slice_from_the_receiver chars = 'úüù'.mb_chars chars.slice!(0,2) -- cgit v1.2.3 From b945de3662105abe330cad6e18962ccf7438150b Mon Sep 17 00:00:00 2001 From: Sean Griffin Date: Tue, 20 Oct 2015 16:02:31 -0600 Subject: Update #20737 to address feedback Given that this pull request affects a mutable value, we need to test for and document the affects on the receiver in this case. Additionally, this pull request was missing a CHANGELOG entry. --- activesupport/CHANGELOG.md | 5 +++++ activesupport/lib/active_support/multibyte/chars.rb | 7 +++++-- activesupport/test/multibyte_chars_test.rb | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'activesupport') diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index c02c5a82f5..e5d945bb42 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,8 @@ +* Update `ActiveSupport::Multibyte::Chars#slice!` to return `nil` if the + arguments are out of bounds, to mirror the behavior of `String#slice!` + + *Gourav Tiwari* + * Fix `number_to_human` so that 999999999 rounds to "1 Billion" instead of "1000 Million". diff --git a/activesupport/lib/active_support/multibyte/chars.rb b/activesupport/lib/active_support/multibyte/chars.rb index a76692ec4b..707cf200b5 100644 --- a/activesupport/lib/active_support/multibyte/chars.rb +++ b/activesupport/lib/active_support/multibyte/chars.rb @@ -86,7 +86,8 @@ module ActiveSupport #:nodoc: end # Works like String#slice!, but returns an instance of - # Chars, or nil if the string was not modified. + # Chars, or nil if the string was not modified. The string will not be + # modified if the range given is out of bounds # # string = 'Welcome' # string.mb_chars.slice!(3) # => # @@ -95,7 +96,9 @@ module ActiveSupport #:nodoc: # string # => 'me' def slice!(*args) string_sliced = @wrapped_string.slice!(*args) - string_sliced ? chars(string_sliced) : nil + if string_sliced + chars(string_sliced) + end end # Reverses all characters in the string. diff --git a/activesupport/test/multibyte_chars_test.rb b/activesupport/test/multibyte_chars_test.rb index 42829c6a8e..8d4d9d736c 100644 --- a/activesupport/test/multibyte_chars_test.rb +++ b/activesupport/test/multibyte_chars_test.rb @@ -423,6 +423,14 @@ class MultibyteCharsUTF8BehaviourTest < ActiveSupport::TestCase assert_equal 'ù', chars end + def test_slice_bang_returns_nil_and_does_not_modify_receiver_if_out_of_bounds + string = 'úüù' + chars = string.mb_chars + assert_nil chars.slice!(4, 5) + assert_equal 'úüù', chars + assert_equal 'úüù', string + end + def test_slice_should_throw_exceptions_on_invalid_arguments assert_raise(TypeError) { @chars.slice(2..3, 1) } assert_raise(TypeError) { @chars.slice(1, 2..3) } -- cgit v1.2.3