multibyte.rb in activesupport-3.0.0.rc

- old
+ new

@@ -1,37 +1,25 @@
 # encoding: utf-8
-
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveSupport #:nodoc:
   module Multibyte
-    # 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]
-
-    # The Unicode version that is supported by the implementation
-    UNICODE_VERSION = '5.1.0'
-
-    # The default normalization used for operations that require normalization. It can be set to any of the
-    # normalizations in NORMALIZATION_FORMS.
-    #
-    # Example:
-    #   ActiveSupport::Multibyte.default_normalization_form = :c
-    mattr_accessor :default_normalization_form
-    self.default_normalization_form = :kc
-
+    autoload :EncodingError, 'active_support/multibyte/exceptions'
+    autoload :Chars, 'active_support/multibyte/chars'
+    autoload :Unicode, 'active_support/multibyte/unicode'
+    
     # The proxy class returned when calling mb_chars. You can use this accessor to configure your own proxy
     # class so you can support other encodings. See the ActiveSupport::Multibyte::Chars implementation for
     # an example how to do this.
     #
     # Example:
     #   ActiveSupport::Multibyte.proxy_class = CharsForUTF32
     def self.proxy_class=(klass)
       @proxy_class = klass
     end
 
-    # Returns the currect proxy class
+    # Returns the current proxy class
     def self.proxy_class
       @proxy_class ||= ActiveSupport::Multibyte::Chars
     end
 
     # Regular expressions that describe valid byte sequences for a character
@@ -45,15 +33,12 @@
                   \xf0        [\x90-\xbf] [\x80-\xbf] [\x80-\xbf]     |
                   [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf]     |
                   \xf4        [\x80-\x8f] [\x80-\xbf] [\x80-\xbf])\z /xn,
       # Quick check for valid Shift-JIS characters, disregards the odd-even pairing
       'Shift_JIS' => /\A(?:
-                  [\x00-\x7e \xa1-\xdf]                                     |
-                  [\x81-\x9f \xe0-\xef] [\x40-\x7e \x80-\x9e \x9f-\xfc])\z /xn
+                  [\x00-\x7e\xa1-\xdf]                                     |
+                  [\x81-\x9f\xe0-\xef] [\x40-\x7e\x80-\x9e\x9f-\xfc])\z /xn
     }
   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