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