htmlcompressor 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 92b6265bccddfa29250def7fd2807fb2335347cf
+  data.tar.gz: 924523a9f8eb60ce59fdd4986ae2e1393bfd183e
+SHA512:
+  metadata.gz: 974bd79294afdb72d616d06bc4f55fc5838cf76733eb894bd22c9a5751fdb1c84c6e5472862fabae249d3fcee6aceacc2b794317fb0ae9d3f0d0a983467e0129
+  data.tar.gz: 22cdb3b24b803a1557180151c09abdef893175a073773082ffb67356b890633b5c42bebafbdae3e78d3c56379f561798e4f9e892aed78e7043836a404eca2b77

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - 1.8.7
+before_install:
+- gem install bundler

data/README.md

@@ -1,4 +1,5 @@
 # Htmlcompressor
+[![Build Status](https://travis-ci.org/paolochiodi/htmlcompressor.svg?branch=master)](https://travis-ci.org/paolochiodi/htmlcompressor)
 
 ## Put your html on a diet
 
@@ -79,6 +80,57 @@ Rails 2.3 users may need to add
   require 'htmlcompressor'
 ```
 
+## CSS and JavaScript Compression
+
+By default CSS/JS compression is disabled.
+In order to minify in page javascript and css, you need to supply a compressor in the options hash.
+A compressor can be `:yui` or `:closure` or any object that responds to `:compress`. E.g.: `compressed = compressor.compress(source)`
+
+```ruby
+
+  class MyCompressor
+
+    def compress(source)
+      return 'minified'
+    end
+
+  end
+
+  options = {
+    :compress_css => true,
+    :css_compressor => MyCompressor.new,
+    :compress_javascript => true,
+    :javascript_compressor => MyCompressor.new
+  }
+
+```
+
+Please note that in order to use yui or closure compilers you need to manually add them to the Gemfile
+
+```ruby
+  gem 'yui-compressor'
+
+  ...
+
+  options = {
+    :compress_javscript => true,
+    :javascript_compressor => :yui,
+    :compress_css => true
+    :css_compressor => :yui
+  }
+```
+
+```ruby
+  gem 'closure-compiler'
+
+  ...
+
+  options = {
+    :compress_javascript => true,
+    :javascript_compressor => :closure
+  }
+```
+
 ## Statistics
 
 As of now the statistic framework hasn't been ported. Refer to original [htmlcompressor documentation](http://code.google.com/p/htmlcompressor/) for statistics on minified pages.

data/Rakefile

@@ -1,2 +1,20 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+
+task :default => :test

data/htmlcompressor.gemspec

@@ -8,10 +8,10 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{htmlcompressor provides a class and a rack middleware to minify html pages}
   gem.homepage      = ""
 
-  gem.add_dependency 'yui-compressor', '~> 0.9.6'
-  gem.add_development_dependency 'closure-compiler', '~> 1.1.5'
+  gem.add_development_dependency 'yui-compressor', '~> 0.9'
+  gem.add_development_dependency 'closure-compiler', '~> 1.1'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'minitest', '~> 5.0'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/htmlcompressor/compressor.rb

@@ -1,4 +1,4 @@
-require "yui/compressor"
+require "htmlcompressor/exceptions"
 
 module HtmlCompressor
   class Compressor
@@ -92,6 +92,15 @@ module HtmlCompressor
     TEMP_SKIP_PATTERN = Regexp.new("%%%~COMPRESS~SKIP~(\\d+?)~%%%")
     TEMP_LINE_BREAK_PATTERN = Regexp.new("%%%~COMPRESS~LT~(\\d+?)~%%%")
 
+    JAVASCRIPT_COMPRESSORS_OPTIONS = {
+      :closure => { :compilation_level => 'ADVANCED_OPTIMIZATIONS' },
+      :yui => { :munge => true, :preserve_semicolons => true, :optimize => true, :line_break => nil }
+    }
+
+    CSS_COMPRESSORS_OPTIONS = {
+      :yui => { :line_break => -1 }
+    }
+
     DEFAULT_OPTIONS = {
       :enabled => true,
 
@@ -100,6 +109,8 @@ module HtmlCompressor
       :remove_multi_spaces => true,
 
       # optional settings
+      :javascript_compressor => :yui,
+      :css_compressor => :yui,
       :remove_intertag_spaces => false,
       :remove_quotes => false,
       :compress_javascript => false,
@@ -126,11 +137,42 @@ module HtmlCompressor
 
       @options = DEFAULT_OPTIONS.merge(options)
 
-      # YUICompressor settings
-      @yuiCssLineBreak = -1
-      @yuiJsNoMunge = false
-      @yuiJsPreserveAllSemiColons = false
-      @yuiJsDisableOptimizations = false
+      detect_external_compressors
+    end
+
+    def detect_external_compressors
+      @javascript_compressors = {}
+      @css_compressors = {}
+
+      # Try Closure.
+      begin
+        require 'closure-compiler'
+        @javascript_compressors[:closure] = Closure::Compiler
+      rescue LoadError
+      end
+
+      # Try YUI
+      begin
+        require 'yui/compressor'
+        @javascript_compressors[:yui] = YUI::JavaScriptCompressor
+        @css_compressors[:yui] = YUI::CssCompressor
+      rescue LoadError
+      end
+    end
+
+    def get_javascript_compressor(compressor_name)
+
+      if @javascript_compressors.has_key? compressor_name
+        @javascript_compressors[compressor_name].new JAVASCRIPT_COMPRESSORS_OPTIONS[compressor_name]
+      end
+
+    end
+
+    def get_css_compressor(compressor_name)
+
+      if @css_compressors.has_key? compressor_name
+        @css_compressors[compressor_name].new CSS_COMPRESSORS_OPTIONS[compressor_name]
+      end
 
     end
 
@@ -465,15 +507,14 @@ module HtmlCompressor
 
     def compress_javascript(source)
       # set default javascript compressor
-      javaScriptCompressor = @options[:javascript_compressor]
+      javascript_compressor = @options[:javascript_compressor]
+
+      if javascript_compressor.is_a?(Symbol)
+        javascript_compressor = get_javascript_compressor(javascript_compressor)
+      end
 
-      if javaScriptCompressor.nil?
-        javaScriptCompressor = YUI::JavaScriptCompressor.new(
-          :munge => !@yuiJsNoMunge,
-          :preserve_semicolons => !@yuiJsDisableOptimizations,
-          :optimize => !@yuiJsDisableOptimizations,
-          :line_break => @yuiJsLineBreak
-        )
+      if javascript_compressor.nil?
+        raise MissingCompressorError, "No JavaScript Compressor. Please set the :javascript_compressor option"
       end
 
       # detect CDATA wrapper
@@ -483,7 +524,7 @@ module HtmlCompressor
         source = $1
       end
 
-      result = javaScriptCompressor.compress(source).strip
+      result = javascript_compressor.compress(source).strip
 
       if cdataWrapper
         result = "<![CDATA[" + result + "]]>"
@@ -494,10 +535,14 @@ module HtmlCompressor
 
     def compress_css_styles(source)
       # set default css compressor
-      cssCompressor = @options[:css_compressor]
+      css_compressor = @options[:css_compressor]
+
+      if css_compressor.is_a?(Symbol)
+        css_compressor = get_css_compressor(css_compressor)
+      end
 
-      if cssCompressor.nil?
-        cssCompressor = YUI::CssCompressor.new(:line_break => @yuiCssLineBreak)
+      if css_compressor.nil?
+        raise MissingCompressorError, "No CSS Compressor. Please set the :css_compressor option"
       end
 
       # detect CDATA wrapper
@@ -507,7 +552,7 @@ module HtmlCompressor
         source = $1
       end
 
-      result = cssCompressor.compress(source)
+      result = css_compressor.compress(source)
 
       if cdataWrapper
         result = "<![CDATA[" + result + "]]>"
@@ -782,4 +827,4 @@ module HtmlCompressor
 
   end
 
-end
+end

data/lib/htmlcompressor/exceptions.rb

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

data/lib/htmlcompressor/version.rb

@@ -1,3 +1,3 @@
 module HtmlCompressor
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/test/compressor_closure_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+module HtmlCompressor
+
+  class TestCompressor < Minitest::Test
+
+    def test_compress_java_script_closure
+      source = read_resource("testCompressJavaScript.html")
+      result = read_resource("testCompressJavaScriptClosureResult.html")
+
+      compressor = Compressor.new(
+        :compress_javascript => true,
+        :javascript_compressor => :closure,
+        :remove_intertag_spaces => true
+      )
+
+      assert_equal result, compressor.compress(source)
+    end
+
+  end
+
+end

data/test/compressor_test.rb

@@ -1,10 +1,8 @@
-require 'htmlcompressor/compressor'
-require 'minitest/autorun'
-require 'closure-compiler'
+require 'test_helper'
 
 module HtmlCompressor
 
-  class TestCompressor < MiniTest::Unit::TestCase
+  class TestCompressor < Minitest::Test
 
     def test_enabled
       source = read_resource("testEnabled.html")
@@ -80,43 +78,6 @@ module HtmlCompressor
       assert_equal result, compressor.compress(source)
     end
 
-    def test_compress_javascript_yui
-      source = read_resource("testCompressJavaScript.html");
-      result = read_resource("testCompressJavaScriptYuiResult.html");
-
-      compressor = Compressor.new(
-        :compress_javascript => true,
-        :remove_intertag_spaces => true
-      )
-
-      assert_equal result, compressor.compress(source)
-    end
-
-    def test_compress_java_script_closure
-      source = read_resource("testCompressJavaScript.html")
-      result = read_resource("testCompressJavaScriptClosureResult.html")
-
-      compressor = Compressor.new(
-        :compress_javascript => true,
-        :javascript_compressor => Closure::Compiler.new(:compilation_level => 'ADVANCED_OPTIMIZATIONS'),
-        :remove_intertag_spaces => true
-      )
-
-      assert_equal result, compressor.compress(source)
-    end
-
-    def test_compress_css
-      source = read_resource("testCompressCss.html")
-      result = read_resource("testCompressCssResult.html")
-
-      compressor = Compressor.new(
-        :compress_css => true,
-        :remove_intertag_spaces => true
-      )
-
-      assert_equal result, compressor.compress(source)
-    end
-
     def test_compress
       source = read_resource("testCompress.html")
       result = read_resource("testCompressResult.html")
@@ -246,18 +207,6 @@ module HtmlCompressor
       assert_equal result, compressor.compress(source)
     end
 
-    private
-
-    def resource_path
-      File.join File.expand_path(File.dirname(__FILE__)), 'resources', 'html'
-    end
-
-    def read_resource file
-      File.open File.join(resource_path, file), 'r' do |f|
-        return f.readlines.join('')
-      end
-    end
-
   end
 
-end
+end

data/test/compressor_yui_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+module HtmlCompressor
+
+  class TestCompressor < Minitest::Test
+
+    def test_compress_javascript_yui
+      source = read_resource("testCompressJavaScript.html");
+      result = read_resource("testCompressJavaScriptYuiResult.html");
+
+      compressor = Compressor.new(
+        :compress_javascript => true,
+        :javascript_compressor => :yui,
+        :remove_intertag_spaces => true
+      )
+
+      assert_equal result, compressor.compress(source)
+    end
+
+    def test_compress_css
+      source = read_resource("testCompressCss.html")
+      result = read_resource("testCompressCssResult.html")
+
+      compressor = Compressor.new(
+        :compress_css => true,
+        :css_compressor => :yui,
+        :remove_intertag_spaces => true
+      )
+
+      assert_equal result, compressor.compress(source)
+    end
+
+  end
+
+end

data/test/resources/html/testCompressJavaScriptClosureResult.html

@@ -1,4 +1,4 @@
-<script type="text/javascript">var i=0,i=i+1;alert(i);</script><script><![CDATA[var i=0,i=i+1;alert(i);]]></script><pre>
+<script type="text/javascript">var a=0,a=a+1;alert(a);</script><script><![CDATA[var a=0,a=a+1;alert(a);]]></script><pre>
 	<script>
 		var i = 0; //comment
 		i = i + 1;

data/test/test_helper.rb

@@ -0,0 +1,22 @@
+require 'minitest/autorun'
+require 'htmlcompressor/compressor'
+
+module HtmlCompressor
+
+  class TestCompressor < Minitest::Test
+
+    private
+
+    def resource_path
+      File.join File.expand_path(File.dirname(__FILE__)), 'resources', 'html'
+    end
+
+    def read_resource file
+      File.open File.join(resource_path, file), 'r' do |f|
+        return f.readlines.join('')
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: htmlcompressor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Paolo Chiodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
+        version: '0.9'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: closure-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Put your html on a diet
 email:
 - chiodi84@gmail.com
@@ -83,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -91,9 +83,12 @@ files:
 - htmlcompressor.gemspec
 - lib/htmlcompressor.rb
 - lib/htmlcompressor/compressor.rb
+- lib/htmlcompressor/exceptions.rb
 - lib/htmlcompressor/rack.rb
 - lib/htmlcompressor/version.rb
+- test/compressor_closure_test.rb
 - test/compressor_test.rb
+- test/compressor_yui_test.rb
 - test/resources/html/.svn/all-wcprops
 - test/resources/html/.svn/entries
 - test/resources/html/.svn/prop-base/testRemoveHttpProtocol.html.svn-base
@@ -214,32 +209,34 @@ files:
 - test/resources/xml/testRemoveCommentsResult.xml
 - test/resources/xml/testRemoveIntertagSpaces.xml
 - test/resources/xml/testRemoveIntertagSpacesResult.xml
+- test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: htmlcompressor provides a class and a rack middleware to minify html pages
 test_files:
+- test/compressor_closure_test.rb
 - test/compressor_test.rb
+- test/compressor_yui_test.rb
 - test/resources/html/.svn/all-wcprops
 - test/resources/html/.svn/entries
 - test/resources/html/.svn/prop-base/testRemoveHttpProtocol.html.svn-base
@@ -360,3 +357,4 @@ test_files:
 - test/resources/xml/testRemoveCommentsResult.xml
 - test/resources/xml/testRemoveIntertagSpaces.xml
 - test/resources/xml/testRemoveIntertagSpacesResult.xml
+- test/test_helper.rb