kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

lib/unicode_normalize/normalize.rb: Replaced if-else by case in self.normalized? in parallel to r48309.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
duerst 2014-11-09 09:33:36 +00:00
parent b30ff6839d
commit 62b511b6aa
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Nov 9 18:33:33 2014 Martin Duerst <duerst@it.aoyama.ac.jp>
* lib/unicode_normalize/normalize.rb: Replaced if-else by
case in self.normalized? in parallel to r48309.
Sun Nov 9 18:07:00 2014 Tanaka Akira <akr@fsij.org> Sun Nov 9 18:07:00 2014 Tanaka Akira <akr@fsij.org>
* test/xmlrpc: Use assert_join_threads. * test/xmlrpc: Use assert_join_threads.

7
lib/unicode_normalize/normalize.rb
View file

@ -136,7 +136,8 @@ module UnicodeNormalize
def self.normalized?(string, form = :nfc) def self.normalized?(string, form = :nfc)
encoding = string.encoding encoding = string.encoding
if encoding == Encoding::UTF_8 case encoding
when Encoding::UTF_8
case form case form
when :nfc then when :nfc then
string.scan REGEXP_C do |match| string.scan REGEXP_C do |match|
@ -155,9 +156,9 @@ module UnicodeNormalize
else else
raise ArgumentError, "Invalid normalization form #{form}." raise ArgumentError, "Invalid normalization form #{form}."
end end
elsif encoding == Encoding::US_ASCII when Encoding::US_ASCII
true true
elsif UNICODE_ENCODINGS.include? encoding when **UNICODE_ENCODINGS
normalized? string.encode(Encoding::UTF_8), form normalized? string.encode(Encoding::UTF_8), form
else else
raise Encoding::CompatibilityError, "Unicode Normalization not appropriate for #{encoding}" raise Encoding::CompatibilityError, "Unicode Normalization not appropriate for #{encoding}"