💅

lib/slim/embedded/minify/javascript.rb

@@ -10,22 +10,23 @@ def on_slim_embedded(engine, body, attrs)
           minified_body = minify(body)
           super(engine, minified_body, attrs)
         end
+
         def remove_comments!(line)
           need_deletion = false
           need_deletion_all = false
           inside_char = nil
           line[-1] = line.last.chars.each_with_index.map do |char, index|
             next if need_deletion_all
 
-            if char == '/' && next_char(line, index) == '*' && inside_char.nil?
-              if remaining_string_range(line, index).match?(/\*\//)
+            if char == "/" && next_char(line, index) == "*" && inside_char.nil?
+              if remaining_string_range(line, index).include?("*/")
                 need_deletion = true
                 next
               end
-            elsif char == '/' && prev_char(line, index) == '*' && inside_char.nil? && need_deletion
+            elsif char == "/" && prev_char(line, index) == "*" && inside_char.nil? && need_deletion
               need_deletion = false
               next
-            elsif char == '/' && next_char(line, index) == '/' && inside_char.nil? && !need_deletion
+            elsif char == "/" && next_char(line, index) == "/" && inside_char.nil? && !need_deletion
               need_deletion_all = true
               next
             elsif char == '"' && !need_deletion

lib/slim/embedded/minify/tag.rb

@@ -13,45 +13,42 @@ def on_slim_embedded(engine, body, attrs)
 
         def minify(body)
           multiline_comment = false
-          body.map do |line|
+          body.filter_map do |line|
             if line.instance_of?(Array) && line.first == :slim
               remove_comments!(line)
               next if line.last.nil?
 
               remove_whitespace!(line)
               stripped_quotes = stripped_quotes(line)
-              if stripped_quotes.match?(%r{/\*}) && !multiline_comment
+              if stripped_quotes.include?("/*") && !multiline_comment
                 multiline_comment = true
-                line[-1] = line.last.reverse.sub(/.*?\*\//, '').reverse
+                line[-1] = line.last.reverse.sub(%r{.*?\*/}, "").reverse
               elsif multiline_comment
-                next unless stripped_quotes.match?(%r{\*/})
+                next unless stripped_quotes.include?("*/")
 
                 multiline_comment = false
-                line.last.sub!(/.*\*\/(?<!['"])/, '')
+                line.last.sub!(%r{.*\*/(?<!['"])}, "")
               end
-              if stripped_quotes.match?(%r{/\*}) && !multiline_comment
+              if stripped_quotes.include?("/*") && !multiline_comment
                 multiline_comment = true
-                line[-1] = line.last.reverse.sub(/.*?\*\//, '').reverse
+                line[-1] = line.last.reverse.sub(%r{.*?\*/}, "").reverse
               end
               next if empty_line?(line)
             end
             line
-          end.compact
-        end
-
-        def minify_multiple_comments!(line)
+          end
         end
 
         def remove_comments!(line)
           need_deletion = 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).match?(/\*\//)
+            if char == "/" && next_char(line, index) == "*" && inside_char.nil?
+              if remaining_string_range(line, index).include?("*/")
                 need_deletion = true
                 next
               end
-            elsif char == '/' && prev_char(line, index) == '*' && inside_char.nil? && need_deletion
+            elsif char == "/" && prev_char(line, index) == "*" && inside_char.nil? && need_deletion
               need_deletion = false
               next
             elsif char == '"' && !need_deletion
@@ -74,7 +71,7 @@ def remove_comments!(line)
         end
 
         def remaining_string_range(line, index)
-          line.last[index..-1]
+          line.last[index..]
         end
 
         def prev_char(line, index)
@@ -86,17 +83,17 @@ def next_char(line, index)
         end
 
         def remove_whitespace!(line)
-          if line.last.gsub(/\n/, '').match?(/^\s*$/)
-            line.last.gsub!(/^\s*$/, '')
-          end
+          return unless line.last.delete("\n").match?(/^\s*$/)
+
+          line.last.gsub!(/^\s*$/, "")
         end
 
         def stripped_quotes(line)
-          line.last.gsub(/(['"]).*?\1/, '')
+          line.last.gsub(/(['"]).*?\1/, "")
         end
 
         def empty_line?(line)
-          line.last.gsub(/[\n\s]/, '').empty?
+          line.last.gsub(/[\n\s]/, "").empty?
         end
       end
     end

slim-embedded-minify.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency 'slim', '~> 5.1'
+  spec.add_runtime_dependency "slim", "~> 5.1"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

test/embedded/minify/tag_test.rb

@@ -24,15 +24,15 @@ def test_render_with_css_attribute
       css scoped = "true":
         h1 { color: blue }
     SLIM
-    assert_html %{<style scoped="true">h1 { color: blue }</style>}, source
+    assert_html %(<style scoped="true">h1 { color: blue }</style>), source
   end
 
   def test_render_with_css_multiple_attributes
     source = <<~SLIM
       css class="myClass" scoped = "true" :
         h1 { color: blue }
     SLIM
-    assert_html %{<style class="myClass" scoped="true">h1 { color: blue }</style>}, source
+    assert_html %(<style class="myClass" scoped="true">h1 { color: blue }</style>), source
   end
 
   def test_render_with_css_and_comment