Permalink
Browse files

Correctly handle offsets in Multibyte::Chars#index and #rindex.

The offset in codepoints was being passed directly to the wrapped string's index/rindex method. Now we translate the offset into bytes first.

[#3028 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent 3e35ba2 commit 7d16e94d827197d030fdd611db4310396aeb0114 @eostrom eostrom committed with jeremy Aug 10, 2009
Showing with 11 additions and 4 deletions.
  1. +5 −3 activesupport/lib/active_support/multibyte/chars.rb
  2. +6 −1 activesupport/test/multibyte_chars_test.rb
@@ -206,7 +206,8 @@ def include?(other)
# 'Café périferôl'.mb_chars.index('ô') #=> 12
# 'Café périferôl'.mb_chars.index(/\w/u) #=> 0
def index(needle, offset=0)
- index = @wrapped_string.index(needle, offset)
+ wrapped_offset = self.first(offset).wrapped_string.length
+ index = @wrapped_string.index(needle, wrapped_offset)
index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
end
@@ -215,11 +216,12 @@ def index(needle, offset=0)
# string. Returns +nil+ if _needle_ isn't found.
#
# Example:
- # 'Café périferôl'.mb_chars.rindex('é') #=> 5
+ # 'Café périferôl'.mb_chars.rindex('é') #=> 6
# 'Café périferôl'.mb_chars.rindex(/\w/u) #=> 13
def rindex(needle, offset=nil)
offset ||= length
- index = @wrapped_string.rindex(needle, offset)
+ wrapped_offset = self.first(offset).wrapped_string.length
+ index = @wrapped_string.rindex(needle, wrapped_offset)
index ? (self.class.u_unpack(@wrapped_string.slice(0...index)).size) : nil
end
@@ -230,14 +230,19 @@ def test_index_should_return_character_offset
assert_nil @chars.index('u')
assert_equal 0, @chars.index('こに')
assert_equal 2, @chars.index('')
+ assert_equal 2, @chars.index('', -2)
+ assert_equal nil, @chars.index('', -1)
assert_equal 3, @chars.index('')
+ assert_equal 5, 'ééxééx'.mb_chars.index('x', 4)
end
def test_rindex_should_return_character_offset
assert_nil @chars.rindex('u')
assert_equal 1, @chars.rindex('')
+ assert_equal 2, @chars.rindex('', -2)
+ assert_nil @chars.rindex('', -3)
assert_equal 6, 'Café périferôl'.mb_chars.rindex('é')
- assert_equal 12, 'Café périferôl'.mb_chars.rindex(/\w/u)
+ assert_equal 13, 'Café périferôl'.mb_chars.rindex(/\w/u)
end
def test_indexed_insert_should_take_character_offsets

0 comments on commit 7d16e94

Please sign in to comment.