loofah 2.21.2 → 2.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6cad9f8621046eb04ea5c9c0fbcf700406806d0917ced25eb8cfd91e6a5b2fc
-  data.tar.gz: ead331468121d1c81293ce96c6c8502519830205ae6446cb3bb528f156970de8
+  metadata.gz: 5bc700e0a8a523327ae05ebaace9741de9c00f165279a9525515c6c50699c0d9
+  data.tar.gz: cc8db32a403e04256aad34637f0824b117159d357a4e180be1385b3998d90208
 SHA512:
-  metadata.gz: a1f2c92b7e379a2303e52ab83b99d1e0cb6828bfd9015732affaac78ffd8a55fc09c30916409211abd4d890b9f8ee689b8051aad9fcf970d84dc466c65492078
-  data.tar.gz: 4323a4996b105dbaa010c69f68f51becaacd936da5209fa2975fb35e3f842f71e7c46962b79c82cb5fde8df2504409325accbc0975617e45777e7414d82bdea2
+  metadata.gz: bda76a2e8ade5dd0461b3dca3386fb9a297fba1213a81ca404026fe17b33ab74fa4ed92916b11f921ac9e6b7bc77751e40ef7fabc706891d39e4e83cc091c17a
+  data.tar.gz: 981e45721b457e5c00a4c68dac710f121e23e0f26d5a1c35fbb3958b0e2574c12065e0b5166d0b55b0d836e79762326af1039aa442347993bc22c95ce5dad5fa

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.21.4 / 2023-10-10
+
+### Fixed
+
+* `Loofah::HTML5::Scrub.scrub_css` is more consistent in preserving whitespace (and lack of whitespace) in CSS property values. In particular, `.scrub_css` no longer inserts whitespace between tokens that did not already have whitespace between them. [[#273](https://github.com/flavorjones/loofah/issues/273), fixes [#271](https://github.com/flavorjones/loofah/issues/271)]
+
+
+## 2.21.3 / 2023-05-15
+
+### Fixed
+
+* Quash "instance variable not initialized" warning in Ruby < 3.0. [[#268](https://github.com/flavorjones/loofah/issues/268)] (Thanks, [@dharamgollapudi](https://github.com/dharamgollapudi)!)
+
+
 ## 2.21.2 / 2023-05-11
 
 ### Dependencies

data/lib/loofah/html5/scrub.rb

@@ -10,6 +10,7 @@ module Loofah
       CSS_KEYWORDISH = /\A(#[0-9a-fA-F]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|-?\d{0,3}\.?\d{0,10}(ch|cm|r?em|ex|in|lh|mm|pc|pt|px|Q|vmax|vmin|vw|vh|%|,|\))?)\z/ # rubocop:disable Layout/LineLength
       CRASS_SEMICOLON = { node: :semicolon, raw: ";" }
       CSS_IMPORTANT = "!important"
+      CSS_WHITESPACE = " "
       CSS_PROPERTY_STRING_WITHOUT_EMBEDDED_QUOTES = /\A(["'])?[^"']+\1\z/
       DATA_ATTRIBUTE_NAME = /\Adata-[\w-]+\z/
 
@@ -87,7 +88,7 @@ module Loofah
             value = node[:children].map do |child|
               case child[:node]
               when :whitespace
-                nil
+                CSS_WHITESPACE
               when :string
                 if CSS_PROPERTY_STRING_WITHOUT_EMBEDDED_QUOTES.match?(child[:raw])
                   Crass::Parser.stringify(child)
@@ -106,12 +107,12 @@ module Loofah
               else
                 child[:raw]
               end
-            end.compact
+            end.compact.join.strip
 
             next if value.empty?
 
-            value << CSS_IMPORTANT if node[:important]
-            propstring = format("%s:%s", name, value.join(" "))
+            value << CSS_WHITESPACE << CSS_IMPORTANT if node[:important]
+            propstring = format("%s:%s", name, value)
             sanitized_node = Crass.parse_properties(propstring).first
             sanitized_tree << sanitized_node << CRASS_SEMICOLON
           end

data/lib/loofah/version.rb

@@ -2,5 +2,5 @@
 
 module Loofah
   # The version of Loofah you are using
-  VERSION = "2.21.2"
+  VERSION = "2.21.4"
 end

data/lib/loofah.rb

@@ -7,14 +7,11 @@ module Loofah
     def html5_support?
       # Note that Loofah can only support HTML5 in Nokogiri >= 1.14.0 because it requires the
       # subclassing fix from https://github.com/sparklemotion/nokogiri/pull/2534
-      unless @html5_support_set
-        @html5_support = (
-          Gem::Version.new(Nokogiri::VERSION) > Gem::Version.new("1.14.0") &&
-          Nokogiri.uses_gumbo?
-        )
-        @html5_support_set = true
-      end
-      @html5_support
+      return @html5_support if defined? @html5_support
+
+      @html5_support =
+        Gem::Version.new(Nokogiri::VERSION) > Gem::Version.new("1.14.0") &&
+        Nokogiri.uses_gumbo?
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loofah
 version: !ruby/object:Gem::Version
-  version: 2.21.2
+  version: 2.21.4
 platform: ruby
 authors:
 - Mike Dalessio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crass
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.0.dev
 signing_key: 
 specification_version: 4
 summary: Loofah is a general library for manipulating and transforming HTML/XML documents