From 62b511b6aa9e2c1ceb11048f012eed13e5feabfb Mon Sep 17 00:00:00 2001 From: duerst Date: Sun, 9 Nov 2014 09:33:36 +0000 Subject: lib/unicode_normalize/normalize.rb: Replaced if-else by case in self.normalized? in parallel to r48309. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48338 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/unicode_normalize/normalize.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/unicode_normalize') diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb index 5fea8c5548..86e83f2afe 100644 --- a/lib/unicode_normalize/normalize.rb +++ b/lib/unicode_normalize/normalize.rb @@ -136,7 +136,8 @@ module UnicodeNormalize def self.normalized?(string, form = :nfc) encoding = string.encoding - if encoding == Encoding::UTF_8 + case encoding + when Encoding::UTF_8 case form when :nfc then string.scan REGEXP_C do |match| @@ -155,9 +156,9 @@ module UnicodeNormalize else raise ArgumentError, "Invalid normalization form #{form}." end - elsif encoding == Encoding::US_ASCII + when Encoding::US_ASCII true - elsif UNICODE_ENCODINGS.include? encoding + when **UNICODE_ENCODINGS normalized? string.encode(Encoding::UTF_8), form else raise Encoding::CompatibilityError, "Unicode Normalization not appropriate for #{encoding}" -- cgit v1.2.3