htmlcompressor 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbc26072f28ee34bd76e290982940cdddc081c07
-  data.tar.gz: 1e4ef5b70c7eae75e67e652b83af1dda4c83c542
+  metadata.gz: 4054e9ae1eb0fbce4c30c4152d58ec6674b90b9a
+  data.tar.gz: ebd3e0082f208d1d00a68d398057f7effbfced44
 SHA512:
-  metadata.gz: 0ae38c29532314a023ecbf47b68548ff3f617ee5da1b7cf0b72a70bbe924044114c615496d66e6c964a1a466d1a3cfe282efe65d9ca77f8178c59fce40b99fa1
-  data.tar.gz: 6b0ee8a3d25ce67ff3de7cfd2a2eba591b7f00f788d6e16372770ec221da08f6e8519cafe0da1f67ff25d09a900adfb6b1c2f37999ea7ad7e322458bd2f7d87e
+  metadata.gz: f1a43d6dc862b49ad5c797b3bf504a3f635a9e1adba8cacb9164e04add9f15f65a3ef98357c45c16a80ea87527fab7883f8fcfdda25ba9ae95dde32fb0f683bf
+  data.tar.gz: 81604765e64c4fce8f5da1001214a88320ac8f487324088e2ff77105a547ee62340644b07bf26d5a4dd2fa6636d43c42763576725e06ab791eb7783a91043820

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.1
-  - 2.1.1
-  - 2.0.0
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - 2.0
   - 1.9.3
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode

data/README.md

@@ -47,6 +47,10 @@ options = {
 }
 ```
 
+Htmlcompressor also ships a rack middleware that can be used with rails, sinatra or rack.
+
+**However keep in mind that compression is slow (especially when also compressing javascript or css) and can negatively impact the performance of your website. Take your measurements and adopt a different strategy if necessary**
+
 Using rack middleware (in rails) is as easy as:
 
 ```ruby

data/lib/htmlcompressor/compressor.rb

@@ -385,6 +385,16 @@ module HtmlCompressor
 
     def return_blocks(html, preBlocks, taBlocks, scriptBlocks, styleBlocks, eventBlocks, condCommentBlocks, skipBlocks, lineBreakBlocks, userBlocks)
 
+      # put skip blocks back
+      html = html.gsub(TEMP_SKIP_PATTERN) do |match|
+        i = $1.to_i
+        if skipBlocks.size > i
+          skipBlocks[i]
+        else
+          ''
+        end
+      end
+
       # put line breaks back
       if @options[:preserve_line_breaks]
         html = html.gsub(TEMP_LINE_BREAK_PATTERN) do |match|
@@ -455,15 +465,6 @@ module HtmlCompressor
         end
       end
 
-      # put skip blocks back
-      html = html.gsub(TEMP_SKIP_PATTERN) do |match|
-        i = $1.to_i
-        if skipBlocks.size > i
-          skipBlocks[i]
-        else
-          ''
-        end
-      end
 
       # put user blocks back
       unless @options[:preserve_patterns].nil?
@@ -528,7 +529,11 @@ module HtmlCompressor
       end
 
       if javascript_compressor.nil?
-        raise MissingCompressorError, "No JavaScript Compressor. Please set the :javascript_compressor option"
+        if @options[:javascript_compressor].is_a?(Symbol)
+          raise NotFoundCompressorError, "JavaScript Compressor \"#{@options[:javascript_compressor]}\" not found, please check :javascript_compressor option"
+        else
+          raise MissingCompressorError, "No JavaScript Compressor. Please set the :javascript_compressor option"
+        end
       end
 
       # detect CDATA wrapper
@@ -556,7 +561,11 @@ module HtmlCompressor
       end
 
       if css_compressor.nil?
-        raise MissingCompressorError, "No CSS Compressor. Please set the :css_compressor option"
+        if @options[:css_compressor].is_a?(Symbol)
+          raise NotFoundCompressorError, "CSS Compressor \"#{@options[:css_compressor]}\" not found, please check :css_compressor option"
+        else
+          raise MissingCompressorError, "No CSS Compressor. Please set the :css_compressor option"
+        end
       end
 
       # detect CDATA wrapper

data/lib/htmlcompressor/exceptions.rb

@@ -1,3 +1,4 @@
 module HtmlCompressor
   class MissingCompressorError < StandardError; end
+  class NotFoundCompressorError < StandardError; end
 end

data/lib/htmlcompressor/version.rb

@@ -1,3 +1,3 @@
 module HtmlCompressor
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/compressor_test.rb

@@ -224,6 +224,48 @@ module HtmlCompressor
       assert_equal result, compressor.compress(source)
     end
 
+    def test_dont_replace_javascript_inside_js_templates
+      source = read_resource("testCompressCustomHtmlTemplates.html")
+      result = read_resource("testCompressCustomHtmlTemplates.html")
+      compressor = Compressor.new(:compress_js_templates => false, :remove_quotes => true)
+      assert_equal result, compressor.compress(source)
+    end
+
+    def test_javascript_compressor_not_found
+      source = read_resource("testCompressJavaScript.html");
+
+      compressor = Compressor.new(
+        :compress_javascript => true,
+        :javascript_compressor => :not_existing_compressor,
+        :remove_intertag_spaces => true,
+        :compress_js_templates => true
+      )
+
+      exception = assert_raises(NotFoundCompressorError) do
+        compressor.compress(source)
+      end
+
+      expect_message = 'JavaScript Compressor "not_existing_compressor" not found, please check :javascript_compressor option'
+      assert_equal(expect_message, exception.message)
+    end
+
+    def test_css_compressor_not_found
+      source = read_resource("testCompressCss.html");
+
+      compressor = Compressor.new(
+        :enabled => true,
+        :compress_css => true,
+        :css_compressor => :not_existing_compressor,
+        :compress_javascript => false
+      )
+
+      exception = assert_raises(NotFoundCompressorError) do
+        compressor.compress(source)
+      end
+
+      expect_message = 'CSS Compressor "not_existing_compressor" not found, please check :css_compressor option'
+      assert_equal(expect_message, exception.message)
+    end
   end
 
 end

data/test/resources/html/testCompressCustomHtmlTemplates.html

@@ -1 +1 @@
-<script type="text/html">     <a attribute="value">     <!-- comment -->   <b>   </script>
+<script type="text/html">     <a attribute="value" onclick="alert('hello world')">     <!-- comment -->   <b>   </script>

data/test/resources/html/testCompressCustomHtmlTemplatesResult.html

@@ -1 +1 @@
-<script type="text/html"> <a attribute="value"> <b> </script>
+<script type="text/html"> <a attribute="value" onclick="alert('hello world')"> <b> </script>

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: htmlcompressor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Paolo Chiodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: closure-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 description: Put your html on a diet
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -222,17 +222,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: htmlcompressor provides a class and a rack middleware to minify html pages