html_press 0.8.0 → 0.8.1

data/Readme.md

@@ -1,8 +1,6 @@
-#html_press
+# HtmlPress [![Build Status](https://secure.travis-ci.org/stereobooster/html_press.png?branch=master)](https://secure.travis-ci.org/#!/stereobooster/html_press) [![Dependency Status](https://gemnasium.com/stereobooster/html_press.png?travis)](https://gemnasium.com/stereobooster/html_press) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/stereobooster/html_press)
 
-[![Build Status](https://secure.travis-ci.org/stereobooster/html_press.png?branch=master)](http://travis-ci.org/stereobooster/html_press)
-
-## how it works
+## How it works
 
 Remove all whitespace junk. Leave only HTML
 

data/html_press.gemspec

@@ -1,26 +1,26 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "html_press/version"
-
-Gem::Specification.new do |s|
-  s.name        = "html_press"
-  s.version     = HtmlPress::VERSION
-  s.authors     = ["stereobooster"]
-  s.email       = ["stereobooster@gmail.com"]
-  s.homepage    = "https://github.com/stereobooster/html_press"
-  s.summary     = %q{Compress html}
-  s.description = %q{Ruby gem for compressing html}
-  s.license     = "MIT"
-
-  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.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rake"
-  
-  s.add_dependency "multi_css", ">= 0.1.0"
-  s.add_dependency "uglifier"
-  s.add_dependency "htmlentities"
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "html_press/version"
+
+Gem::Specification.new do |s|
+  s.name        = "html_press"
+  s.version     = HtmlPress::VERSION
+  s.authors     = ["stereobooster"]
+  s.email       = ["stereobooster@gmail.com"]
+  s.homepage    = "https://github.com/stereobooster/html_press"
+  s.summary     = %q{Compress html}
+  s.description = %q{Ruby gem for compressing html}
+  s.license     = "MIT"
+
+  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.require_paths = ["lib"]
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  
+  s.add_dependency "multi_css", ">= 0.1.0"
+  s.add_dependency "multi_js"
+  s.add_dependency "htmlentities"
+end

data/lib/html_press.rb

@@ -1,18 +1,23 @@
-require "html_press/version"
-require "html_press/uglifier"
-require "html_press/html_entities"
-require "html_press/html"
-
-require 'multi_css'
-
-module HtmlPress
-  def self.press(text, options = {})
-    HtmlPress::Html.new(options).press text
-  end
-
-  # for backward compatibility
-  def self.compress(text, options = {})
-    HtmlPress::Html.new(options).press text
-  end
-
-end
+require "html_press/version"
+require "html_press/html_entities"
+require "html_press/html"
+
+require 'multi_css'
+require 'multi_js'
+
+module HtmlPress
+  def self.press(text, options = {})
+    HtmlPress::Html.new(options).press text
+  end
+
+  # for backward compatibility
+  def self.compress(text, options = {})
+    HtmlPress::Html.new(options).press text
+  end
+
+  def self.js_compressor (text, options = nil)
+    options ||= {}
+    options[:inline_script] = true
+    MultiJs.compile(text, options).gsub(/;$/,'')
+  end
+end

data/lib/html_press/html.rb

@@ -74,7 +74,7 @@ module HtmlPress
         begin
           js_compressed = HtmlPress.js_compressor js, @options[:js_minifier_options]
           m.gsub!(js, js_compressed)
-        rescue Exception => e
+        rescue MultiJs::ParseError => e
           log e.message
         end
         reserve m
@@ -214,7 +214,7 @@ module HtmlPress
 
     def attr(attribute, delimiter, tag)
       re = "([a-z\\-_:]+)(=" + delimiter + "[^" + delimiter + "]*" + delimiter + ")?"
-      re = Regexp.new re
+      re = Regexp.new re, true
       value_original = attribute.gsub(re, "\\2")
       value = value_original.downcase
       name_original = attribute.gsub(re, "\\1")
@@ -298,7 +298,7 @@ module HtmlPress
             if delimiter == "\""
               value_original.gsub! "\"", "'"
             end
-          rescue Exception => e
+          rescue MultiJs::ParseError => e
             log e.message
           end
         end

data/lib/html_press/version.rb

@@ -1,3 +1,3 @@
 module HtmlPress
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/html_press_spec.rb

@@ -81,13 +81,20 @@ describe HtmlPress do
     HtmlPress.press(text).should eql text2
   end
 
-  # TODO concatenate adjacent script tags
   it "should remove whitespaces between script tags" do
     text = "<p></p>  <script>var a</script> \t <script>var b</script>"
     text2 = "<p></p> <script>var a</script><script>var b</script>"
     HtmlPress.press(text).should eql text2
   end
 
+  it "should concatenate adjacent script tags" do
+    pending "Not implemented yet" do
+      text = "<p></p>  <script>var a</script> \t <script>function b(){}</script>"
+      text2 = "<p></p> <script>var a;function b(){}</script>"
+      HtmlPress.press(text).should eql text2
+    end
+  end
+
   it "should treat text inside IE conditional comments as it was without comments" do
     text = "<div class=\"a\"   id=\"b\">    </div>    <p></p>"
     text2 = HtmlPress.press(text)
@@ -114,6 +121,11 @@ describe HtmlPress do
     # HtmlPress.press("<p class = a></p>").should eql "<p class=a></p>"
   end
 
+  it "should work with different case attributes" do
+    text = '<embed allowFullScreen="true" allowScriptAccess="always"/>'
+    HtmlPress.press(text).should eql text
+  end
+
   it "should optimize attributes" do
     HtmlPress.press("<p class=\"a  b\"></p>").should eql "<p class=\"a b\"></p>"
     # TODO http(s):// to //
@@ -132,12 +144,13 @@ describe HtmlPress do
     HtmlPress.press(text).should eql text
   end
 
-  # TODO
-  # it "should compress namespaces" do
-  #   text = "<html xmlns:og=\"http://ogp.me/ns#\" class=\"a b\"><og:like>like</og:like></html>"
-  #   text1 = "<html xmlns:a=\"http://ogp.me/ns#\" class=\"a b\"><a:like>like</a:like></html>"
-  #   HtmlPress.press(text).should eql text1
-  # end
+  it "should compress namespaces" do
+    pending "Not implemented yet" do
+      text = "<html xmlns:og=\"http://ogp.me/ns#\" class=\"a b\"><og:like>like</og:like></html>"
+      text1 = "<html xmlns:a=\"http://ogp.me/ns#\" class=\"a b\"><a:like>like</a:like></html>"
+      HtmlPress.press(text).should eql text1
+    end
+  end
 
   it "should not modify input value" do
     text = "<div>   </div>"
@@ -175,15 +188,17 @@ describe HtmlPress do
     HtmlPress.press("<input disabled=\"disabled\"/>").should eql "<input disabled/>"
     # readonly            (input type=text/password, textarea)
     HtmlPress.press("<input readonly=\"readonly\"/>").should eql "<input readonly/>"
-    # HtmlPress.press("<script src=\"example.com\" async=\"async\"></script>").should eql "<script src=\"example.com\" async></script>"
-    # HtmlPress.press("<script src=\"example.com\" defer=\"defer\"></script>").should eql "<script src=\"example.com\" async></script>"
-    # HtmlPress.press("<select multiple=\"multiple\"/>").should eql "<select multiple/>"
-    # ismap     isMap     (img, input type=image)
-    # declare             (object; never used)
-    # noresize  noResize  (frame)
-    # nowrap    noWrap    (td, th; deprecated)
-    # noshade   noShade   (hr; deprecated)
-    # compact             (ul, ol, dl, menu, dir; deprecated)
+    pending "Not implemented yet" do
+      HtmlPress.press("<script src=\"example.com\" async=\"async\"></script>").should eql "<script src=\"example.com\" async></script>"
+      HtmlPress.press("<script src=\"example.com\" defer=\"defer\"></script>").should eql "<script src=\"example.com\" defer></script>"
+      HtmlPress.press("<select multiple=\"multiple\"/>").should eql "<select multiple/>"
+      # ismap     isMap     (img, input type=image)
+      # declare             (object; never used)
+      # noresize  noResize  (frame)
+      # nowrap    noWrap    (td, th; deprecated)
+      # noshade   noShade   (hr; deprecated)
+      # compact             (ul, ol, dl, menu, dir; deprecated)
+    end
   end
 
   it "should remove attributes with default values" do
@@ -235,9 +250,8 @@ describe HtmlPress do
     end
   end
 
-  # TODO
-  # it "should concatenate adjecent style tags" do
-  #   all stylle tags can be collected, concatneated and placed in header
-  # end
-
+  it "should concatenate adjecent style tags" do
+    pending "Not implemented yet"
+    # all stylle tags can be collected, concatneated and placed in header
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_press
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: multi_js
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,6 @@ files:
 - lib/html_press.rb
 - lib/html_press/html.rb
 - lib/html_press/html_entities.rb
-- lib/html_press/uglifier.rb
 - lib/html_press/version.rb
 - profile/index.html
 - profile/profile.rb
@@ -126,15 +125,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 868935485
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 868935485
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Compress html

data/lib/html_press/uglifier.rb

@@ -1,15 +0,0 @@
-module HtmlPress
-  begin
-    require 'uglifier'
-    # Available options https://github.com/lautis/uglifier#options
-    def self.js_compressor (text, options = nil)
-      options ||= {}
-      options[:inline_script] = true
-      Uglifier.new(options).compile(text).gsub(/;$/,'')
-    end
-  rescue LoadError => e
-    def self.js_compressor (text, options = nil)
-      text
-    end
-  end
-end