diff options
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb | 8 | ||||
-rw-r--r-- | activesupport/test/multibyte_handler_test.rb | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb index a34701b1af..0d13cebf5c 100644 --- a/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb +++ b/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb @@ -168,8 +168,12 @@ module ActiveSupport::Multibyte::Handlers # Implements Unicode-aware slice with codepoints. Slicing on one point returns the codepoints for that # character. def slice(str, *args) - if (args.size == 2 && args.first.is_a?(Range)) - raise TypeError, 'cannot convert Range into Integer' # Do as if we were native + if args.size > 2 + raise ArgumentError, "wrong number of arguments (#{args.size} for 1)" # Do as if we were native + elsif (args.size == 2 && !(args.first.is_a?(Numeric) || args.first.is_a?(Regexp))) + raise TypeError, "cannot convert #{args.first.class} into Integer" # Do as if we were native + elsif (args.size == 2 && !args[1].is_a?(Numeric)) + raise TypeError, "cannot convert #{args[1].class} into Integer" # Do as if we were native elsif args[0].kind_of? Range cps = u_unpack(str).slice(*args) cps.nil? ? nil : cps.pack('U*') diff --git a/activesupport/test/multibyte_handler_test.rb b/activesupport/test/multibyte_handler_test.rb index 95d6faec7c..ea728aa555 100644 --- a/activesupport/test/multibyte_handler_test.rb +++ b/activesupport/test/multibyte_handler_test.rb @@ -162,6 +162,9 @@ module UTF8HandlingTest assert_equal " Блå ffi ", @handler.slice(@string, 4..10), "Unicode characters have to be returned" assert_equal "", @handler.slice(@string, 7..6), "Range is empty, should return an empty string" assert_raise(ActiveSupport::Multibyte::Handlers::EncodingError) { @handler.slice(@bytestring, 2..3) } + assert_raise(TypeError, "With 2 args, should raise TypeError for non-Numeric or Regexp first argument") { @handler.slice(@string, 2..3, 1) } + assert_raise(TypeError, "With 2 args, should raise TypeError for non-Numeric or Regexp second argument") { @handler.slice(@string, 1, 2..3) } + assert_raise(ArgumentError, "Should raise ArgumentError when there are more than 2 args") { @handler.slice(@string, 1, 1, 1) } end def test_grapheme_cluster_length |