[ORG-1674] Migrated from html_press to htmlcompressor and corrected .…

…awestruct_ignore-s a bit.
jbossorg · May 22, 2013 · 858a2c3 · 858a2c3
1 parent 7c1b248
commit 858a2c3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 20 deletions.
diff --git a/.awestruct_ignore b/.awestruct_ignore
@@ -1 +1,4 @@
 README.md
+CONTRIBUTING.md
+Gemfile*
+Rakefile
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'awestruct', '~> 0.5.0'	# Framework for creating static HTML sites
 gem 'uglifier', '~> 2.0.1'	# Ruby wrapper for UglifyJS JavaScript compressor
 gem 'cssminify', '~> 1.0.2'	# CSS compression using YUI compressor
-gem 'html_press', '~> 0.8.1'	# Compressing HTML
 gem 'less', '~> 2.3.2'		# Invoke the Less CSS compiler from Ruby
 gem 'therubyracer', '~> 0.11.4', :platforms => :ruby	# Call JavaScript code and manipulate JavaScript objects from Ruby and vice versa
 gem 'rb-fsevent', '~> 0.9.3'	# FSEvents API with Signals catching (without RubyCocoa)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,35 +28,22 @@ GEM
       sass (~> 3.1)
     compass-960-plugin (0.10.4)
       compass (>= 0.10.0)
-    css_press (0.3.2)
-      csspool-st (= 3.1.2)
-      json
     cssminify (1.0.2)
-    csspool-st (3.1.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
     fssm (0.2.10)
     git (1.2.5)
     haml (4.0.2)
       tilt
-    html_press (0.8.1)
-      htmlentities
-      multi_css (>= 0.1.0)
-      multi_js
     htmlcompressor (0.0.6)
       yui-compressor (~> 0.9.6)
-    htmlentities (4.3.1)
     json (1.7.7)
     kramdown (1.0.2)
     less (2.3.2)
       commonjs (~> 0.2.6)
     libv8 (3.11.8.17)
     listen (0.7.3)
     mime-types (1.23)
-    multi_css (0.1.0)
-      css_press
-    multi_js (0.0.1)
-      uglifier
     multi_json (1.7.3)
     nokogiri (1.5.9)
     open4 (1.3.0)
@@ -83,7 +70,6 @@ PLATFORMS
 DEPENDENCIES
   awestruct (~> 0.5.0)
   cssminify (~> 1.0.2)
-  html_press (~> 0.8.1)
   htmlcompressor (~> 0.0.3)
   kramdown (~> 1.0.1)
   less (~> 2.3.2)

diff --git a/_config/site.yml b/_config/site.yml
@@ -2,9 +2,9 @@
 title: JBoss Community
 
 # Default minify settings
-css_minifier: disabled
-js_minifier: disabled
-html_minifier: disabled
+css_minifier: enabled
+js_minifier: enabled
+html_minifier: enabled
 
 # Merge multiple JavaScript files to improve performance
 fileMerger:

diff --git a/_ext/html_minifier.rb b/_ext/html_minifier.rb
@@ -1,4 +1,4 @@
-require 'html_press'
+require 'htmlcompressor'
 
 ##
 #
@@ -45,7 +45,8 @@ def transform(site, page, input)
           ext_txt = ext[1..-1]
           if ext_txt == "html"
             print "Minifying html #{page.output_path} \n"
-            input = HtmlPress.compress(input)
+            compressor = HtmlCompressor::Compressor.new
+            input = compressor.compress(input)
           end
         end