css_parser 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3d5b5c79aede3d12a3344be3870321727fe767f6
-  data.tar.gz: 521049bab4d31bc8ae2540baee5915c055d34644
+SHA256:
+  metadata.gz: 66714382244cadbf112104868d94ff8b131ac4cf007deacac52d726bee1a9f9a
+  data.tar.gz: 8ac559b1fb982da00dfbef4188b3773d2a78637f4db26393aba7cf62287b7883
 SHA512:
-  metadata.gz: a833504d1b764b03ad05e1ded20dd7af5093905d40b0c4730c69317c434c26757380e485416db00921dbaadb7e21b342a801545d70f4643fa6e827554d9ab1af
-  data.tar.gz: 9ffb58947816d2b1daef923373da67c3f75944e52e7389b5fcc3547efbe9fd3b404c101a3973d013ce37cdb226ab429e6cfc1e6f41dfbf8ef5530f02ef03f7fa
+  metadata.gz: ba75d2e879d80cb7c854889990fd190f5c1fb664ed96b3a47ad78614a257d2ed7acfc3ba453ea34e87612636512305089c1a73d081c8a1c729a854217b17613e
+  data.tar.gz: ff49b36b1007ae8ce0ecbfd6a2e92536d16c46062898c0a3bae402bacdb731785d6e4b80b0d08e557fcf372f2b0da2d75629c471c8ed2ce59addd13629eda9b9

data/lib/css_parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'addressable/uri'
 require 'uri'
 require 'net/https'
@@ -122,10 +123,10 @@ module CssParser
   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
+    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
   end
@@ -160,7 +161,8 @@ module CssParser
   end
 
   def self.sanitize_media_query(raw)
-    mq = raw.to_s.gsub(/[\s]+/, ' ').strip
+    mq = raw.to_s.gsub(/[\s]+/, ' ')
+    mq.strip!
     mq = 'all' if mq.empty?
     mq.to_sym
   end

data/lib/css_parser/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CssParser
   # Exception class used for any errors encountered while downloading remote files.
   class RemoteFileError < IOError; end
@@ -184,7 +185,8 @@ module CssParser
     def add_rule_set!(ruleset, media_types = :all)
       raise ArgumentError unless ruleset.kind_of?(CssParser::RuleSet)
 
-      media_types = [media_types].flatten.collect { |mt| CssParser.sanitize_media_query(mt)}
+      media_types = [media_types] unless Array === media_types
+      media_types = media_types.flat_map { |mt| CssParser.sanitize_media_query(mt)}
 
       @rules << {:media_types => media_types, :rules => ruleset}
     end
@@ -242,6 +244,8 @@ module CssParser
     # +media_types+ can be a symbol or an array of symbols.
     # See RuleSet#each_selector for +options+.
     def each_selector(all_media_types = :all, options = {}) # :yields: selectors, declarations, specificity, media_types
+      return to_enum(:each_selector) unless block_given?
+
       each_rule_set(all_media_types) do |rule_set, media_types|
         rule_set.each_selector(options) do |selectors, declarations, specificity|
           yield selectors, declarations, specificity, media_types
@@ -251,7 +255,7 @@ module CssParser
 
     # Output all CSS rules as a single stylesheet.
     def to_s(which_media = :all)
-      out = ''
+      out = String.new
       styles_by_media_types = {}
       each_selector(which_media) do |selectors, declarations, specificity, media_types|
         media_types.each do |media_type|
@@ -262,17 +266,17 @@ module CssParser
 
       styles_by_media_types.each_pair do |media_type, media_styles|
         media_block = (media_type != :all)
-        out += "@media #{media_type} {\n" if media_block
+        out << "@media #{media_type} {\n" if media_block
 
         media_styles.each do |media_style|
           if media_block
-            out += "  #{media_style[0]} {\n    #{media_style[1]}\n  }\n"
+            out << "  #{media_style[0]} {\n    #{media_style[1]}\n  }\n"
           else
-            out += "#{media_style[0]} {\n#{media_style[1]}\n}\n"
+            out << "#{media_style[0]} {\n#{media_style[1]}\n}\n"
           end
         end
 
-        out += "}\n" if media_block
+        out << "}\n" if media_block
       end
 
       out
@@ -314,44 +318,43 @@ module CssParser
       in_at_media_rule = false
       in_media_block = false
 
-      current_selectors = ''
-      current_media_query = ''
-      current_declarations = ''
+      current_selectors = String.new
+      current_media_query = String.new
+      current_declarations = String.new
 
       # once we are in a rule, we will use this to store where we started if we are capturing offsets
       rule_start = nil
       offset = nil
 
-      block.scan(/(([\\]{2,})|([\\]?[{}\s"])|(.[^\s"{}\\]*))/) do |matches|
-        token = matches[0]
-
+      block.scan(/\s+|[\\]{2,}|[\\]?[{}\s"]|.[^\s"{}\\]*/) do |token|
         # save the regex offset so that we know where in the file we are
         offset = Regexp.last_match.offset(0) if options[:capture_offsets]
 
-        if token =~ /\A"/ # found un-escaped double quote
+        if token.start_with?('"') # found un-escaped double quote
           in_string = !in_string
         end
 
         if in_declarations > 0
           # too deep, malformed declaration block
           if in_declarations > 1
-            in_declarations -= 1 if token =~ /\}/
+            in_declarations -= 1 if token.include?('}')
             next
           end
 
-          if token =~ /\{/ and not in_string
+          if !in_string && token.include?('{')
             in_declarations += 1
             next
           end
 
-          current_declarations += token
+          current_declarations << token
 
-          if token =~ /\}/ and not in_string
+          if !in_string && token.include?('}')
             current_declarations.gsub!(/\}[\s]*$/, '')
 
             in_declarations -= 1
+            current_declarations.strip!
 
-            unless current_declarations.strip.empty?
+            unless current_declarations.empty?
               if options[:capture_offsets]
                 add_rule_with_offsets!(current_selectors, current_declarations, options[:filename], (rule_start..offset.last), current_media_queries)
               else
@@ -359,8 +362,8 @@ module CssParser
               end
             end
 
-            current_selectors = ''
-            current_declarations = ''
+            current_selectors = String.new
+            current_declarations = String.new
 
             # restart our search for selectors and declarations
             rule_start = nil if options[:capture_offsets]
@@ -370,26 +373,28 @@ module CssParser
           in_at_media_rule = true
           current_media_queries = []
         elsif in_at_media_rule
-          if token =~ /\{/
+          if token.include?('{')
             block_depth = block_depth + 1
             in_at_media_rule = false
             in_media_block = true
             current_media_queries << CssParser.sanitize_media_query(current_media_query)
-            current_media_query = ''
-          elsif token =~ /[,]/
+            current_media_query = String.new
+          elsif token.include?(',')
             # new media query begins
-            token.gsub!(/[,]/, ' ')
-            current_media_query += token.strip + ' '
+            token.tr!(',', ' ')
+            token.strip!
+            current_media_query << token << ' '
             current_media_queries << CssParser.sanitize_media_query(current_media_query)
-            current_media_query = ''
+            current_media_query = String.new
           else
-            current_media_query += token.strip + ' '
+            token.strip!
+            current_media_query << token << ' '
           end
         elsif in_charset or token =~ /@charset/i
           # iterate until we are out of the charset declaration
-          in_charset = (token =~ /;/ ? false : true)
+          in_charset = !token.include?(';')
         else
-          if token =~ /\}/ and not in_string
+          if !in_string && token.include?('}')
             block_depth = block_depth - 1
 
             # reset the current media query scope
@@ -398,12 +403,12 @@ module CssParser
               in_media_block = false
             end
           else
-            if token =~ /\{/ and not in_string
+            if !in_string && token.include?('{')
               current_selectors.strip!
               in_declarations += 1
             else
               # if we are in a selector, add the token to the current selectors
-              current_selectors += token
+              current_selectors << token
 
               # mark this as the beginning of the selector unless we have already marked it
               rule_start = offset.first if options[:capture_offsets] && rule_start.nil? && token =~ /^[^\s]+$/

data/lib/css_parser/regexps.rb

@@ -54,12 +54,12 @@ module CssParser
 
 
   # Patterns for specificity calculations
-  NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX= /
-    (\.[\w]+)                     # classes
+  NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX_NC= /
+    (?:\.[\w]+)                     # classes
     |
-    \[(\w+)                       # attributes
+    \[(?:\w+)                       # attributes
     |
-    (\:(                          # pseudo classes
+    (?:\:(?:                          # pseudo classes
       link|visited|active
       |hover|focus
       |lang
@@ -72,10 +72,10 @@ module CssParser
       |empty|contains
     ))
   /ix
-  ELEMENTS_AND_PSEUDO_ELEMENTS_RX = /
-    ((^|[\s\+\>\~]+)[\w]+       # elements
+  ELEMENTS_AND_PSEUDO_ELEMENTS_RX_NC = /
+    (?:(?:^|[\s\+\>\~]+)[\w]+       # elements
     |
-    \:{1,2}(                    # pseudo-elements
+    \:{1,2}(?:                    # pseudo-elements
       after|before
       |first-letter|first-line
       |selection

data/lib/css_parser/rule_set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module CssParser
   class RuleSet
     # Patterns for specificity calculations
@@ -6,6 +7,19 @@ module CssParser
 
     BACKGROUND_PROPERTIES = ['background-color', 'background-image', 'background-repeat', 'background-position', 'background-size', 'background-attachment']
     LIST_STYLE_PROPERTIES = ['list-style-type', 'list-style-position', 'list-style-image']
+    FONT_STYLE_PROPERTIES = ['font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', 'font-family']
+    BORDER_STYLE_PROPERTIES = ['border-width', 'border-style', 'border-color']
+    BORDER_PROPERTIES = ['border', 'border-left', 'border-right', 'border-top', 'border-bottom']
+
+    NUMBER_OF_DIMENSIONS = 4
+
+    DIMENSIONS = [
+      ['margin', %w(margin-top margin-right margin-bottom margin-left)],
+      ['padding', %w(padding-top padding-right padding-bottom padding-left)],
+      ['border-color', %w(border-top-color border-right-color border-bottom-color border-left-color)],
+      ['border-style', %w(border-top-style border-right-style border-bottom-style border-left-style)],
+      ['border-width', %w(border-top-width border-right-width border-bottom-width border-left-width)],
+    ]
 
     # Array of selector strings.
     attr_reader   :selectors
@@ -27,7 +41,7 @@ module CssParser
       return '' unless property and not property.empty?
 
       property = property.downcase.strip
-      properties = @declarations.inject('') do |val, (key, data)|
+      properties = @declarations.inject(String.new) do |val, (key, data)|
         #puts "COMPARING #{key} #{key.inspect} against #{property} #{property.inspect}"
         importance = data[:is_important] ? ' !important' : ''
         val << "#{data[:value]}#{importance}; " if key.downcase.strip == property
@@ -58,7 +72,8 @@ module CssParser
 
       value.gsub!(/;\Z/, '')
       is_important = !value.gsub!(CssParser::IMPORTANT_IN_PROPERTY_RX, '').nil?
-      property = property.downcase.strip
+      property = property.downcase
+      property.strip!
       #puts "SAVING #{property}  #{value} #{is_important.inspect}"
       @declarations[property] = {
         :value => value, :is_important => is_important, :order => @order += 1
@@ -105,13 +120,14 @@ module CssParser
     # TODO: Clean-up regexp doesn't seem to work
     #++
     def declarations_to_s(options = {})
-     options = {:force_important => false}.merge(options)
-     str = ''
-     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
+      str = String.new
+      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, '')
+      str.strip!
+      str
     end
 
     # Return the CSS rule set as a string.
@@ -164,7 +180,7 @@ module CssParser
     # Split shorthand border declarations (e.g. <tt>border: 1px red;</tt>)
     # Additional splitting happens in expand_dimensions_shorthand!
     def expand_border_shorthand! # :nodoc:
-      ['border', 'border-left', 'border-right', 'border-top', 'border-bottom'].each do |k|
+      BORDER_PROPERTIES.each do |k|
         next unless @declarations.has_key?(k)
 
         value = @declarations[k][:value]
@@ -180,14 +196,8 @@ module CssParser
     # Split shorthand dimensional declarations (e.g. <tt>margin: 0px auto;</tt>)
     # into their constituent parts.  Handles margin, padding, border-color, border-style and border-width.
     def expand_dimensions_shorthand! # :nodoc:
-      {'margin'       => 'margin-%s',
-       'padding'      => 'padding-%s',
-       'border-color' => 'border-%s-color',
-       'border-style' => 'border-%s-style',
-       'border-width' => 'border-%s-width'}.each do |property, expanded|
-
+      DIMENSIONS.each do |property, (top, right, bottom, left)|
         next unless @declarations.has_key?(property)
-
         value = @declarations[property][:value]
 
         # RGB and HSL values in borders are the only units that can have spaces (within params).
@@ -199,29 +209,24 @@ module CssParser
 
         matches = value.strip.split(/\s+/)
 
-        t, r, b, l = nil
-
         case matches.length
-          when 1
-            t, r, b, l = matches[0], matches[0], matches[0], matches[0]
-          when 2
-            t, b = matches[0], matches[0]
-            r, l = matches[1], matches[1]
-          when 3
-            t =  matches[0]
-            r, l = matches[1], matches[1]
-            b =  matches[2]
-          when 4
-            t =  matches[0]
-            r = matches[1]
-            b =  matches[2]
-            l = matches[3]
+        when 1
+          values = matches.to_a * 4
+        when 2
+          values = matches.to_a * 2
+        when 3
+          values = matches.to_a
+          values << matches[1] # left = right
+        when 4
+          values = matches.to_a
         end
 
-        split_declaration(property, expanded % 'top', t)
-        split_declaration(property, expanded % 'right', r)
-        split_declaration(property, expanded % 'bottom', b)
-        split_declaration(property, expanded % 'left', l)
+        t, r, b, l = values
+
+        split_declaration(property, top, t)
+        split_declaration(property, right, r)
+        split_declaration(property, bottom, b)
+        split_declaration(property, left, l)
 
         @declarations.delete(property)
       end
@@ -362,7 +367,7 @@ module CssParser
     def create_border_shorthand! # :nodoc:
       values = []
 
-      ['border-width', 'border-style', 'border-color'].each do |property|
+      BORDER_STYLE_PROPERTIES.each do |property|
         if @declarations.has_key?(property) and not @declarations[property][:is_important]
           # can't merge if any value contains a space (i.e. has multiple values)
           # we temporarily remove any spaces after commas for the check (inside rgba, etc...)
@@ -371,9 +376,7 @@ module CssParser
         end
       end
 
-      @declarations.delete('border-width')
-      @declarations.delete('border-style')
-      @declarations.delete('border-color')
+      BORDER_STYLE_PROPERTIES.each { |prop| @declarations.delete(prop)}
 
       unless values.empty?
         @declarations['border'] = {:value => values.join(' ')}
@@ -383,23 +386,20 @@ module CssParser
     # Looks for long format CSS dimensional properties (margin, padding, border-color, border-style and border-width)
     # and converts them into shorthand CSS properties.
     def create_dimensions_shorthand! # :nodoc:
-      directions = ['top', 'right', 'bottom', 'left']
-
-      {'margin'       => 'margin-%s',
-       'padding'      => 'padding-%s',
-       'border-color' => 'border-%s-color',
-       'border-style' => 'border-%s-style',
-       'border-width' => 'border-%s-width'}.each do |property, expanded|
+      return if @declarations.size < NUMBER_OF_DIMENSIONS
 
-        top, right, bottom, left = ['top', 'right', 'bottom', 'left'].map { |side| expanded % side }
-        foldable = @declarations.select do |dim, val|
-          dim == top or dim == right or dim == bottom or dim == left
-        end
+      DIMENSIONS.each do |property, dimensions|
+        (top, right, bottom, left) = dimensions
         # All four dimensions must be present
-        if foldable.length == 4
+        if dimensions.count { |d| @declarations[d] } == NUMBER_OF_DIMENSIONS
           values = {}
 
-          directions.each { |d| values[d.to_sym] = @declarations[expanded % d][:value].downcase.strip }
+          [
+            [:top, top],
+            [:right, right],
+            [:bottom, bottom],
+            [:left, left],
+          ].each { |d, key| values[d] = @declarations[key][:value].downcase.strip }
 
           if values[:left] == values[:right]
             if values[:top] == values[:bottom]
@@ -419,7 +419,7 @@ module CssParser
           @declarations[property] = {:value => new_value.strip} unless new_value.empty?
 
           # Delete the longhand values
-          directions.each { |d| @declarations.delete(expanded % d) }
+          [top, right, bottom, left].each { |d| @declarations.delete(d) }
         end
       end
     end
@@ -429,33 +429,28 @@ module CssParser
     # tries to convert them into a shorthand CSS <tt>font</tt> property.  All
     # font properties must be present in order to create a shorthand declaration.
     def create_font_shorthand! # :nodoc:
-      ['font-style', 'font-variant', 'font-weight', 'font-size',
-       'line-height', 'font-family'].each do |prop|
+      FONT_STYLE_PROPERTIES.each do |prop|
         return unless @declarations.has_key?(prop)
       end
 
-      new_value = ''
+      new_value = String.new
       ['font-style', 'font-variant', 'font-weight'].each do |property|
         unless @declarations[property][:value] == 'normal'
-          new_value += @declarations[property][:value] + ' '
+          new_value << @declarations[property][:value] << ' '
         end
       end
 
-      new_value += @declarations['font-size'][:value]
+      new_value << @declarations['font-size'][:value]
 
       unless @declarations['line-height'][:value] == 'normal'
-        new_value += '/' + @declarations['line-height'][:value]
+        new_value << '/' << @declarations['line-height'][:value]
       end
 
-      new_value += ' ' + @declarations['font-family'][:value]
+      new_value << ' ' << @declarations['font-family'][:value]
 
       @declarations['font'] = {:value => new_value.gsub(/[\s]+/, ' ').strip}
 
-      ['font-style', 'font-variant', 'font-weight', 'font-size',
-       'line-height', 'font-family'].each do |prop|
-       @declarations.delete(prop)
-      end
-
+      FONT_STYLE_PROPERTIES.each { |prop| @declarations.delete(prop) }
     end
 
     # Looks for long format CSS list-style properties (e.g. <tt>list-style-type</tt>) and
@@ -482,7 +477,9 @@ module CssParser
           @declarations[dest] = {}
         end
       end
-      @declarations[dest] = @declarations[src].merge({:value => v.to_s.strip})
+
+      @declarations[dest] = @declarations[src].dup
+      @declarations[dest][:value] = v.to_s.strip
     end
 
     def parse_declarations!(block) # :nodoc:
@@ -490,19 +487,18 @@ module CssParser
 
       return unless block
 
-      block.gsub!(/(^[\s]*)|([\s]*$)/, '')
-
-      continuation = ''
+      continuation = nil
       block.split(/[\;$]+/m).each do |decs|
-        decs = continuation + decs
+        decs = continuation ? continuation + decs : decs
         if decs =~ /\([^)]*\Z/ # if it has an unmatched parenthesis
           continuation = decs + ';'
 
-        elsif matches = decs.match(/(.[^:]*)\s*:\s*(.+)(;?\s*\Z)/i)
-          property, value, = matches.captures # skip end_of_declaration
-
+        elsif matches = decs.match(/\s*(.[^:]*)\s*:\s*(.+?)(;?\s*\Z)/i)
+          # skip end_of_declaration
+          property = matches[1]
+          value = matches[2]
           add_declaration!(property, value)
-          continuation = ''
+          continuation = nil
         end
       end
     end
@@ -511,7 +507,11 @@ module CssParser
     # TODO: way too simplistic
     #++
     def parse_selectors!(selectors) # :nodoc:
-      @selectors = selectors.split(',').map { |s| s.gsub(/\s+/, ' ').strip }
+      @selectors = selectors.split(',').map do |s|
+        s.gsub!(/\s+/, ' ')
+        s.strip!
+        s
+      end
     end
   end
 

data/lib/css_parser/version.rb

@@ -1,3 +1,3 @@
 module CssParser
-  VERSION = "1.6.0".freeze
+  VERSION = "1.7.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby CSS parser.