diff options
author | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-02 05:34:25 +0000 |
---|---|---|
committer | duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-02 05:34:25 +0000 |
commit | 8001dae8208ef3c3eedc09776c1efd3c74bf0b6a (patch) | |
tree | 9e2b5daaaf0b2856b8c86cd7a4122a59992cc7aa | |
parent | 42b8713703606011cff7dd4ed488fe9adbcebb2a (diff) | |
download | ruby-8001dae8208ef3c3eedc09776c1efd3c74bf0b6a.tar.gz |
rework definition of String#unicode_normalize! and #unicode_normalized?
simplify String#unicode_normalize! and #unicode_normalized?
in lib/unicode_normalize.rb by redefining them
in lib/unicode_normalize/normalize.rb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | lib/unicode_normalize.rb | 6 | ||||
-rw-r--r-- | lib/unicode_normalize/normalize.rb | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/unicode_normalize.rb b/lib/unicode_normalize.rb index cf99a13572..e87677eb68 100644 --- a/lib/unicode_normalize.rb +++ b/lib/unicode_normalize.rb @@ -42,8 +42,7 @@ class String # def unicode_normalize!(form = :nfc) require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize - # String.send(:define_method, :unicode_normalize!, ->(form = :nfc) { replace(unicode_normalize(form)) } ) - replace(unicode_normalize(form)) + unicode_normalize! form end # :call-seq: @@ -65,8 +64,7 @@ class String # def unicode_normalized?(form = :nfc) require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize - # String.send(:define_method, :unicode_normalized?, ->(form = :nfc) { UnicodeNormalize.normalized?(self, form) } ) - UnicodeNormalize.normalized?(self, form) + unicode_normalized? form end end diff --git a/lib/unicode_normalize/normalize.rb b/lib/unicode_normalize/normalize.rb index 759197d02c..87b84589a5 100644 --- a/lib/unicode_normalize/normalize.rb +++ b/lib/unicode_normalize/normalize.rb @@ -157,11 +157,18 @@ module UnicodeNormalize # :nodoc: raise Encoding::CompatibilityError, "Unicode Normalization not appropriate for #{encoding}" end end - end # module class String # :nodoc: def unicode_normalize(form = :nfc) UnicodeNormalize.normalize(self, form) end + + def unicode_normalize!(form = :nfc) + replace(UnicodeNormalize.normalize(self, form)) + end + + def unicode_normalized?(form = :nfc) + UnicodeNormalize.normalized?(self, form) + end end |