Autoload Multibyte features.

1 files changed, 7 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 6f2016a409..7e6f7d754b 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -4,6 +4,12 @@ require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport #:nodoc:
   module Multibyte
+    autoload :EncodingError, 'active_support/multibyte/exceptions'
+    autoload :Chars, 'active_support/multibyte/chars'
+    autoload :UnicodeDatabase, 'active_support/multibyte/unicode_database'
+    autoload :Codepoint, 'active_support/multibyte/unicode_database'
+    autoload :UCD, 'active_support/multibyte/unicode_database'
+    
     # A list of all available normalization forms. See http://www.unicode.org/reports/tr15/tr15-29.html for more
     # information about normalization.
     NORMALIZATION_FORMS = [:c, :kc, :d, :kd]
@@ -53,7 +59,4 @@ module ActiveSupport #:nodoc:
   end
 end
 
-require 'active_support/multibyte/chars'
-require 'active_support/multibyte/exceptions'
-require 'active_support/multibyte/unicode_database'
-require 'active_support/multibyte/utils'
+require 'active_support/multibyte/utils'
\ No newline at end of file