css_parser 1.2.6 → 1.3.0

data/lib/css_parser.rb

@@ -24,8 +24,9 @@ module CssParser
   # If no specificity is explicitly set and the RuleSet has *one* selector, 
   # the specificity is calculated using that selector.
   #
-  # If no selectors or multiple selectors are present, the specificity is 
-  # treated as 0.
+  # If no selectors the specificity is treated as 0.
+  #
+  # If multiple selectors are present then the greatest specificity is used.
   #
   # ==== Example #1
   #   rs1 = RuleSet.new(nil, 'color: black;')
@@ -67,10 +68,10 @@ module CssParser
       
       specificity = rule_set.specificity
       unless specificity
-        if rule_set.selectors.length == 1
-          specificity = calculate_specificity(rule_set.selectors[0])
-        else
+        if rule_set.selectors.length == 0
           specificity = 0
+        else
+          specificity = rule_set.selectors.map { |s| calculate_specificity(s) }.compact.max || 0
         end
       end
 

data/lib/css_parser/parser.rb

@@ -73,6 +73,20 @@ module CssParser
     end
     alias_method :[], :find_by_selector
 
+    # Finds the rule sets that match the given selectors
+    def find_rule_sets(selectors, media_types = :all)
+      rule_sets = []
+
+      selectors.each do |selector|
+        each_rule_set(media_types) do |rule_set|
+          if !rule_sets.member?(rule_set) && rule_set.selectors.member?(selector)
+            rule_sets << rule_set
+          end
+        end
+      end
+
+      rule_sets
+    end
 
     # Add a raw block of CSS.
     #
@@ -356,6 +370,11 @@ module CssParser
       add_block!(src, {:media_types => media_types, :base_dir => base_dir})
     end
     
+    # Load a local CSS string.
+    def load_string!(src, base_dir = nil, media_types = :all)
+      add_block!(src, {:media_types => media_types, :base_dir => base_dir})
+    end
+    
     
 
   protected

data/lib/css_parser/regexps.rb

@@ -22,6 +22,7 @@ module CssParser
 
   RE_URI = Regexp.new('(url\([\s]*([\s]*' + RE_STRING.to_s + '[\s]*)[\s]*\))|(url\([\s]*([!#$%&*\-~]|' + RE_NON_ASCII.to_s + '|' + RE_ESCAPE.to_s + ')*[\s]*)\)', Regexp::IGNORECASE | Regexp::EXTENDED  | Regexp::MULTILINE, 'n')
   URI_RX = /url\(("([^"]*)"|'([^']*)'|([^)]*))\)/im
+  RE_GRADIENT = /[a-z\-]*gradient\([a-z ,#%0-9\(\)]*\)$/im
 
   # Initial parsing
   RE_AT_IMPORT_RULE = /\@import[\s]+(url\()?["''"]?(.[^'"\s"']*)["''"]?\)?([\w\s\,^\])]*)\)?;?/

data/lib/css_parser/rule_set.rb

@@ -22,7 +22,6 @@ module CssParser
       parse_declarations!(block)
     end
 
-
     # Get the value of a property
     def get_value(property)
       return '' unless property and not property.empty?
@@ -118,7 +117,7 @@ module CssParser
     # Return the CSS rule set as a string.
     def to_s
       decs = declarations_to_s
-      "#{@selectors.join} { #{decs} }"
+      "#{@selectors.join(',')} { #{decs} }"
     end
 
     # Split shorthand declarations (e.g. +margin+ or +font+) into their constituent parts.
@@ -146,7 +145,7 @@ module CssParser
         end
       end
 
-      split_declaration('background', 'background-image', value.slice!(Regexp.union(CssParser::URI_RX, /none/i)))
+      split_declaration('background', 'background-image', value.slice!(Regexp.union(CssParser::URI_RX, CssParser::RE_GRADIENT, /none/i)))
       split_declaration('background', 'background-attachment', value.slice!(CssParser::RE_SCROLL_FIXED))
       split_declaration('background', 'background-repeat', value.slice!(CssParser::RE_REPEAT))
       split_declaration('background', 'background-color', value.slice!(CssParser::RE_COLOUR))
@@ -480,7 +479,7 @@ module CssParser
     # TODO: way too simplistic
     #++
     def parse_selectors!(selectors) # :nodoc:
-      @selectors = selectors.split(',') 
+      @selectors = selectors.split(',').map { |s| s.strip }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2160264060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,63 +21,27 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  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
+  version_requirements: !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: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/css_parser.rb
 - lib/css_parser/parser.rb
 - lib/css_parser/regexps.rb
 - lib/css_parser/rule_set.rb
-- test/fixtures/import-circular-reference.css
-- test/fixtures/import-with-media-types.css
-- test/fixtures/import1.css
-- test/fixtures/simple.css
-- test/fixtures/subdir/import2.css
-- test/test_css_parser_basic.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
-- test/test_helper.rb
-- test/test_merging.rb
-- test/test_rule_set.rb
-- test/test_rule_set_creating_shorthand.rb
-- test/test_rule_set_expanding_shorthand.rb
+- lib/css_parser.rb
 homepage: https://github.com/alexdunae/css_parser
-licenses: []
+licenses:
+- MIT
 post_install_message: 
-rdoc_options:
-- --all
-- --inline-source
-- --line-numbers
-- --charset
-- utf-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -86,26 +50,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3425931588029901136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3425931588029901136
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby CSS parser.
-test_files:
-- test/test_css_parser_basic.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
-- test/test_helper.rb
-- test/test_merging.rb
-- test/test_rule_set.rb
-- test/test_rule_set_creating_shorthand.rb
-- test/test_rule_set_expanding_shorthand.rb
+test_files: []

data/test/fixtures/import-circular-reference.css

@@ -1,4 +0,0 @@
-@import "import-circular-reference.css";
-
-body { color: black; background: white; }
-p { margin: 0px; }

data/test/fixtures/import-with-media-types.css

@@ -1,3 +0,0 @@
-@import "simple.css" print, tv, screen;
-
-div { color: lime; }

data/test/fixtures/import1.css

@@ -1,3 +0,0 @@
-@import 'subdir/import2.css';
-
-div { color: lime; }

data/test/fixtures/simple.css

@@ -1,6 +0,0 @@
-body {
-	color: black;
-	background: white;
-}
-
-p { margin: 0px; }

data/test/fixtures/subdir/import2.css

@@ -1,3 +0,0 @@
-@import "../simple.css";
-
-a { text-decoration: none; }

data/test/test_css_parser_basic.rb

@@ -1,64 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-# Test cases for reading and generating CSS shorthand properties
-class CssParserBasicTests < Test::Unit::TestCase
-  include CssParser
-
-  def setup
-    @cp = CssParser::Parser.new
-    @css = <<-EOT
-      html, body, p { margin: 0px; }
-      p { padding: 0px; }
-      #content { font: 12px/normal sans-serif; }
-      .content { color: red; }
-    EOT
-  end
-
-  def test_finding_by_selector
-    @cp.add_block!(@css)
-    assert_equal 'margin: 0px;', @cp.find_by_selector('body').join(' ')
-    assert_equal 'margin: 0px; padding: 0px;', @cp.find_by_selector('p').join(' ')
-    assert_equal 'font: 12px/normal sans-serif;', @cp.find_by_selector('#content').join(' ')
-    assert_equal 'color: red;', @cp.find_by_selector('.content').join(' ')
-  end
-
-  def test_adding_block
-    @cp.add_block!(@css)
-    assert_equal 'margin: 0px;', @cp.find_by_selector('body').join
-  end
-
-  def test_adding_block_without_closing_brace
-    @cp.add_block!('p { color: red;')
-    assert_equal 'color: red;', @cp.find_by_selector('p').join
-  end
-
-  def test_adding_a_rule
-    @cp.add_rule!('div', 'color: blue;')
-    assert_equal 'color: blue;', @cp.find_by_selector('div').join(' ')
-  end
-
-  def test_adding_a_rule_set
-    rs = CssParser::RuleSet.new('div', 'color: blue;')
-    @cp.add_rule_set!(rs)
-    assert_equal 'color: blue;', @cp.find_by_selector('div').join(' ')
-  end
-
-  def test_toggling_uri_conversion
-    # with conversion
-    cp_with_conversion = Parser.new(:absolute_paths => true)
-    cp_with_conversion.add_block!("body { background: url('../style/yellow.png?abc=123') };",
-                                  :base_uri => 'http://example.org/style/basic.css')
-
-    assert_equal "background: url('http://example.org/style/yellow.png?abc=123');",
-                 cp_with_conversion['body'].join(' ')
-    
-    # without conversion
-    cp_without_conversion = Parser.new(:absolute_paths => false)
-    cp_without_conversion.add_block!("body { background: url('../style/yellow.png?abc=123') };",
-                                     :base_uri => 'http://example.org/style/basic.css')
-
-    assert_equal "background: url('../style/yellow.png?abc=123');",
-                 cp_without_conversion['body'].join(' ')
-  end
-
-end

data/test/test_css_parser_loading.rb

@@ -1,146 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-# Test cases for the CssParser's loading functions.
-class CssParserLoadingTests < Test::Unit::TestCase
-  include CssParser
-  include WEBrick
-
-  def setup
-    # from http://nullref.se/blog/2006/5/17/testing-with-webrick
-    @cp = Parser.new
-
-    @uri_base = 'http://localhost:12000'
-
-    @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 => [])
-      @port = s.config[:Port]
-      begin
-        s.start
-      ensure
-        s.shutdown
-      end
-    end
-
-    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.expand_path(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://dialect.ca/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)
-
-    # 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'
-    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_badly_escaped_import_rules
-    css_block = '@import "http://example.com/css?family=Droid+Sans:regular,bold|Droid+Serif:regular,italic,bold,bolditalic&subset=latin";'
-
-    assert_nothing_raised do
-      @cp.add_block!(css_block, :base_uri => "#{@uri_base}/subdir/")
-    end
-  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")
-    
-    # from simple.css with :screen media type
-    assert_equal 'margin: 0px;', @cp.find_by_selector('p', :screen).join(' ')
-    assert_equal '', @cp.find_by_selector('p', :tty).join(' ')
-  end
-
-  def test_local_circular_reference_exception
-    assert_raise CircularReferenceError do
-      @cp.load_file!(File.dirname(__FILE__) + '/fixtures/import-circular-reference.css')
-    end
-  end
-
-  def test_remote_circular_reference_exception
-    assert_raise CircularReferenceError do
-      @cp.load_uri!("#{@uri_base}/import-circular-reference.css")
-    end
-  end
-
-  def test_suppressing_circular_reference_exceptions
-    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
-    cp_with_exceptions = Parser.new(:io_exceptions => true)
-
-    assert_raise RemoteFileError do
-      cp_with_exceptions.load_uri!("#{@uri_base}/no-exist.xyz")
-    end
-
-    cp_without_exceptions = Parser.new(:io_exceptions => false)
-
-    assert_nothing_raised RemoteFileError do
-      cp_without_exceptions.load_uri!("#{@uri_base}/no-exist.xyz")
-    end
-  end
-
-end