css_parser 1.20.0 → 1.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7685aa4f55ebd1d9abde202f1d4f03e9215e494ae01daf44713286311e339e7f
-  data.tar.gz: 2d60924c9ada315c9bf8c4e5ce8186b27df4f5a6e5cddef4287f4df190c45a63
+  metadata.gz: ebc43b9f09241b83ffe9a2878e0a2e5295c79f6d2e02bb20dcaf54d376f91e58
+  data.tar.gz: 5b29858923af894f1b84251c59de6a4638ae0929b63ac0b432a7607d9dd32111
 SHA512:
-  metadata.gz: 65bce8402032a1b8f159e1133eb1cc76f7ca104113d3e8191fd7eab2eda6796409f50a6208e58e867cd057b8128bf584dcf7b59de7f9e829512ec711fbed4322
-  data.tar.gz: 5dcc28bc5cebe61327e3d492502d849d59c438d7704d4e355f8b5c845b2d02897972df53a5b842bcb5da19baf92854e9014fdf9a100519a3c9c3d8cc1912f17a
+  metadata.gz: fd7a00f2be5a2ddbf730eb115dbc0e15f9ac7a71ac92e1a056161a2b418e01d7abeb757c6f8d5fabafd9e4f7dba034b209ca571012ee44ee6b377b2e4bd8100f
+  data.tar.gz: ac8aeba706f1ae35126c6d5c4a150a52862af8654f1342e6c5b36ebce8c0b71c26e0d0931d09081b3b01a70685c3d2b173031a3e1ff32a8477799c3e39e013e4

data/lib/css_parser/parser.rb

@@ -359,9 +359,9 @@ module CssParser
       in_at_media_rule = false
       in_media_block = false
 
-      current_selectors = String.new
-      current_media_query = String.new
-      current_declarations = String.new
+      current_selectors = +''
+      current_media_query = +''
+      current_declarations = +''
 
       # once we are in a rule, we will use this to store where we started if we are capturing offsets
       rule_start = nil
@@ -405,18 +405,19 @@ module CssParser
                 media_types: current_media_queries
               }
               if options[:capture_offsets]
-                add_rule_options.merge!(filename: options[:filename], offset: rule_start..end_offset)
+                add_rule_options[:filename] = options[:filename]
+                add_rule_options[:offset] = rule_start..end_offset
               end
               add_rule!(**add_rule_options)
             end
 
-            current_selectors = String.new
-            current_declarations = String.new
+            current_selectors = +''
+            current_declarations = +''
 
             # restart our search for selectors and declarations
             rule_start = nil if options[:capture_offsets]
           end
-        elsif token =~ /@media/i
+        elsif /@media/i.match?(token)
           # found '@media', reset current media_types
           in_at_media_rule = true
           current_media_queries = []
@@ -426,14 +427,14 @@ module CssParser
             in_at_media_rule = false
             in_media_block = true
             current_media_queries << CssParser.sanitize_media_query(current_media_query)
-            current_media_query = String.new
+            current_media_query = +''
           elsif token.include?(',')
             # new media query begins
             token.tr!(',', ' ')
             token.strip!
             current_media_query << token << ' '
             current_media_queries << CssParser.sanitize_media_query(current_media_query)
-            current_media_query = String.new
+            current_media_query = +''
           else
             token.strip!
             # special-case the ( and ) tokens to remove inner-whitespace
@@ -447,7 +448,7 @@ module CssParser
               current_media_query << token << ' '
             end
           end
-        elsif in_charset or token =~ /@charset/i
+        elsif in_charset or /@charset/i.match?(token)
           # iterate until we are out of the charset declaration
           in_charset = !token.include?(';')
         elsif !in_string && token.include?('}')
@@ -466,7 +467,7 @@ module CssParser
           current_selectors << token
 
           # mark this as the beginning of the selector unless we have already marked it
-          rule_start = start_offset if options[:capture_offsets] && rule_start.nil? && token =~ /^[^\s]+$/
+          rule_start = start_offset if options[:capture_offsets] && rule_start.nil? && /^[^\s]+$/.match?(token)
         end
       end
 
@@ -478,7 +479,8 @@ module CssParser
         media_types: current_media_queries
       }
       if options[:capture_offsets]
-        add_rule_options.merge!(filename: options[:filename], offset: rule_start..end_offset)
+        add_rule_options[:filename] = options[:filename]
+        add_rule_options[:offset] = rule_start..end_offset
       end
       add_rule!(**add_rule_options)
     end
@@ -718,7 +720,7 @@ module CssParser
       nodes = {}
       lines.each do |line|
         parts = line.split(':', 2)
-        if parts[1] =~ /:/
+        if parts[1].include?(':')
           nodes[parts[0]] = css_node_to_h(hash, parts[0], parts[1])
         else
           nodes[parts[0].to_s.strip] = parts[1].to_s.strip

data/lib/css_parser/rule_set.rb

@@ -11,8 +11,10 @@ module CssParser
     BACKGROUND_PROPERTIES = ['background-color', 'background-image', 'background-repeat', 'background-position', 'background-size', 'background-attachment'].freeze
     LIST_STYLE_PROPERTIES = ['list-style-type', 'list-style-position', 'list-style-image'].freeze
     FONT_STYLE_PROPERTIES = ['font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', 'font-family'].freeze
+    FONT_WEIGHT_PROPERTIES = ['font-style', 'font-weight', 'font-variant'].freeze
     BORDER_STYLE_PROPERTIES = ['border-width', 'border-style', 'border-color'].freeze
     BORDER_PROPERTIES = ['border', 'border-left', 'border-right', 'border-top', 'border-bottom'].freeze
+    DIMENSION_DIRECTIONS = [:top, :right, :bottom, :left].freeze
 
     NUMBER_OF_DIMENSIONS = 4
 
@@ -87,17 +89,20 @@ module CssParser
       #   puts declarations['margin']
       #   => #<CssParser::RuleSet::Declarations::Value:0x00000000030c1838 @important=true, @order=2, @value="0px auto">
       #
-      # If the property already exists its value will be over-written.
+      # If the property already exists its value will be over-written unless it was !important and the new value
+      # is not !important.
       # If the value is empty - property will be deleted
       def []=(property, value)
         property = normalize_property(property)
+        currently_important = declarations[property]&.important
 
-        if value.is_a?(Value)
+        if value.is_a?(Value) && (!currently_important || value.important)
           declarations[property] = value
         elsif value.to_s.strip.empty?
           delete property
         else
-          declarations[property] = Value.new(value)
+          value = Value.new(value)
+          declarations[property] = value if !currently_important || value.important
         end
       rescue ArgumentError => e
         raise e.exception, "#{property} #{e.message}"
@@ -196,7 +201,7 @@ module CssParser
       end
 
       def to_s(options = {})
-        str = declarations.reduce(String.new) do |memo, (prop, value)|
+        str = declarations.reduce(+'') do |memo, (prop, value)|
           importance = options[:force_important] || value.important ? ' !important' : ''
           memo << "#{prop}: #{value.value}#{importance}; "
         end
@@ -455,17 +460,17 @@ module CssParser
           else
             font_props['font-family'] = m
           end
-        elsif m =~ /normal|inherit/i
-          ['font-style', 'font-weight', 'font-variant'].each do |font_prop|
+        elsif /normal|inherit/i.match?(m)
+          FONT_WEIGHT_PROPERTIES.each do |font_prop|
             font_props[font_prop] ||= m
           end
-        elsif m =~ /italic|oblique/i
+        elsif /italic|oblique/i.match?(m)
           font_props['font-style'] = m
-        elsif m =~ /small-caps/i
+        elsif /small-caps/i.match?(m)
           font_props['font-variant'] = m
-        elsif m =~ /[1-9]00$|bold|bolder|lighter/i
+        elsif /[1-9]00$|bold|bolder|lighter/i.match?(m)
           font_props['font-weight'] = m
-        elsif m =~ CssParser::FONT_UNITS_RX
+        elsif CssParser::FONT_UNITS_RX.match?(m)
           if m.include?('/')
             font_props['font-size'], font_props['line-height'] = m.split('/', 2)
           else
@@ -488,7 +493,7 @@ module CssParser
       value = declaration.value.dup
 
       replacement =
-        if value =~ CssParser::RE_INHERIT
+        if CssParser::RE_INHERIT.match?(value)
           LIST_STYLE_PROPERTIES.to_h { |key| [key, 'inherit'] }
         else
           {
@@ -554,15 +559,15 @@ module CssParser
     #
     # TODO: this is extremely similar to create_background_shorthand! and should be combined
     def create_border_shorthand! # :nodoc:
-      values = BORDER_STYLE_PROPERTIES.map do |property|
+      values = BORDER_STYLE_PROPERTIES.filter_map do |property|
         next unless (declaration = declarations[property])
         next if declaration.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...)
-        next if declaration.value.gsub(/,\s/, ',').strip =~ /\s/
+        next if /\s/.match?(declaration.value.gsub(/,\s/, ',').strip)
 
         declaration.value
-      end.compact
+      end
 
       return if values.size != BORDER_STYLE_PROPERTIES.size
 
@@ -579,7 +584,7 @@ module CssParser
       return if declarations.size < NUMBER_OF_DIMENSIONS
 
       DIMENSIONS.each do |property, dimensions|
-        values = [:top, :right, :bottom, :left].each_with_index.with_object({}) do |(side, index), result|
+        values = DIMENSION_DIRECTIONS.each_with_index.with_object({}) do |(side, index), result|
           next unless (declaration = declarations[dimensions[index]])
 
           result[side] = declaration.value
@@ -602,7 +607,7 @@ module CssParser
     def create_font_shorthand! # :nodoc:
       return unless FONT_STYLE_PROPERTIES.all? { |prop| declarations.key?(prop) }
 
-      new_value = String.new
+      new_value = +''
       ['font-style', 'font-variant', 'font-weight'].each do |property|
         unless declarations[property].value == 'normal'
           new_value << declarations[property].value << ' '
@@ -639,7 +644,7 @@ module CssParser
       return [:top] if values.values.uniq.count == 1
 
       # `/* top | right | bottom | left */`
-      return [:top, :right, :bottom, :left] if values[:left] != values[:right]
+      return DIMENSION_DIRECTIONS if values[:left] != values[:right]
 
       # Vertical are the same & horizontal are the same, `/* vertical | horizontal */`
       return [:top, :left] if values[:top] == values[:bottom]

data/lib/css_parser/version.rb

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

data/lib/css_parser.rb

@@ -57,7 +57,7 @@ module CssParser
     # in case called like CssParser.merge([rule_set, rule_set])
     rule_sets.flatten! if rule_sets[0].is_a?(Array)
 
-    unless rule_sets.all? { |rs| rs.is_a?(CssParser::RuleSet) }
+    unless rule_sets.all?(CssParser::RuleSet)
       raise ArgumentError, 'all parameters must be CssParser::RuleSets.'
     end
 
@@ -70,7 +70,7 @@ module CssParser
       rule_set.expand_shorthand!
 
       specificity = rule_set.specificity
-      specificity ||= rule_set.selectors.map { |s| calculate_specificity(s) }.compact.max || 0
+      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
@@ -138,7 +138,7 @@ module CssParser
     css.gsub(URI_RX) do
       uri = Regexp.last_match(1).to_s.gsub(/["']+/, '')
       # Don't process URLs that are already absolute
-      unless uri.match(%r{^[a-z]+://}i)
+      unless uri.match?(%r{^[a-z]+://}i)
         begin
           uri = base_uri.join(uri)
         rescue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.1
 platform: ruby
 authors:
 - Alex Dunae
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable