From 8001dae8208ef3c3eedc09776c1efd3c74bf0b6a Mon Sep 17 00:00:00 2001
From: duerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 2 May 2017 05:34:25 +0000
Subject: [PATCH] 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
---
 lib/unicode_normalize.rb           | 6 ++----
 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