Ticket #9632: wrong_include.diff

test/multibyte_conformance.rb

@@ -122 +122 @@
-end
-
-begin
-
-
+
+
+
-  class ConformanceTestProc < Test::Unit::TestCase
-    include ConformanceTest
-    def setup

lib/active_support/multibyte/handlers/utf8_handler_proc.rb

@@ -27 +27 @@
-      utf8map(str, :casefold)
-    end
-    
+    def upcase(str) #:nodoc:c
+      utf8map(str, :casefold)
+    end
+    
-    protected
-    
-    def utf8map(str, *option_array) #:nodoc:

lib/active_support/multibyte/chars.rb

@@ -127 +127 @@
-
-# When we can load the utf8proc library, override normalization with the faster methods
-begin
- 'utf8proc_native
+_library_or_gem 'utf8proc
-  require 'active_support/multibyte/handlers/utf8_handler_proc'
-  ActiveSupport::Multibyte::Chars.handler = ActiveSupport::Multibyte::Handlers::UTF8HandlerProc
-rescue LoadError