css_parser 1.2.5 → 1.2.6

data/lib/css_parser.rb

@@ -5,10 +5,10 @@ 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).

data/lib/css_parser/parser.rb

@@ -119,7 +119,7 @@ module CssParser
         next unless options[:only_media_types].include?(:all) or media_types.length < 1 or (media_types & options[:only_media_types]).length > 0
 
         import_path = import_rule[0].to_s.gsub(/['"]*/, '').strip
-
+        
         if options[:base_uri]
           import_uri = Addressable::URI.parse(options[:base_uri].to_s) + Addressable::URI.parse(import_path)
           load_uri!(import_uri, options[:base_uri], media_types)
@@ -330,8 +330,7 @@ module CssParser
         opts[:base_uri] = options if options.is_a? String
         opts[:media_types] = deprecated if deprecated
       end
-      
-      
+            
       if uri.scheme == 'file' or uri.scheme.nil?
         uri.path = File.expand_path(uri.path)
         uri.scheme = 'file'
@@ -340,7 +339,6 @@ module CssParser
       opts[:base_uri] = uri if opts[:base_uri].nil?
 
       src, charset = read_remote_file(uri)
-
       if src
         add_block!(src, opts)
       end
@@ -423,7 +421,8 @@ module CssParser
             http = Net::HTTP.new(uri.host, uri.port)
           end
 
-          res, src = http.get(uri.path, {'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip'})
+          res = http.get(uri.path, {'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip'})
+          src = res.body
           charset = fh.respond_to?(:charset) ? fh.charset : 'utf-8'
 
           if res.code.to_i >= 400
@@ -442,8 +441,12 @@ module CssParser
         end
 
         if charset
-          ic = Iconv.new('UTF-8//IGNORE', charset)
-          src = ic.iconv(src)
+          if String.method_defined?(:encode)
+            src.encode!('UTF-8', charset)
+          else
+            ic = Iconv.new('UTF-8//IGNORE', charset)
+            src = ic.iconv(src)
+          end
         end
       rescue
         raise RemoteFileError if @options[:io_exceptions]

data/test/test_helper.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'test/unit'
 require 'net/http'
 require 'open-uri'
-require 'WEBrick'
+require 'webrick'
 require File.dirname(__FILE__) + '/../lib/css_parser'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2153617080 !ruby/object:Gem::Requirement
+  requirement: &2160264060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153617080
+  version_requirements: *2160264060
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2160263460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160263460
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160258520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2160258520
 description: A set of classes for parsing CSS in Ruby.
 email: code@dunae.ca
 executables: []