middleman-minify-html 3.0.0.beta.3 → 3.0.0.rc.1

data/.gitignore

@@ -1,3 +1,5 @@
 .DS_Store
 Gemfile.lock
 tmp
+.rbenv-*
+pkg

data/.travis.yml

@@ -2,8 +2,9 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+
 script: "bundle exec rake test"
 
-branches:
-  only:
-    - master
+env: TEST=true

data/Rakefile

@@ -4,7 +4,12 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  ENV["TEST"] = "true"
+
+  exempt_tags = ""
+  exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
+
+  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 require 'rake/clean'

data/features/preview.feature

@@ -29,4 +29,4 @@ Feature: Minify HTML
       """
     And a successfully built app at "basic-app"
     When I cd to "build"
-    Then the file "index.html" should contain "<h1> Multi Line </h1> <h2> Broken Up </h2>"
+    Then the file "index.html" should contain "<h1> Multi Line </h1><h2> Broken Up </h2>"

data/lib/middleman-minify-html/extension.rb

@@ -1,50 +1,20 @@
 module Middleman
   module MinifyHtml
     class << self
-      def registered(app)
+      def registered(app, options={})
         app.set :html_compressor, false
         
         app.after_configuration do
           unless respond_to?(:html_compressor) && html_compressor
-            require 'html_compressor'
-            set :html_compressor, ::HtmlCompressor::HtmlCompressor.new
+            require 'htmlcompressor'
+            set :html_compressor, ::HtmlCompressor::Compressor.new(options)
           end
           
           # Setup Rack to watch for inline JS
-          use MinifyHtmlRack, :compressor => html_compressor
+          use ::HtmlCompressor::Rack, options
         end
       end
       alias :included :registered
     end
-
-    class MinifyHtmlRack
-      
-      # Init
-      # @param [Class] app
-      # @param [Hash] options
-      def initialize(app, options={})
-        @app = app
-        @compressor = options[:compressor]
-      end
-
-      # Rack interface
-      # @param [Rack::Environmemt] env
-      # @return [Array]
-      def call(env)
-        status, headers, response = @app.call(env)
-
-        path = env["PATH_INFO"]
-
-        if path.end_with?('.html')
-          uncompressed_source = ::Middleman::Util.extract_response_text(response)
-          minified_html = @compressor.compress(uncompressed_source)
-
-          headers["Content-Length"] = ::Rack::Utils.bytesize(minified_html).to_s
-          response = [minified_html]
-        end
-
-        [status, headers, response]
-      end
-    end    
   end
 end

data/lib/middleman-minify-html/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module MinifyHtml
-    VERSION = "3.0.0.beta.3"
+    VERSION = "3.0.0.rc.1"
   end
 end

data/lib/middleman-minify-html.rb

@@ -1,6 +1,6 @@
 require "middleman-core"
 
-::Middleman::Extensions.register(:minify_html, ">= 3.0.0.beta.3") do
+::Middleman::Extensions.register(:minify_html) do
   require "middleman-minify-html/extension"
   ::Middleman::MinifyHtml
 end

data/middleman-minify-html.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
   s.add_runtime_dependency("middleman-core", [">= 3.0.0.beta.3"])
-  s.add_runtime_dependency("html_compressor")
+  s.add_runtime_dependency("htmlcompressor")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-minify-html
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.3
+  version: 3.0.0.rc.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
-  requirement: &70134298159860 !ruby/object:Gem::Requirement
+  requirement: &70141864374620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *70134298159860
+  version_requirements: *70141864374620
 - !ruby/object:Gem::Dependency
-  name: html_compressor
-  requirement: &70134298159440 !ruby/object:Gem::Requirement
+  name: htmlcompressor
+  requirement: &70141864374200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134298159440
+  version_requirements: *70141864374200
 description: A html whitespace minifier for Middleman
 email:
 - me@tdreyno.com
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2516722774850114131
+      hash: 105983893746764668
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: middleman-minify-html
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A html whitespace minifier for Middleman