slim-embedded-minify 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f110250b84230ebf229b53f681aa383c067f1a852753c9de17d4bb301463b3b9
-  data.tar.gz: b07d7704ba9620c86177528c075c5bdc41e568e8173d83afa11ac5b8236cc654
+  metadata.gz: ff321da624a61d8215c09916aa017f32c2ba58c23ef5a95ab43779a92662d9e8
+  data.tar.gz: df8297c4a0af39b8b6529ad909e4fbfde7ffff1938704f27c6b16cb302c1cd4e
 SHA512:
-  metadata.gz: f7f7587f90c3c6f317db08d7e844eb151cf14921acf4570be397c048e0d3311b5ec31fa9433d5a7f4dc408d166e38274e81fbcca683fa8f812465e0f77b9d38a
-  data.tar.gz: 611fc8e5cdc302c03a563ed17d2812752ef7dbe622fd32a5dcb95fbd17e07d6b86075dd746473d92c6036d8adf353eccf2a895fd85470faa5e0fab3c711bbfe6
+  metadata.gz: 8a5fcc44e03800cc7c29835c0abe1f0b7649e5162b94f117c2893d3b87c1de89acf0a99ce1514d9b691cf6b8da92d1ac53c49540eb6919f025bf98a38f10b021
+  data.tar.gz: 4b678a3bf1f78606222b31319a6c64c204ba631b4c839f265ce45183a6237529e7b65d2cecb8b66b09e956bc0ca338498d52a30e3aa7f1b9c740839ada082a6f

data/CHANGELOG.md

@@ -1,5 +1,23 @@
-## [Unreleased]
+## Unreleased
 
-## [0.1.0] - 2023-07-11
+## 0.2.0 - 2023-07-13
 
-- Initial release
+- Add support for css minify.
+
+## 0.1.3 - 2023-07-12
+
+- Fix to disregard comments if enclosed in quotation marks.
+- Fix deletion of lines when a line is not just a comment.
+
+## 0.1.2 - 2023-07-11
+
+- Fix to remove comments after the second line.
+
+## 0.1.1 - 2023-07-11
+
+- Fix bundle install error.
+- Fix dependency error.
+
+## 0.1.0 - 2023-07-11
+
+- Initial release.

data/Gemfile

@@ -7,4 +7,3 @@ gemspec
 
 gem "minitest", "~> 5.15"
 gem "rake", "~> 13.0"
-gem "rubocop", "~> 1.21"

data/README.md

@@ -1,34 +1,24 @@
-# Slim::Embedded::Minify
+# SlimEmbeddedMinify
 
-TODO: Delete this and the text below, and describe your gem
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/slim/embedded/minify`. To experiment with that code, run `bin/console` for an interactive prompt.
+A slim file to minify embedded code.
 
 ## Installation
 
-TODO: Replace `UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG` with your gem name right after releasing it to RubyGems.org. Please do not do it earlier due to security reasons. Alternatively, replace this section with instructions to install your gem from git if you don't plan to release to RubyGems.org.
-
-Install the gem and add to the application's Gemfile by executing:
-
-    $ bundle add UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-If bundler is not being used to manage dependencies, install the gem by executing:
-
-    $ gem install UPDATE_WITH_YOUR_GEM_NAME_PRIOR_TO_RELEASE_TO_RUBYGEMS_ORG
-
-## Usage
-
-TODO: Write usage instructions here
+Just install the slim-embedded-minify gem
 
-## Development
+```
+gem install slim-embedded-minify
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+or if you use bundler put this in your `Gemfile`
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```
+gem 'slim-embedded-minify'
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/slim-embedded-minify. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/slim-embedded-minify/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/ydah/slim-embedded-minify. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/ydah/slim-embedded-minify/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -36,4 +26,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Slim::Embedded::Minify project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/slim-embedded-minify/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the Slim::Embedded::Minify project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/ydah/slim-embedded-minify/blob/main/CODE_OF_CONDUCT.md).

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

@@ -3,31 +3,18 @@
 module Slim
   class Embedded < Filter
     class JavaScriptEngine < TagEngine
-      alias original_on_slim_embedded on_slim_embedded
+      alias orig_js_on_slim_embedded on_slim_embedded
 
       def on_slim_embedded(engine, body, attrs)
         minified_body = minify(body)
-        super(engine, [:html, :js, minified_body], attrs)
+        orig_js_on_slim_embedded(engine, minified_body, attrs)
       end
 
       private
 
-      def minify(body)
-        multiline_comment = false
-        body.filter do |line|
-          if line.instance_of?(Array) && line.first == :slim
-            if line.last.match?(%r{\A/\*})
-              multiline_comment = true
-              next false
-            elsif multiline_comment
-              multiline_comment = false if line.last.match?(%r{\*/})
-              next false
-            end
-            !line.last.match?(%r{//})
-          else
-            true
-          end
-        end
+      def remove_comments!(line)
+        line.last.gsub!(/((?<!['"])\/\*[^*\/]*\*\/?(?<!['"]))/, '')
+        line.last.gsub!(/((?<!['"])\/\/.*[^'"]+)/, '')
       end
     end
   end

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

@@ -0,0 +1,52 @@
+# 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

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

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

data/lib/slim/embedded/minify.rb

@@ -4,3 +4,4 @@ require "slim"
 
 require_relative "minify/version"
 require_relative "minify/java_script_engine"
+require_relative "minify/tag_engine"

data/slim-embedded-minify.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "A slim file to minify embedded code."
   spec.homepage = "https://github.com/ydah/slim-embedded-minify"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim-embedded-minify
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yudai Takada
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -31,16 +31,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - 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/version.rb
 - slim-embedded-minify.gemspec
 homepage: https://github.com/ydah/slim-embedded-minify
@@ -58,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.rubocop.yml

@@ -1,13 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.6
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120

data/Gemfile.lock

@@ -1,54 +0,0 @@
-PATH
-  remote: .
-  specs:
-    slim-embedded-minify (0.1.1)
-      slim (~> 5.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    json (2.6.3)
-    language_server-protocol (3.17.0.3)
-    minitest (5.18.1)
-    parallel (1.23.0)
-    parser (3.2.2.3)
-      ast (~> 2.4.1)
-      racc
-    racc (1.7.1)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
-    rexml (3.2.5)
-    rubocop (1.54.1)
-      json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
-      parallel (~> 1.10)
-      parser (>= 3.2.2.3)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    ruby-progressbar (1.13.0)
-    slim (5.1.1)
-      temple (~> 0.10.0)
-      tilt (>= 2.1.0)
-    temple (0.10.2)
-    tilt (2.2.0)
-    unicode-display_width (2.4.2)
-
-PLATFORMS
-  x86_64-darwin-21
-
-DEPENDENCIES
-  minitest (~> 5.15)
-  rake (~> 13.0)
-  rubocop (~> 1.21)
-  slim-embedded-minify!
-
-BUNDLED WITH
-   2.4.13