Drop iconv which is deprecated and only needed for ruby 1.8 support

[rails.git] / lib / validators.rb

diff --git a/lib/validators.rb b/lib/validators.rb
index 095fb7af9ac3dc1bedea4f231963e1835f5dac2b..6338e9ce9c5955e76ab49fc0b2e4c19e0367b273 100644 (file)
--- a/lib/validators.rb
+++ b/lib/validators.rb
@@ -1,7 +1,6 @@
 module ActiveRecord
   module Validations
     module ClassMethods
-      
       # error message when invalid UTF-8 is detected
       @@invalid_utf8_message = " is invalid UTF-8"
 
@@ -11,22 +10,9 @@ module ActiveRecord
       # is a valid UTF-8 format string.
       def validates_as_utf8(*attrs)
         validates_each(attrs) do |record, attr, value|
-          record.errors.add(attr, @@invalid_utf8_message) unless valid_utf8? value
+          record.errors.add(attr, @@invalid_utf8_message) unless UTF8.valid? value
         end
-      end    
-      
-      ##
-      # Checks that a string is valid UTF-8 by trying to convert it to UTF-8
-      # using the iconv library, which is in the standard library.
-      def valid_utf8?(str)
-        return true if str.nil?
-        Iconv.conv("UTF-8", "UTF-8", str)
-        return true
-
-      rescue
-        return false
-      end  
-      
+      end
     end
   end
 end