Skip to content

Commit

Permalink
Use more descriptive method names
Browse files Browse the repository at this point in the history
  • Loading branch information
norman committed Jan 5, 2012
1 parent a8a8dc4 commit 4ac056c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions activesupport/lib/active_support/multibyte/chars.rb
Expand Up @@ -90,7 +90,7 @@ def slice!(*args)
# Example:
# 'Café'.mb_chars.reverse.to_s # => 'éfaC'
def reverse
chars(Unicode.g_unpack(@wrapped_string).reverse.flatten.pack('U*'))
chars(Unicode.unpack_graphemes(@wrapped_string).reverse.flatten.pack('U*'))
end

# Limit the byte size of the string to a number of bytes without breaking characters. Usable
Expand Down Expand Up @@ -170,7 +170,7 @@ def compose
# 'क्षि'.mb_chars.length # => 4
# 'क्षि'.mb_chars.g_length # => 3
def g_length
Unicode.g_unpack(@wrapped_string).length
Unicode.unpack_graphemes(@wrapped_string).length
end

# Replaces all ISO-8859-1 or CP1252 characters by their UTF-8 equivalent resulting in a valid UTF-8 string.
Expand Down
12 changes: 6 additions & 6 deletions activesupport/lib/active_support/multibyte/unicode.rb
Expand Up @@ -73,9 +73,9 @@ def in_char_class?(codepoint, classes)
# Unpack the string at grapheme boundaries. Returns a list of character lists.
#
# Example:
# Unicode.g_unpack('क्षि') # => [[2325, 2381], [2359], [2367]]
# Unicode.g_unpack('Café') # => [[67], [97], [102], [233]]
def g_unpack(string)
# Unicode.unpack_graphemes('क्षि') # => [[2325, 2381], [2359], [2367]]
# Unicode.unpack_graphemes('Café') # => [[67], [97], [102], [233]]
def unpack_graphemes(string)
codepoints = string.codepoints.to_a
unpacked = []
pos = 0
Expand Down Expand Up @@ -105,11 +105,11 @@ def g_unpack(string)
unpacked
end

# Reverse operation of g_unpack.
# Reverse operation of unpack_graphemes.
#
# Example:
# Unicode.g_pack(Unicode.g_unpack('क्षि')) # => 'क्षि'
def g_pack(unpacked)
# Unicode.pack_graphemes(Unicode.unpack_graphemes('क्षि')) # => 'क्षि'
def pack_graphemes(unpacked)
unpacked.flatten.pack('U*')
end

Expand Down

0 comments on commit 4ac056c

Please sign in to comment.