slim-embedded-minify 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 697b542e806ec204502d7380a4a58a6ff124e35b4a122a1f91dcabb49443f10e
-  data.tar.gz: dc79454cac050709c4cac6f9d2d8471e856d2601b4d7b6ad5c74478b72a91155
+  metadata.gz: ae5665cb9baa381cc6a7f9abef491e6bc9805c1d7a77af47428a16dd4cd1ce07
+  data.tar.gz: 7a38354fdb3dacb1ea4c034cce7129f3aa7c66e22d0c7326e685c9cc84d06f9a
 SHA512:
-  metadata.gz: 332eb59aa954df089d98101630fd6b7bfb0dee70b752e5f422adde76eac4f8ea18027cbc415bedb5c3375232566390f39f9065d7d78cb8bba6c6fbb81eca1b7e
-  data.tar.gz: 826969cc768ed7d071fbb87fb273acc76454100d72182a423310e59f6ed8a1e6858f0e96f0344da64cc001d4f4cc334d45e3ca17811e4d1987f32e8733fc7f55
+  metadata.gz: a46495c0cf4e673ecf61693e04246d7bea875b2ff6dadddea29b68d94ed4e34a8417cc506243fdf81d9ce718e73b09fd12403edef342e2f4598c72306db93116
+  data.tar.gz: ea8111ae9eb161bfc10f5b5594cd1c207cc00b50a7c06f823b4b9ca6aabda4dd01ee6d3b68cad86d47fe11b02151a33b12942f55897a9ccacc29eb84d893aa80

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## 0.2.3 - 2023-07-27
+
+- Fix to not removing line when a block comment if it starts at the end of a line.
+
+## 0.2.2 - 2023-07-20
+
+- Fix an invalid remove comment.
+
 ## 0.2.1 - 2023-07-18
 
 - Refactor code.

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

@@ -14,8 +14,8 @@ module Slim
         private
 
         def remove_comments!(line)
-          line.last.gsub!(/((?<!['"])\/\*[^*\/]*\*\/?(?<!['"]))/, '')
-          line.last.gsub!(/((?<!['"])\/\/.*[^'"]+)/, '')
+          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
+          line.last.gsub!(/((?<!['"])\/\/.*)/, '')
         end
       end
     end

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

@@ -21,20 +21,21 @@ module Slim
               stripped_quotes = stripped_quotes(line)
               if stripped_quotes.match?(%r{/\*})
                 multiline_comment = true
-                next
+                line.last.gsub!(/\/\*.*$/, '')
               elsif multiline_comment
-                multiline_comment = false if stripped_quotes.match?(%r{\*/})
-                next
+                next unless stripped_quotes.match?(%r{\*/})
+
+                multiline_comment = false
+                line.last.gsub!(/.*\*\//, '')
               end
-              line
-            else
-              line
+              next if empty_line?(line)
             end
+            line
           end.compact
         end
 
         def remove_comments!(line)
-          line.last.gsub!(/((?<!['"])\/\*[^*\/]*\*\/?(?<!['"]))/, '')
+          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
         end
 
         def remove_whitespace!(line)
@@ -46,6 +47,10 @@ module Slim
         def stripped_quotes(line)
           line.last.gsub(/(['"]).*?\1/, '')
         end
+
+        def empty_line?(line)
+          line.last.gsub(/[\n\s]/, '').empty?
+        end
       end
     end
   end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-18 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A slim file to minify embedded code.