css_parser 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b890ee0d537d338ae0a218c68424271242859ba814a52c27fcd05ffefe1acd
-  data.tar.gz: 147e41dae4da802d96124fc07b488b122967a44c0ff79bfe623291c1795e0d9b
+  metadata.gz: 3ff7ead55436d394e644feb148e017f631ea4ede0783746107a72cc790a70ee5
+  data.tar.gz: 8bdd909c65c7f7fe4139d164898e6cd7906b1b649b6a68429dee620cc5798cd0
 SHA512:
-  metadata.gz: 76728b4b816f4b620f28198b6fd5f92f005733bec3afba0df5707d8daf99ab650fd0a0143a6222fc53c5453c32c3a13a76eb4877f3c06f5dc903a559a18d200f
-  data.tar.gz: a5b5a901312932dd9d3c50fa9a6cd4ea549180f57a7e4d85d700d5c3ec58f458927be66c2eb7169165333e153d58061dbdfa98c75c0e6ffb6a81181bc78fdd6f
+  metadata.gz: ecf5d9f9ef55e3f69269c511b51f5363bdc6e317fa1446ae04be7850256c30039dd9719c74705df29dbb9011847d3cbe3602bbd11f8b273cd7b6c92b9e2268cb
+  data.tar.gz: 7ddbd0f9bab2c8327f081a48cce1e7fb20cc133eb5af8530eb1dcc6ef1acc2836f9a2274e75e74dec6b9866461754ceecc759efbbd7aec7dbe6b06814bd2cbc9

data/lib/css_parser/regexps.rb

@@ -35,6 +35,9 @@ module CssParser
   #++
   IMPORTANT_IN_PROPERTY_RX = /\s*!important\b\s*/i.freeze
 
+  # What sanitize_media_query would change: blank, padded, or not single-space separated
+  UNSANITIZED_MEDIA_QUERY_RX = /\A\z|\A[\s\0]|[\s\0]\z|\s\s|[^\S ]/.freeze
+
   RE_INSIDE_OUTSIDE = regex_possible_values 'inside', 'outside'
   RE_SCROLL_FIXED = regex_possible_values 'scroll', 'fixed'
   RE_REPEAT = regex_possible_values 'repeat(\-x|\-y)*|no\-repeat'

data/lib/css_parser/rule_set.rb

@@ -18,6 +18,11 @@ module CssParser
 
     NUMBER_OF_DIMENSIONS = 4
 
+    NORMALIZED_PROPERTY_RX = /\A[-a-z0-9_]+\z/.freeze
+    BLANK_VALUE_RX = /\A[\s\0]*\z/.freeze
+    SURROUNDING_WHITESPACE_RX = /\A[\s\0]|[\s\0]\z/.freeze
+    TRAILING_SEMICOLON_RX = /\s*;\s*\Z/.freeze
+
     DIMENSIONS = [
       ['margin', %w[margin-top margin-right margin-bottom margin-left]],
       ['padding', %w[padding-top padding-right padding-bottom padding-left]],
@@ -35,6 +40,8 @@ module CssParser
     RPAREN = ')'.freeze
     IMPORTANT = '!important'.freeze
     class Declarations
+      EMPTY_DECLARATIONS = {}.freeze
+
       class Value
         attr_reader :value
         attr_accessor :important
@@ -45,12 +52,17 @@ module CssParser
         end
 
         def value=(value)
-          value = value.to_s.sub(/\s*;\s*\Z/, '')
-          self.important = !value.slice!(CssParser::IMPORTANT_IN_PROPERTY_RX).nil?
-          value.strip!
+          # sub and strip always return a copy, and the caller's string must not be mutated:
+          # only copy when there is something to remove, so a clean value allocates nothing
+          value = value.to_s
+          value = value.sub(TRAILING_SEMICOLON_RX, '') if value.match?(TRAILING_SEMICOLON_RX)
+          self.important = value.match?(CssParser::IMPORTANT_IN_PROPERTY_RX)
+          value = value.sub(CssParser::IMPORTANT_IN_PROPERTY_RX, '') if important
+          value = value.strip if value.match?(SURROUNDING_WHITESPACE_RX)
           raise ArgumentError, 'value is empty' if value.empty?
 
-          @value = value.freeze
+          # value may still be the caller's string: -value freezes a copy instead of it
+          @value = -value
         end
 
         def to_s
@@ -68,7 +80,7 @@ module CssParser
 
       def_delegators :declarations, :each, :each_value
 
-      def initialize(declarations = {})
+      def initialize(declarations = EMPTY_DECLARATIONS)
         self.declarations = {}
         declarations.each { |property, value| add_declaration!(property, value) }
       end
@@ -98,7 +110,7 @@ module CssParser
 
         if value.is_a?(Value) && (!currently_important || value.important)
           declarations[property] = value
-        elsif value.to_s.strip.empty?
+        elsif value.to_s.match?(BLANK_VALUE_RX)
           delete property
         else
           value = Value.new(value)
@@ -162,18 +174,19 @@ module CssParser
 
         # We should preserve subsequent declarations of the same properties
         # and prior important ones if replacement one is not important
-        replacements = replacement_declarations.each.with_object({}) do |(key, replacement), result|
+        replacements = {}
+        replacement_declarations.declarations.each do |key, replacement|
           existing = declarations[key]
 
           # No existing -> set
           unless existing
-            result[key] = replacement
+            replacements[key] = replacement
             next
           end
 
           # Replacement more important than existing -> replace
           if replacement.important && !existing.important
-            result[key] = replacement
+            replacements[key] = replacement
             replaced_index = replacement_keys.index(key)
             replacement_keys.delete_at(replaced_index)
             replacement_values.delete_at(replaced_index)
@@ -186,7 +199,7 @@ module CssParser
 
           # Existing and replacement importance are the same,
           # value which is declared later wins
-          result[key] = replacement if property_index > replacement_keys.index(key)
+          replacements[key] = replacement if property_index > replacement_keys.index(key)
         end
 
         return if replacements.empty?
@@ -197,16 +210,17 @@ module CssParser
         replacement_values.delete_at(property_index)
         replacement_values.insert(property_index, *replacements.values)
 
-        self.declarations = replacement_keys.zip(replacement_values).to_h
+        self.declarations = {}
+        replacement_keys.each_with_index { |key, index| declarations[key] = replacement_values[index] }
       end
 
       def to_s(options = {})
-        str = declarations.reduce(+'') do |memo, (prop, value)|
+        str = +''
+        declarations.each do |prop, value|
           importance = options[:force_important] || value.important ? ' !important' : ''
-          memo << "#{prop}: #{value.value}#{importance}; "
+          str << prop << ': ' << value.value << importance << '; '
         end
-        # TODO: Clean-up regexp doesn't seem to work
-        str.gsub!(/^[\s^({)]+|[\n\r\f\t]*|\s+$/mx, '')
+        str.gsub!(/^[\s^({)]+|[\n\r\f\t]+/, '')
         str.strip!
         str
       end
@@ -226,7 +240,10 @@ module CssParser
       attr_writer :declarations
 
       def normalize_property(property)
-        property = property.to_s.downcase
+        property = property.to_s
+        return property if property.match?(NORMALIZED_PROPERTY_RX)
+
+        property = property.downcase
         property.strip!
         property
       end
@@ -399,14 +416,14 @@ module CssParser
       DIMENSIONS.each do |property, (top, right, bottom, left)|
         next unless (declaration = declarations[property])
 
-        value = declaration.value.dup
+        value = declaration.value
 
         # RGB and HSL values in borders are the only units that can have spaces (within params).
         # We cheat a bit here by stripping spaces after commas in RGB and HSL values so that we
         # can split easily on spaces.
         #
         # TODO: rgba, hsl, hsla
-        value.gsub!(RE_COLOUR) { |c| c.gsub(/(\s*,\s*)/, ',') }
+        value = value.gsub(RE_COLOUR) { |c| c.gsub(/(\s*,\s*)/, ',') } if value.include?(',')
 
         matches = split_value_preserving_function_whitespace(value)
 
@@ -424,7 +441,7 @@ module CssParser
           raise ArgumentError, "Cannot parse #{value}"
         end
 
-        replacement = [top, right, bottom, left].zip(values).to_h
+        replacement = {top => values[0], right => values[1], bottom => values[2], left => values[3]}
 
         declarations.replace_declaration!(property, replacement, preserve_importance: true)
       end
@@ -518,17 +535,13 @@ module CssParser
 
     # Combine several properties into a shorthand one
     def create_shorthand_properties!(properties, shorthand_property) # :nodoc:
-      values = []
-      properties_to_delete = []
-      properties.each do |property|
-        next unless (declaration = declarations[property])
-        next if declaration.important
-
-        values << declaration.value
-        properties_to_delete << property
+      properties_to_delete = properties.select do |property|
+        (declaration = declarations[property]) && !declaration.important
       end
 
-      return if values.length <= 1
+      return if properties_to_delete.length <= 1
+
+      values = properties_to_delete.map { |property| declarations[property].value }
 
       properties_to_delete.each do |property|
         declarations.delete(property)
@@ -584,14 +597,11 @@ module CssParser
       return if declarations.size < NUMBER_OF_DIMENSIONS
 
       DIMENSIONS.each do |property, dimensions|
-        values = DIMENSION_DIRECTIONS.each_with_index.with_object({}) do |(side, index), result|
-          next unless (declaration = declarations[dimensions[index]])
-
-          result[side] = declaration.value
-        end
-
         # All four dimensions must be present
-        next if values.size != dimensions.size
+        next unless dimensions.all? { |dimension| declarations.key?(dimension) }
+
+        top, right, bottom, left = dimensions.map { |dimension| declarations[dimension].value }
+        values = {top: top, right: right, bottom: bottom, left: left}
 
         new_value = values.values_at(*compute_dimensions_shorthand(values)).join(' ').strip
         declarations[property] = new_value unless new_value.empty?
@@ -641,7 +651,7 @@ module CssParser
 
     def compute_dimensions_shorthand(values)
       # All four sides are equal, returning single value
-      return [:top] if values.values.uniq.count == 1
+      return [:top] if values[:top] == values[:right] && values[:right] == values[:bottom] && values[:bottom] == values[:left]
 
       # `/* top | right | bottom | left */`
       return DIMENSION_DIRECTIONS if values[:left] != values[:right]
@@ -670,12 +680,13 @@ module CssParser
         next unless (colon = decs.index(COLON))
 
         property = decs[0, colon]
-        value = decs[(colon + 1)..]
+        value = decs[colon + 1, decs.length]
         property.strip!
         value.strip!
-        next if property.empty? || value.empty? || value.casecmp?(IMPORTANT)
+        # casecmp? case-folds both strings, allocating two of them per declaration
+        next if property.empty? || value.empty? || value.casecmp(IMPORTANT).zero?
 
-        add_declaration!(property, value)
+        add_declaration!(property, value.freeze)
         continuation = nil
       end
     end
@@ -688,7 +699,7 @@ module CssParser
     # TODO: way too simplistic
     #++
     def parse_selectors!(selectors) # :nodoc:
-      @selectors = selectors.split(',').map do |s|
+      @selectors = selectors.split(',').map! do |s|
         s.gsub!(/\s+/, ' ')
         s.strip!
         s

data/lib/css_parser/version.rb

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

data/lib/css_parser.rb

@@ -85,9 +85,10 @@ module CssParser
       end
     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
+    merged = RuleSet.new(nil, nil)
+    properties.each do |property, details|
+      value = details[:value]
+      merged[property] = details[:is_important] ? "#{value.gsub(/;\Z/, '')}!important" : value
     end
 
     merged.create_shorthand!
@@ -107,7 +108,7 @@ module CssParser
   #++
   def self.calculate_specificity(selector)
     a = 0
-    b = selector.scan('#').length
+    b = selector.count('#')
     c = selector.scan(NON_ID_ATTRIBUTES_AND_PSEUDO_CLASSES_RX_NC).length
     d = selector.scan(ELEMENTS_AND_PSEUDO_ELEMENTS_RX_NC).length
 
@@ -147,6 +148,8 @@ module CssParser
   end
 
   def self.sanitize_media_query(raw)
+    return raw if raw.is_a?(Symbol) && !raw.match?(UNSANITIZED_MEDIA_QUERY_RX)
+
     mq = raw.to_s.gsub(/\s+/, ' ')
     mq.strip!
     mq = 'all' if mq.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Alex Dunae