slim-embedded-minify 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0acd763c9c3c2869fee898e2da36f1a26aa1aa2430d9cfe9c3008db35ecd442
-  data.tar.gz: b3d30f07bbf45aa062deac825d4e849958f495fc4cae6cb819362ebb32f8c53b
+  metadata.gz: 559dbaf2124f8ff4c7e5c7a41f6420ad9bd16c6ee008e3d54af3d5263ddc7509
+  data.tar.gz: 7a9612c610b3f4bb61a8712b3c875aca6d752e5710a55a88cfe41a3e18594322
 SHA512:
-  metadata.gz: f7e085fd30ce3b514709e55e8999c919e2ab4f25fbdcc7c3b62617a8ee09e890d732af7d6c03064eda833b002fbc5b2cec9cccf3ef5afe7ab93a7c843b708ad5
-  data.tar.gz: 26466135a7c571e04eb572f49906f8f17d3ccc21ae1be8ca44e9a00c1da1ae591cb7583d16cbada24d34e0f324a7bf1dd32afc7b4248ac82afed387527fffd58
+  metadata.gz: c3a31cce0082ecd69d49bcaffde0b9e6e992c5b178e0a6678071dfb7b3ab7196078b86d297b67680cadd4faac561fe31770b7df25dac40427c38f3f97aad787f
+  data.tar.gz: a6003c38359fe0f33c309554bd3d3dfa3afd527d9b1aeb42f8290074dc0488dcbd5894a5ac7a02923b422fb2168e98e6abcd02d1c437101f5e56ea4f4da7e4b0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 0.2.7 - 2023-08-01
+
+- Fix incorrect removing when using escaped quotation for css.
+
 ## 0.2.6 - 2023-08-01
 
 - Fix incorrect removing when using escaped quotation.

data/lib/slim/embedded/minify/tag.rb

@@ -41,8 +41,11 @@ module Slim
 
         def remove_comments!(line)
           need_deletion = false
+          escaped = false
+          escaped_backslash = false
           inside_char = nil
           line[-1] = line.last.chars.each_with_index.map do |char, index|
+
             if char == "/" && next_char(line, index) == "*" && inside_char.nil?
               if remaining_string_range(line, index).include?("*/")
                 need_deletion = true
@@ -51,22 +54,25 @@ module Slim
             elsif char == "/" && prev_char(line, index) == "*" && inside_char.nil? && need_deletion
               need_deletion = false
               next
-            elsif char == '"' && !need_deletion
-              if inside_char == '"'
-                inside_char = nil
-                next char
+            elsif char == "\\" && next_char(line, index) == "\\" && inside_char
+              escaped_backslash = true
+              next char
+            elsif char == "\\"
+              if ["'", '"'].include?(next_char(line, index)) && inside_char == next_char(line, index) && !escaped_backslash
+                escaped = true
               end
-
-              inside_char = '"' if inside_char.nil?
-            elsif char == "'" && !need_deletion
-              if inside_char == "'"
-                inside_char = nil
+              escaped_backslash = false
+              next char
+            elsif ["'", '"'].include?(char) && !need_deletion
+              if inside_char == char
+                inside_char = nil unless escaped
+                escaped = false
                 next char
               end
 
-              inside_char = "'" if inside_char.nil?
+              inside_char = char if inside_char.nil?
             end
-            char unless need_deletion
+            char if !need_deletion || inside_char
           end&.compact&.join
         end
 

data/lib/slim/embedded/minify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SlimEmbeddedMinify
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Yudai Takada