css_parser 1.2.2 → 3.0.0

data/lib/css_parser/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module CssParser
+  VERSION = '3.0.0'.freeze
+end

data/lib/css_parser.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 require 'uri'
 require 'net/https'
-require 'open-uri'
 require 'digest/md5'
-require 'zlib'
-require 'stringio'
-require 'iconv'
+require 'ssrf_filter'
 
-module CssParser
-  VERSION = '1.2.2'
+require 'css_parser/version'
+require 'css_parser/rule_set'
+require 'css_parser/regexps'
+require 'css_parser/parser'
 
-  # Merge multiple CSS RuleSets by cascading according to the CSS 2.1 cascading rules 
+module CssParser
+  # 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.
@@ -18,14 +20,15 @@ module CssParser
   # Returns a RuleSet.
   #
   # ==== Cascading
-  # If a RuleSet object has its +specificity+ defined, that specificity is 
-  # used in the cascade calculations.  
+  # If a RuleSet object has its +specificity+ defined, that specificity is
+  # used in the cascade calculations.
   #
-  # If no specificity is explicitly set and the RuleSet has *one* selector, 
+  # 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;')
@@ -47,14 +50,12 @@ module CssParser
   #--
   # TODO: declaration_hashes should be able to contain a RuleSet
   #       this should be a Class method
-  def CssParser.merge(*rule_sets)
-    @folded_declaration_cache = {}
-
+  def self.merge(*rule_sets)
     # in case called like CssParser.merge([rule_set, rule_set])
-    rule_sets.flatten! if rule_sets[0].kind_of?(Array)
-    
-    unless rule_sets.all? {|rs| rs.kind_of?(CssParser::RuleSet)}
-      raise ArgumentError, "all parameters must be CssParser::RuleSets."
+    rule_sets.flatten! if rule_sets[0].is_a?(Array)
+
+    unless rule_sets.all?(CssParser::RuleSet)
+      raise ArgumentError, 'all parameters must be CssParser::RuleSets.'
     end
 
     return rule_sets[0] if rule_sets.length == 1
@@ -64,38 +65,29 @@ module CssParser
 
     rule_sets.each do |rule_set|
       rule_set.expand_shorthand!
-      
+
       specificity = rule_set.specificity
-      unless specificity
-        if rule_set.selectors.length == 1
-          specificity = calculate_specificity(rule_set.selectors[0])
-        else
-          specificity = 0
-        end
-      end
+      specificity ||= rule_set.selectors.filter_map { |s| calculate_specificity(s) }.max || 0
 
       rule_set.each_declaration do |property, value, is_important|
         # Add the property to the list to be folded per http://www.w3.org/TR/CSS21/cascade.html#cascading-order
-        if not properties.has_key?(property)
-          properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}
-        elsif is_important and not properties[property][:is_important]
-          properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}      
-        elsif properties[property][:specificity] < specificity or properties[property][:specificity] == specificity
+        if !properties.key?(property)
+          properties[property] = {value: value, specificity: specificity, is_important: is_important}
+        elsif is_important
+          if !properties[property][:is_important] || properties[property][:specificity] <= specificity
+            properties[property] = {value: value, specificity: specificity, is_important: is_important}
+          end
+        elsif properties[property][:specificity] < specificity || properties[property][:specificity] == specificity
           unless properties[property][:is_important]
-            properties[property] = {:value => value, :specificity => specificity, :is_important => is_important}            
+            properties[property] = {value: value, specificity: specificity, is_important: is_important}
           end
         end
-     end
+      end
     end
 
-    merged = RuleSet.new(nil, nil)
-
-    properties.each do |property, details|
-      if details[:is_important]
-        merged[property.strip] = details[:value].strip.gsub(/\;\Z/, '') + '!important' 
-      else
-        merged[property.strip] = details[:value].strip
-      end
+    merged = properties.each_with_object(RuleSet.new(nil, nil)) do |(property, details), rule_set|
+      value = details[:value].strip
+      rule_set[property.strip] = details[:is_important] ? "#{value.gsub(/;\Z/, '')}!important" : value
     end
 
     merged.create_shorthand!
@@ -113,15 +105,15 @@ module CssParser
   #--
   # Thanks to Rafael Salazar and Nick Fitzsimons on the css-discuss list for their help.
   #++
-  def CssParser.calculate_specificity(selector)
+  def self.calculate_specificity(selector)
     a = 0
-    b = selector.scan(/\#/).length
-    c = selector.scan(NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX).length
-    d = selector.scan(ELEMENTS_AND_PSEUDO_ELEMENTS_RX).length
+    b = selector.scan('#').length
+    c = selector.scan(NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX_NC).length
+    d = selector.scan(ELEMENTS_AND_PSEUDO_ELEMENTS_RX_NC).length
 
-    (a.to_s + b.to_s + c.to_s + d.to_s).to_i
+    "#{a}#{b}#{c}#{d}".to_i
   rescue
-    return 0
+    0
   end
 
   # Make <tt>url()</tt> links absolute.
@@ -134,26 +126,30 @@ module CssParser
   # Returns a string.
   #
   # ==== Example
-  #  CssParser.convert_uris("body { background: url('../style/yellow.png?abc=123') };", 
+  #  CssParser.convert_uris("body { background: url('../style/yellow.png?abc=123') };",
   #               "http://example.org/style/basic.css").inspect
   #  => "body { background: url('http://example.org/style/yellow.png?abc=123') };"
   def self.convert_uris(css, base_uri)
-    base_uri = Addressable::URI.parse(base_uri) unless base_uri.kind_of?(Addressable::URI)
+    base_uri = Addressable::URI.parse(base_uri) unless base_uri.is_a?(Addressable::URI)
 
     css.gsub(URI_RX) do
-      uri = $1.to_s
-      uri.gsub!(/["']+/, '')
+      uri = Regexp.last_match(1).to_s.gsub(/["']+/, '')
       # Don't process URLs that are already absolute
-      unless uri =~ /^[a-z]+\:\/\//i
+      unless uri.match?(%r{^[a-z]+://}i)
         begin
-          uri = base_uri + uri
-        rescue; end
+          uri = base_uri.join(uri)
+        rescue
+          nil
+        end
       end
-      "url('#{uri.to_s}')"
+      "url('#{uri}')"
     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'
+  def self.sanitize_media_query(raw)
+    mq = raw.to_s.gsub(/\s+/, ' ')
+    mq.strip!
+    mq = 'all' if mq.empty?
+    mq.to_sym
+  end
+end

metadata

@@ -1,89 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors:
 - Alex Dunae
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &2155990880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155990880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ssrf_filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: A set of classes for parsing CSS in Ruby.
 email: code@dunae.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
 - 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
-homepage: https://github.com/alexdunae/css_parser
-licenses: []
-post_install_message: 
-rdoc_options:
-- --all
-- --inline-source
-- --line-numbers
-- --charset
-- utf-8
+- lib/css_parser/version.rb
+homepage: https://github.com/premailer/css_parser
+licenses:
+- MIT
+metadata:
+  changelog_uri: https://github.com/premailer/css_parser/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/premailer/css_parser
+  bug_tracker_uri: https://github.com/premailer/css_parser/issues
+  rubygems_mfa_required: 'true'
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.5
-signing_key: 
-specification_version: 3
+rubygems_version: 4.0.3
+specification_version: 4
 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

data/test/test_css_parser_media_types.rb

@@ -1,106 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-# Test cases for the handling of media types
-class CssParserMediaTypesTests < Test::Unit::TestCase
-  include CssParser
-
-  def setup
-    @cp = Parser.new
-  end
-
-  def test_finding_by_media_type
-    # from http://www.w3.org/TR/CSS21/media.html#at-media-rule
-    css = <<-EOT
-      @media print {
-        body { font-size: 10pt }
-      }
-      @media screen {
-        body { font-size: 13px }
-      }
-      @media screen, print {
-        body { line-height: 1.2 }
-      }
-    EOT
-
-    @cp.add_block!(css)
-
-    assert_equal 'font-size: 10pt; line-height: 1.2;', @cp.find_by_selector('body', :print).join(' ')
-    assert_equal 'font-size: 13px; line-height: 1.2;', @cp.find_by_selector('body', :screen).join(' ')
-  end
-
-  def test_finding_by_multiple_media_types
-    css = <<-EOT
-      @media print {
-        body { font-size: 10pt }
-      }
-      @media handheld {
-        body { font-size: 13px }
-      }
-      @media screen, print {
-        body { line-height: 1.2 }
-      }
-    EOT
-    @cp.add_block!(css)
-
-    assert_equal 'font-size: 13px; line-height: 1.2;', @cp.find_by_selector('body', [:screen,:handheld]).join(' ')
-  end
-
-  def test_adding_block_with_media_types
-    css = <<-EOT
-      body { font-size: 10pt }
-    EOT
-
-    @cp.add_block!(css, :media_types => [:screen])
-    
-    assert_equal 'font-size: 10pt;', @cp.find_by_selector('body', :screen).join(' ')
-    assert @cp.find_by_selector('body', :handheld).empty?
-  end
-  
-  def test_adding_block_and_limiting_media_types1
-    css = <<-EOT
-      @import "import1.css", print
-    EOT
-    
-    base_dir = File.dirname(__FILE__)  + '/fixtures/'
-
-    @cp.add_block!(css, :only_media_types => :screen, :base_dir => base_dir)
-    assert @cp.find_by_selector('div').empty?
-
-  end
-  
-  def test_adding_block_and_limiting_media_types2
-    css = <<-EOT
-      @import "import1.css", print
-    EOT
-    
-    base_dir = File.dirname(__FILE__)  + '/fixtures/'
-
-    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
-    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
-  end  
-
-  def test_adding_block_and_limiting_media_types
-    css = <<-EOT
-      @import "import1.css"
-    EOT
-    
-    base_dir = File.dirname(__FILE__)  + '/fixtures/'
-
-    @cp.add_block!(css, :only_media_types => :print, :base_dir => base_dir)
-    assert_match 'color: lime', @cp.find_by_selector('div').join(' ')
-  end  
-
-
-  def test_adding_rule_set_with_media_type
-    @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
-    @cp.add_rule!('body', 'color: blue;', :screen)
-    assert_equal 'color: black;', @cp.find_by_selector('body', :handheld).join(' ')
-  end
-
-  def test_selecting_with_all_media_types
-    @cp.add_rule!('body', 'color: black;', [:handheld,:tty])
-    assert_equal 'color: black;', @cp.find_by_selector('body', :all).join(' ')
-  end
-
-
-end