css_parser 1.0.1 → 1.1.1

data/lib/css_parser.rb

@@ -1,13 +1,12 @@
-$:.unshift File.dirname(__FILE__)
 require 'uri'
+require 'open-uri'
 require 'digest/md5'
 require 'zlib'
 require 'iconv'
-require 'css_parser/rule_set'
-require 'css_parser/regexps'
-require 'css_parser/parser'
 
 module CssParser
+  VERSION = '1.1.1'
+
   # 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).
   #
@@ -146,4 +145,8 @@ module CssParser
     end
     out
   end
-end
+end
+
+require File.dirname(__FILE__) + '/css_parser/rule_set'
+require File.dirname(__FILE__) + '/css_parser/regexps'
+require File.dirname(__FILE__) + '/css_parser/parser'

data/lib/css_parser/parser.rb

@@ -15,13 +15,13 @@ module CssParser
   # [<tt>import</tt>] Follow <tt>@import</tt> rules. Boolean, default is <tt>true</tt>.
   # [<tt>io_exceptions</tt>] Throw an exception if a link can not be found. Boolean, default is <tt>true</tt>.
   class Parser
-    USER_AGENT   = "Ruby CSS Parser/#{RUBY_VERSION} (http://code.dunae.ca/css_parser/)"
+    USER_AGENT   = "Ruby CSS Parser/#{CssParser::VERSION} (http://github.com/alexdunae/css_parser)"
 
     STRIP_CSS_COMMENTS_RX = /\/\*.*?\*\//m
     STRIP_HTML_COMMENTS_RX = /\<\!\-\-|\-\-\>/m
 
     # Initial parsing
-    RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["']+(.[^'"]*)["']\)?([\w\s\,]*);?/i
+    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
@@ -82,6 +82,9 @@ module CssParser
 
     # Add a raw block of CSS.
     #
+    # In order to follow +@import+ rules you must supply either a
+    # +:base_dir+ or +:base_uri+ option.
+    #
     # ==== Example
     #   css = <<-EOT
     #     body { font-size: 10pt }
@@ -92,21 +95,42 @@ module CssParser
     #   EOT
     #
     #   parser = CssParser::Parser.new
-    #   parser.load_css!(css)
+    #   parser.add_block!(css)
     #--
     # TODO: add media_type
     #++
     def add_block!(block, options = {})
-      options = {:base_uri => nil, :charset => nil, :media_types => :all}.merge(options)
+      options = {:base_uri => nil, :base_dir => nil, :charset => nil, :media_types => :all}.merge(options)
       
       block = cleanup_block(block)
 
       if options[:base_uri] and @options[:absolute_paths]
         block = CssParser.convert_uris(block, options[:base_uri])
       end
+
+      # Load @imported CSS
+      block.scan(RE_AT_IMPORT_RULE).each do |import_rule|        
+        media_types = []
+        if media_string = import_rule[-1]
+          media_string.split(/\s|\,/).each do |t|
+            media_types << t.to_sym unless t.empty?
+          end
+        end
+
+        import_path = import_rule[0].to_s.gsub(/['"]*/, '').strip
+        
+        if options[:base_uri]
+          import_uri = URI.parse(options[:base_uri].to_s).merge(import_path)
+          load_uri!(import_uri, options[:base_uri], media_types)
+        elsif options[:base_dir]
+          load_file!(import_path, options[:base_dir], media_types)
+        end     
+      end
+
+      # Remove @import declarations
+      block.gsub!(RE_AT_IMPORT_RULE, '')
       
       parse_block_into_rule_sets!(block, options)
-      
     end
 
     # Add a CSS rule by setting the +selectors+, +declarations+ and +media_types+.
@@ -245,33 +269,25 @@ module CssParser
     # Load a remote CSS file.
     def load_uri!(uri, base_uri = nil, media_types = :all)
       base_uri = uri if base_uri.nil?
-      src, charset = read_remote_file(uri)
-
-      # Load @imported CSS
-      src.scan(RE_AT_IMPORT_RULE).each do |import_rule|        
-        import_path = import_rule[1].to_s.gsub(/['"]*/, '').strip
-        import_uri = URI.parse(base_uri.to_s).merge(import_path)
-        #puts import_uri.to_s
 
-        media_types = []
-        if media_string = import_rule[import_rule.length-1]
-          media_string.split(/\s|\,/).each do |t|
-            media_types << t.to_sym unless t.empty?
-          end
-        end
-
-        # Recurse
-        load_uri!(import_uri, nil, media_types)
+      src, charset = read_remote_file(uri)
+      unless src.empty?
+        add_block!(src, {:media_types => media_types, :base_uri => base_uri})
       end
+    end
+    
+    # Load a local CSS file.
+    def load_file!(file_name, base_dir = nil, media_types = :all)
+      file_name = File.expand_path(file_name, base_dir)
+      return unless File.readable?(file_name)
 
-      # Remove @import declarations
-      src.gsub!(RE_AT_IMPORT_RULE, '')
-
-      # Relative paths need to be converted here
-      src = CssParser.convert_uris(src, base_uri) if base_uri and @options[:absolute_paths]
+      src = IO.read(file_name)
+      base_dir = File.dirname(file_name)
 
-      add_block!(src, {:media_types => media_types})
+      add_block!(src, {:media_types => media_types, :base_dir => base_dir})
     end
+    
+    
 
   protected
     # Strip comments and clean up blank lines from a block of CSS.
@@ -298,7 +314,11 @@ module CssParser
     # TODO: add option to fail silently or throw and exception on a 404
     #++
     def read_remote_file(uri) # :nodoc:
-      raise CircularReferenceError, "can't load #{uri.to_s} more than once" if @loaded_uris.include?(uri.to_s)
+      if @loaded_uris.include?(uri.to_s)
+        raise CircularReferenceError, "can't load #{uri.to_s} more than once" if @options[:io_exceptions]
+        return '', nil
+      end
+
       @loaded_uris << uri.to_s
 
       begin
@@ -318,7 +338,7 @@ module CssParser
 
         fh.close
         return src, fh.charset
-      rescue
+      rescue Exception => e
         raise RemoteFileError if @options[:io_exceptions]
         return '', nil
       end
@@ -342,4 +362,4 @@ module CssParser
       @css_warnings = []
     end
   end
-end
+end

data/lib/css_parser/regexps.rb

@@ -16,7 +16,7 @@ module CssParser
   URI_RX = /url\(("([^"]*)"|'([^']*)'|([^)]*))\)/im
 
   # Initial parsing
-  RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["']+(.[^'"]*)["']\)?([\w\s\,]*);?/i
+  RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["''"]?(.[^'"\s"']*)["''"]?\)?([\w\s\,^\])]*)\)?;?/
   
   #--
   #RE_AT_MEDIA_RULE = Regexp.new('(\"(.[^\n\r\f\\"]*|\\\\' + RE_NL.to_s + '|' + RE_ESCAPE.to_s + ')*\")')

data/lib/css_parser/rule_set.rb

@@ -84,7 +84,7 @@ module CssParser
 
     # Iterate through declarations.
     def each_declaration # :yields: property, value, is_important
-      decs = @declarations.sort { |a,b| a[1][:order].nil? || b[1][:order].nil? ? 1 : a[1][:order] <=> b[1][:order] }
+      decs = @declarations.sort { |a,b| a[1][:order].nil? || b[1][:order].nil? ? 0 : a[1][:order] <=> b[1][:order] }
       decs.each do |property, data|
         value = data[:value]
         yield property.downcase.strip, value.strip, data[:is_important]
@@ -98,8 +98,10 @@ module CssParser
     def declarations_to_s(options = {})
      options = {:force_important => false}.merge(options)
      str = ''
-     importance = options[:force_important] ? ' !important' : ''
-     each_declaration { |prop, val| str += "#{prop}: #{val}#{importance}; " }
+     each_declaration do |prop, val, is_important|
+       importance = (options[:force_important] || is_important) ? ' !important' : ''
+       str += "#{prop}: #{val}#{importance}; "
+     end
      str.gsub(/^[\s]+|[\n\r\f\t]*|[\s]+$/mx, '').strip
     end
 

data/test/{test_css_parser_downloading.rb → test_css_parser_loading.rb}

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-# Test cases for the CssParser's downloading functions.
-class CssParserDownloadingTests < Test::Unit::TestCase
+# Test cases for the CssParser's loading functions.
+class CssParserLoadingTests < Test::Unit::TestCase
   include CssParser
   include WEBrick
 
@@ -14,7 +14,7 @@ class CssParserDownloadingTests < Test::Unit::TestCase
     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::ERROR), :AccessLog => [])
+      s = WEBrick::HTTPServer.new(:Port => 12000, :DocumentRoot => www_root, :Logger => Log.new(nil, BasicLog::FATAL), :AccessLog => [])
       @port = s.config[:Port]
       begin
         s.start
@@ -32,12 +32,32 @@ class CssParserDownloadingTests < Test::Unit::TestCase
     @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_remote_file
     @cp.load_uri!("#{@uri_base}/simple.css")
     assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
   end
 
-  def test_following_at_import_rules
+  def test_following_at_import_rules_local
+    base_dir = File.dirname(__FILE__) + '/fixtures'
+    @cp.load_file!('import1.css', base_dir)
+
+    # from '/import1.css'
+    assert_equal 'color: lime;', @cp.find_by_selector('div').join(' ')
+
+    # from '/subdir/import2.css'
+    assert_equal 'text-decoration: none;', @cp.find_by_selector('a').join(' ')
+    
+    # from '/subdir/../simple.css'
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
+  def test_following_at_import_rules_remote
     @cp.load_uri!("#{@uri_base}/import1.css")
 
     # from '/import1.css'
@@ -50,6 +70,15 @@ class CssParserDownloadingTests < Test::Unit::TestCase
     assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
   end
 
+  def test_following_at_import_rules_from_add_block
+    css_block = '@import "../simple.css";'
+ 
+    @cp.add_block!(css_block, :base_uri => "#{@uri_base}/subdir/")
+    
+    # from 'simple.css'
+    assert_equal 'margin: 0px;', @cp.find_by_selector('p').join(' ')
+  end
+
   def test_importing_with_media_types
     @cp.load_uri!("#{@uri_base}/import-with-media-types.css")
     
@@ -62,6 +91,21 @@ class CssParserDownloadingTests < Test::Unit::TestCase
     assert_raise CircularReferenceError do
       @cp.load_uri!("#{@uri_base}/import-circular-reference.css")
     end
+
+    cp_without_exceptions = Parser.new(:io_exceptions => false)
+
+    assert_nothing_raised CircularReferenceError do
+      cp_without_exceptions.load_uri!("#{@uri_base}/import-circular-reference.css")
+    end
+    
+  end
+
+  def test_toggling_circular_reference_exception
+    cp_without_exceptions = Parser.new(:io_exceptions => false)
+
+    assert_nothing_raised CircularReferenceError do
+      cp_without_exceptions.load_uri!("#{@uri_base}/import-circular-reference.css")
+    end
   end
 
   def test_toggling_not_found_exceptions

data/test/test_helper.rb

@@ -1,8 +1,6 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../'))
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__), '../lib/'))
 require 'rubygems'
 require 'test/unit'
-require 'css_parser'
 require 'net/http'
 require 'open-uri'
 require 'WEBrick'
+require File.dirname(__FILE__) + '/../lib/css_parser'

data/test/test_rule_set.rb

@@ -75,6 +75,12 @@ class RuleSetTests < Test::Unit::TestCase
     assert_equal(declarations.split(' ').sort, rs.declarations_to_s.split(' ').sort)
   end
 
+  def test_important_declarations_to_s
+    declarations = 'color: #fff; font-weight: bold !important;'
+    rs = RuleSet.new('#content p, a', declarations)
+    assert_equal(declarations.split(' ').sort, rs.declarations_to_s.split(' ').sort)
+  end
+
   def test_overriding_specificity
     rs = RuleSet.new('#content p, a', 'color: white', 1000)
     rs.each_selector do |sel, decs, spec|

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: css_parser
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  hash: 17
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Alex Dunae
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 -08:00
+date: 2010-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +38,7 @@ files:
 - test/fixtures/simple.css
 - test/fixtures/subdir/import2.css
 - test/test_css_parser_basic.rb
-- test/test_css_parser_downloading.rb
+- test/test_css_parser_loading.rb
 - test/test_css_parser_media_types.rb
 - test/test_css_parser_misc.rb
 - test/test_css_parser_regexps.rb
@@ -55,27 +61,33 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby CSS parser.
 test_files: 
 - test/test_css_parser_basic.rb
-- test/test_css_parser_downloading.rb
+- test/test_css_parser_loading.rb
 - test/test_css_parser_media_types.rb
 - test/test_css_parser_misc.rb
 - test/test_css_parser_regexps.rb