aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorNorman Clarke <norman@njclarke.com>2012-01-05 17:02:14 -0300
committerNorman Clarke <norman@njclarke.com>2012-01-05 17:02:14 -0300
commit51648a6fee31c9642d3ce8899a1c718e1604f4bc (patch)
treeb36838b613ed878671d01031e9ef382d1613a098 /activesupport/lib/active_support
parent9ea34ad3875243b9dd57a7fbd9ff6fa9c55872ac (diff)
downloadrails-51648a6fee31c9642d3ce8899a1c718e1604f4bc.tar.gz
rails-51648a6fee31c9642d3ce8899a1c718e1604f4bc.tar.bz2
rails-51648a6fee31c9642d3ce8899a1c718e1604f4bc.zip
Remove multibyte utils
This is neither a public API, nor used internally, so let's remove it.
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/multibyte.rb21
-rw-r--r--activesupport/lib/active_support/multibyte/utils.rb27
2 files changed, 1 insertions, 47 deletions
diff --git a/activesupport/lib/active_support/multibyte.rb b/activesupport/lib/active_support/multibyte.rb
index 57e8e24bf4..cabe073616 100644
--- a/activesupport/lib/active_support/multibyte.rb
+++ b/activesupport/lib/active_support/multibyte.rb
@@ -21,24 +21,5 @@ module ActiveSupport #:nodoc:
def self.proxy_class
@proxy_class ||= ActiveSupport::Multibyte::Chars
end
-
- # Regular expressions that describe valid byte sequences for a character
- VALID_CHARACTER = {
- # Borrowed from the Kconv library by Shinji KONO - (also as seen on the W3C site)
- 'UTF-8' => /\A(?:
- [\x00-\x7f] |
- [\xc2-\xdf] [\x80-\xbf] |
- \xe0 [\xa0-\xbf] [\x80-\xbf] |
- [\xe1-\xef] [\x80-\xbf] [\x80-\xbf] |
- \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
- }
end
-end
-
-require 'active_support/multibyte/utils' \ No newline at end of file
+end \ No newline at end of file
diff --git a/activesupport/lib/active_support/multibyte/utils.rb b/activesupport/lib/active_support/multibyte/utils.rb
deleted file mode 100644
index bd6d4bad41..0000000000
--- a/activesupport/lib/active_support/multibyte/utils.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-module ActiveSupport #:nodoc:
- module Multibyte #:nodoc:
- # Returns a regular expression that matches valid characters in the current encoding
- def self.valid_character
- VALID_CHARACTER[Encoding.default_external.to_s]
- end
-
- # Verifies the encoding of a string
- def self.verify(string)
- string.valid_encoding?
- end
-
- # Verifies the encoding of the string and raises an exception when it's not valid
- def self.verify!(string)
- raise EncodingError.new("Found characters with invalid encoding") unless verify(string)
- end
-
- # Removes all invalid characters from the string.
- #
- # Note: this method is a no-op in Ruby 1.9
- def self.clean(string)
- string
- end
- end
-end