css_parser 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de40b5ed5a0e298dcf2bbb5461b0643a2044f0ee314f1211695da1e8b0c15a1
-  data.tar.gz: 8db5565c440bb65113054f58354d8dcfb4c761b2e3a1b1c4d4d758c9f74aa3f8
+  metadata.gz: 7c20c504cf408fbaf9e5579e3011c485c9e1a7cb0eddc421b9bfc83bf91a9b2c
+  data.tar.gz: 416f126ad73ba30e3754db0e5af9519c416546fadb33c904a98c1bbf4a594f92
 SHA512:
-  metadata.gz: 28b3ff2dcd11c1803a74175fdebd8592aab0da5b5df608a92923a9c56bb1dd41fba217b73ccc1a919b4ba6468c9ecb1e5a57f4fd4cce989307f08acf0c7d28ac
-  data.tar.gz: 3a0bcb5fb3c71f057ce7bdcf506aeca30829bb22558787d1d73c8a3a539f65cc9bcef9ead07c87f379378ec6885cc31b919582c1961eb8e921f81b04c620e949
+  metadata.gz: c963b193f920250c1f0ee217194720f5865a2a9d7724e7f34b7d8a054fbef78382732d69f22a3a16a320d3f162f14fa0b284fbe9fba9edcbf45d22547594cb07
+  data.tar.gz: afc7f111ffc2e4a42c9c6be5f7e3eb2b52239f7057d0e462ff731e45e5af2d9e6ea05aa7fcb62563538c048225cc8e8f9a8c674fa633fa234e432d8e741bd26a

data/lib/css_parser/parser.rb

@@ -39,6 +39,7 @@ module CssParser
       @options = {absolute_paths: false,
                   import: true,
                   io_exceptions: true,
+                  rule_set_exceptions: true,
                   capture_offsets: false}.merge(options)
 
       # array of RuleSets
@@ -167,6 +168,8 @@ module CssParser
     def add_rule!(selectors, declarations, media_types = :all)
       rule_set = RuleSet.new(selectors, declarations)
       add_rule_set!(rule_set, media_types)
+    rescue ArgumentError => e
+      raise e if @options[:rule_set_exceptions]
     end
 
     # Add a CSS rule by setting the +selectors+, +declarations+, +filename+, +offset+ and +media_types+.

data/lib/css_parser/rule_set.rb

@@ -93,6 +93,8 @@ module CssParser
         else
           declarations[property] = Value.new(value)
         end
+      rescue ArgumentError => e
+        raise e.exception, "#{property} #{e.message}"
       end
       alias add_declaration! []=
 
@@ -511,23 +513,22 @@ module CssParser
     #
     # TODO: this is extremely similar to create_background_shorthand! and should be combined
     def create_border_shorthand! # :nodoc:
-      values = []
-
-      BORDER_STYLE_PROPERTIES.each do |property|
+      values = BORDER_STYLE_PROPERTIES.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...)
-        return nil if declaration.value.gsub(/,\s/, ',').strip =~ /\s/
+        next if declaration.value.gsub(/,\s/, ',').strip =~ /\s/
 
-        values << declaration.value
+        declaration.value
+      end.compact
+
+      return if values.size != BORDER_STYLE_PROPERTIES.size
 
+      BORDER_STYLE_PROPERTIES.each do |property|
         declarations.delete(property)
       end
 
-      return if values.empty?
-
       declarations['border'] = values.join(' ')
     end
 

data/lib/css_parser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: css_parser
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby CSS parser.