slim-embedded-minify 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14375e81992194bca2bc3c42733011ccb783db89cf89a3dffbb62ec3245f2184
-  data.tar.gz: 824370e31b97a05335c8d4c4a64c1bed55ea02ea9a678faa8609a4308c1657b6
+  metadata.gz: 559dbaf2124f8ff4c7e5c7a41f6420ad9bd16c6ee008e3d54af3d5263ddc7509
+  data.tar.gz: 7a9612c610b3f4bb61a8712b3c875aca6d752e5710a55a88cfe41a3e18594322
 SHA512:
-  metadata.gz: 947549a68e10777ab21e2779ac67491a7be49cdb54e800f08e8b0fa891138ee72dc249f3216bbe9ac8f2b9f1e3574f1592a156c2ef90fa3c751771b1237e317b
-  data.tar.gz: df9d4962e7ba6e74492306c5367ff7c44bb6c5a9527b77dd19514bd2104da0a0de0020cd0bac68e58ccdbe33de7cfe48bb3819eef2cb4c4fb2391a38540e69e4
+  metadata.gz: c3a31cce0082ecd69d49bcaffde0b9e6e992c5b178e0a6678071dfb7b3ab7196078b86d297b67680cadd4faac561fe31770b7df25dac40427c38f3f97aad787f
+  data.tar.gz: a6003c38359fe0f33c309554bd3d3dfa3afd527d9b1aeb42f8290074dc0488dcbd5894a5ac7a02923b422fb2168e98e6abcd02d1c437101f5e56ea4f4da7e4b0

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 ## 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.
+
 ## 0.2.5 - 2023-07-27
 
-Fix to not delete anything other than comments.
+- Fix to not delete anything other than comments.
 
 ## 0.2.4 - 2023-07-27
 

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

@@ -14,6 +14,8 @@ module Slim
         def remove_comments!(line)
           need_deletion = false
           need_deletion_all = false
+          escaped = false
+          escaped_backslash = false
           inside_char = nil
           line[-1] = line.last.chars.each_with_index.map do |char, index|
             next if need_deletion_all
@@ -29,22 +31,25 @@ module Slim
             elsif char == "/" && next_char(line, index) == "/" && inside_char.nil? && !need_deletion
               need_deletion_all = true
               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
       end

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
 
@@ -75,7 +81,7 @@ module Slim
         end
 
         def prev_char(line, index)
-          line.last[index - 1]
+          line.last[index - 1] if index.positive?
         end
 
         def next_char(line, index)
@@ -89,7 +95,33 @@ module Slim
         end
 
         def stripped_quotes(line)
-          line.last.gsub(/(['"]).*?\1/, "")
+          inside_char = nil
+          escaped = false
+          escaped_backslash = false
+          line.last.chars.each_with_index.filter_map do |char, index|
+            if ["'", '"'].include?(char) && inside_char.nil?
+              inside_char = char
+              next
+            elsif char == "\\" && next_char(line, index) == "\\" && inside_char
+              escaped_backslash = true
+              next
+            elsif char == "\\"
+              if ["'",
+                  '"'].include?(next_char(line, index)) && inside_char == next_char(line, index) && !escaped_backslash
+                escaped = true
+              end
+              escaped_backslash = false
+              next
+            elsif char == inside_char && !inside_char.nil?
+              inside_char = nil unless escaped
+              escaped = false
+              next
+            elsif inside_char
+              next
+            else
+              char
+            end
+          end.join
         end
 
         def empty_line?(line)

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim