slim-embedded-minify 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff321da624a61d8215c09916aa017f32c2ba58c23ef5a95ab43779a92662d9e8
-  data.tar.gz: df8297c4a0af39b8b6529ad909e4fbfde7ffff1938704f27c6b16cb302c1cd4e
+  metadata.gz: c8790fa5ff94a6dea3f1c2ae7918b4c4d4fdbba1f0701f669e3504436235d21a
+  data.tar.gz: ff1238ac7c872c6c7eb01e9a5a337c7fe7755faab2324278fb847ad3cdc3e6a4
 SHA512:
-  metadata.gz: 8a5fcc44e03800cc7c29835c0abe1f0b7649e5162b94f117c2893d3b87c1de89acf0a99ce1514d9b691cf6b8da92d1ac53c49540eb6919f025bf98a38f10b021
-  data.tar.gz: 4b678a3bf1f78606222b31319a6c64c204ba631b4c839f265ce45183a6237529e7b65d2cecb8b66b09e956bc0ca338498d52a30e3aa7f1b9c740839ada082a6f
+  metadata.gz: 6043fc78dce665411c16075931132e9d2674ce67b527ccb3d56bdb6f8d0d74bba8e8cfed4319ccba49aaa9cfd4d7bc5556dfab182422b8cfd225fd869bdc3118
+  data.tar.gz: 6ca3fe0cebb59a549af68dfe0172d640ddac6006f123248e2bc7866f1adf2f3456635267fe1166f2fff2cb6e45511b57bb60ea15d37fe95282751008cb72643e

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Unreleased
 
+- Fix an invalid remove comment.
+
+## 0.2.1 - 2023-07-18
+
+- Refactor code.
+
 ## 0.2.0 - 2023-07-13
 
 - Add support for css minify.

data/README.md

@@ -1,5 +1,7 @@
 # SlimEmbeddedMinify
 
+[![Gem Version](https://badge.fury.io/rb/slim-embedded-minify.svg)](https://badge.fury.io/rb/slim-embedded-minify)
+
 A slim file to minify embedded code.
 
 ## Installation

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Slim
+  class Embedded < Filter
+    module Minify
+      module Javascript
+        include Tag
+
+        def on_slim_embedded(engine, body, attrs)
+          minified_body = minify(body)
+          super(engine, minified_body, attrs)
+        end
+
+        private
+
+        def remove_comments!(line)
+          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
+          line.last.gsub!(/((?<!['"])\/\/.*)/, '')
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Slim
+  class Embedded < Filter
+    module Minify
+      module Tag
+        def on_slim_embedded(engine, body, attrs)
+          body = minify(body) if engine == :css
+          super(engine, body, attrs)
+        end
+
+        private
+
+        def minify(body)
+          multiline_comment = false
+          body.map do |line|
+            if line.instance_of?(Array) && line.first == :slim
+              remove_comments!(line)
+              remove_whitespace!(line)
+
+              stripped_quotes = stripped_quotes(line)
+              if stripped_quotes.match?(%r{/\*})
+                multiline_comment = true
+                next
+              elsif multiline_comment
+                multiline_comment = false if stripped_quotes.match?(%r{\*/})
+                next
+              end
+              line
+            else
+              line
+            end
+          end.compact
+        end
+
+        def remove_comments!(line)
+          line.last.gsub!(/((?<!['"])\/\*.*?\*\/(?<!['"]))/, '')
+        end
+
+        def remove_whitespace!(line)
+          if line.last.gsub(/\n/, '').match?(/^\s*$/)
+            line.last.gsub!(/^\s*$/, '')
+          end
+        end
+
+        def stripped_quotes(line)
+          line.last.gsub(/(['"]).*?\1/, '')
+        end
+      end
+    end
+  end
+end

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

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

data/lib/slim/embedded/minify.rb

@@ -3,5 +3,18 @@
 require "slim"
 
 require_relative "minify/version"
-require_relative "minify/java_script_engine"
-require_relative "minify/tag_engine"
+
+require_relative "minify/tag"
+require_relative "minify/javascript"
+
+module Slim
+  class Embedded < Filter
+    class TagEngine < Engine
+      prepend Minify::Tag
+    end
+
+    class JavaScriptEngine < TagEngine
+      prepend Minify::Javascript
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -38,8 +38,8 @@ files:
 - README.md
 - Rakefile
 - lib/slim/embedded/minify.rb
-- lib/slim/embedded/minify/java_script_engine.rb
-- lib/slim/embedded/minify/tag_engine.rb
+- lib/slim/embedded/minify/javascript.rb
+- lib/slim/embedded/minify/tag.rb
 - lib/slim/embedded/minify/version.rb
 - slim-embedded-minify.gemspec
 homepage: https://github.com/ydah/slim-embedded-minify
@@ -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.

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

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Slim
-  class Embedded < Filter
-    class JavaScriptEngine < TagEngine
-      alias orig_js_on_slim_embedded on_slim_embedded
-
-      def on_slim_embedded(engine, body, attrs)
-        minified_body = minify(body)
-        orig_js_on_slim_embedded(engine, minified_body, attrs)
-      end
-
-      private
-
-      def remove_comments!(line)
-        line.last.gsub!(/((?<!['"])\/\*[^*\/]*\*\/?(?<!['"]))/, '')
-        line.last.gsub!(/((?<!['"])\/\/.*[^'"]+)/, '')
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Slim
-  class Embedded < Filter
-    class TagEngine < Engine
-      alias orig_tag_on_slim_embedded on_slim_embedded
-
-      def on_slim_embedded(engine, body, attrs)
-        body = minify(body) if engine == :css
-        orig_tag_on_slim_embedded(engine, body, attrs)
-      end
-
-      private
-
-      def minify(body)
-        multiline_comment = false
-        body.map do |line|
-          if line.instance_of?(Array) && line.first == :slim
-            remove_comments!(line)
-            remove_whitespace!(line)
-
-            stripped_quotes = stripped_quotes(line)
-            if stripped_quotes.match?(%r{/\*})
-              multiline_comment = true
-              next
-            elsif multiline_comment
-              multiline_comment = false if stripped_quotes.match?(%r{\*/})
-              next
-            end
-            line
-          else
-            line
-          end
-        end.compact
-      end
-
-      def remove_comments!(line)
-        line.last.gsub!(/((?<!['"])\/\*[^*\/]*\*\/?(?<!['"]))/, '')
-      end
-
-      def remove_whitespace!(line)
-        if line.last.gsub(/\n/, '').match?(/^\s*$/)
-          line.last.gsub!(/^\s*$/, '')
-        end
-      end
-
-      def stripped_quotes(line)
-        line.last.gsub(/(['"]).*?\1/, '')
-      end
-    end
-  end
-end