lib/css_parser.rb in css_parser-1.2.5 vs lib/css_parser.rb in css_parser-1.2.6

@@ -3,13 +3,13 @@
 require 'net/https'
 require 'open-uri'
 require 'digest/md5'
 require 'zlib'
 require 'stringio'
-require 'iconv'
+require 'iconv' unless String.method_defined?(:encode)
 
 module CssParser
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 
   # Merge multiple CSS RuleSets by cascading according to the CSS 2.1 cascading rules 
   # (http://www.w3.org/TR/REC-CSS2/cascade.html#cascading-order).
   #
   # Takes one or more RuleSet objects.