css_parser 1.1.1 → 1.1.2

data/lib/css_parser/parser.rb

@@ -23,11 +23,7 @@ module CssParser
     # Initial parsing
     RE_AT_IMPORT_RULE = /\@import\s*(?:url\s*)?(?:\()?(?:\s*)["']?([^'"\s\)]*)["']?\)?([\w\s\,^\])]*)\)?[;\n]?/
 
-    #--
-    # RE_AT_IMPORT_RULE = Regexp.new('@import[\s]*(' + RE_STRING.to_s + ')([\w\s\,]*)[;]?', Regexp::IGNORECASE) -- should handle url() even though it is not allowed
-    #++
-
-    # Array of CSS files that have been loaded.
+     # Array of CSS files that have been loaded.
     attr_reader   :loaded_uris
 
     #attr_reader   :rules
@@ -199,7 +195,7 @@ module CssParser
       options = {:media_types => :all}.merge(options)
       media_types = options[:media_types]
 
-      in_declarations = false
+      in_declarations = 0
 
       block_depth = 0
 
@@ -219,13 +215,25 @@ module CssParser
           in_string = !in_string
         end       
 
-        if in_declarations
+        if in_declarations > 0
+
+          # too deep, malformed declaration block
+          if in_declarations > 1
+            in_declarations -= 1 if token =~ /\}/
+            next
+          end
+          
+          if token =~ /\{/
+            in_declarations += 1
+            next
+          end
+        
           current_declarations += token
 
           if token =~ /\}/ and not in_string
             current_declarations.gsub!(/\}[\s]*$/, '')
             
-            in_declarations = false
+            in_declarations -= 1
 
             unless current_declarations.strip.empty?
               #puts "SAVING #{current_selectors} -> #{current_declarations}"
@@ -257,7 +265,7 @@ module CssParser
             if token =~ /\{/ and not in_string
               current_selectors.gsub!(/^[\s]*/, '')
               current_selectors.gsub!(/[\s]*$/, '')
-              in_declarations = true
+              in_declarations += 1
             else
               current_selectors += token
             end
@@ -267,13 +275,18 @@ module CssParser
     end
 
     # Load a remote CSS file.
+    #
+    # You can also pass in file://test.css
     def load_uri!(uri, base_uri = nil, media_types = :all)
+      uri = URI.parse(uri) unless uri.respond_to? :scheme
+      if uri.scheme == 'file' or uri.scheme.nil?
+        uri.path = File.expand_path(uri.path)
+        uri.scheme = 'file'
+      end
       base_uri = uri if base_uri.nil?
 
       src, charset = read_remote_file(uri)
-      unless src.empty?
-        add_block!(src, {:media_types => media_types, :base_uri => base_uri})
-      end
+      add_block!(src, {:media_types => media_types, :base_uri => base_uri})
     end
     
     # Load a local CSS file.
@@ -321,27 +334,51 @@ module CssParser
 
       @loaded_uris << uri.to_s
 
-      begin
-      #fh = open(uri, 'rb')
-        fh = open(uri, 'rb', 'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip')
+      src = '', charset = nil
 
-        if fh.content_encoding.include?('gzip')
-          remote_src = Zlib::GzipReader.new(fh).read
+      begin
+        uri = URI.parse(uri.to_s)    
+        http = Net::HTTP.new(uri.host, uri.port)
+
+        if uri.scheme == 'file'
+          # local file
+          fh = open(uri.path, 'rb')
+          src = fh.read
+          fh.close
         else
-          remote_src = fh.read
-        end
+          # remote file
+          if uri.scheme == 'https'
+            http.use_ssl = true 
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
 
-        #puts "reading #{uri} (#{fh.charset})"
+          res, src = http.get(uri.path, {'User-Agent' => USER_AGENT, 'Accept-Encoding' => 'gzip'})
+          charset = fh.respond_to?(:charset) ? fh.charset : 'utf-8'
 
-        ic = Iconv.new('UTF-8//IGNORE', fh.charset)
-        src = ic.iconv(remote_src)
+          if res.code.to_i >= 400
+            raise RemoteFileError if @options[:io_exceptions]
+            return '', nil
+          end
 
-        fh.close
-        return src, fh.charset
-      rescue Exception => e
+          case res['content-encoding']
+            when 'gzip'
+              io = Zlib::GzipReader.new(StringIO.new(res.body))
+              src = io.read
+            when 'deflate'
+              io = Zlib::Inflate.new
+              src = io.inflate(res.body)
+          end
+        end
+
+        if charset
+          ic = Iconv.new('UTF-8//IGNORE', charset)
+          src = ic.iconv(src)
+        end
+      rescue
         raise RemoteFileError if @options[:io_exceptions]
-        return '', nil
       end
+
+      return src, charset  
     end
 
   private

data/lib/css_parser.rb

@@ -1,11 +1,13 @@
 require 'uri'
+require 'net/https'
 require 'open-uri'
 require 'digest/md5'
 require 'zlib'
+require 'stringio'
 require 'iconv'
 
 module CssParser
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   # 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/test/test_css_parser_loading.rb

@@ -11,10 +11,10 @@ class CssParserLoadingTests < Test::Unit::TestCase
 
     @uri_base = 'http://localhost:12000'
 
-    www_root = File.dirname(__FILE__) + '/fixtures/'
+    @www_root = File.dirname(__FILE__) + '/fixtures/'
 
     @server_thread = Thread.new do
-      s = WEBrick::HTTPServer.new(:Port => 12000, :DocumentRoot => www_root, :Logger => Log.new(nil, BasicLog::FATAL), :AccessLog => [])
+      s = WEBrick::HTTPServer.new(:Port => 12000, :DocumentRoot => @www_root, :Logger => Log.new(nil, BasicLog::FATAL), :AccessLog => [])
       @port = s.config[:Port]
       begin
         s.start
@@ -25,24 +25,38 @@ class CssParserLoadingTests < Test::Unit::TestCase
 
     sleep 1 # ensure the server has time to load
   end
-
+ 
   def teardown
     @server_thread.kill
     @server_thread.join(5)
     @server_thread = nil
   end
-
+ 
   def test_loading_a_local_file
     file_name = File.dirname(__FILE__) + '/fixtures/simple.css'
     @cp.load_file!(file_name)
     assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
   end
 
+  def test_loading_a_local_file_with_scheme
+    file_name = 'file://' + File.dirname(__FILE__) + '/fixtures/simple.css'
+    @cp.load_uri!(file_name)
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
   def test_loading_a_remote_file
     @cp.load_uri!("#{@uri_base}/simple.css")
     assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
   end
 
+  # http://github.com/alexdunae/css_parser/issues#issue/4
+  def test_loading_a_remote_file_over_ssl
+    # TODO: test SSL locally
+    @cp.load_uri!("https://www.expresspardons.com/inc/screen.css")
+    assert_match /margin\: 0\;/, @cp.find_by_selector('body').join(' ')
+  end
+
+
   def test_following_at_import_rules_local
     base_dir = File.dirname(__FILE__) + '/fixtures'
     @cp.load_file!('import1.css', base_dir)

data/test/test_css_parser_misc.rb

@@ -83,7 +83,6 @@ class CssParserTests < Test::Unit::TestCase
   end
 
   def test_ignoring_malformed_declarations
-    flunk
     # dervived from http://www.w3.org/TR/CSS21/syndata.html#parsing-errors
     css = <<-EOT
       p { color:green }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css_parser
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Alex Dunae
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -07:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: []