html_press 0.0.1 → 0.0.2

data/lib/html_press/html.rb

@@ -1,8 +1,14 @@
 module HtmlPress
   class Html
 
-    def self.compress text
-      Html.new.compile text
+    def initialize (options = nil)
+      @options = options
+    end
+
+    def log (text)
+      if !@options.nil? && @options[:logger]
+        @options[:logger].warn text
+      end
     end
 
     def compile (html)
@@ -13,6 +19,15 @@ module HtmlPress
       @placeholders = []
       @strip_crlf = false
 
+      # IE conditional comments
+      out.gsub! /\s*(<!--\[[^\]]+\]>[\s\S]*?<!\[[^\]]+\]-->)\s*/ do |m|
+        m.gsub!(/^\s+|\s+$/, '')
+        comment = m.gsub(/\s*<!--\[[^\]]+\]>([\s\S]*?)<!\[[^\]]+\]-->\s*/, "\\1")
+        comment_compressed = Html.new.compile(comment)
+        m.gsub!(comment, comment_compressed)
+        reserve m
+      end
+
       # replace SCRIPTs (and minify) with placeholders
       out.gsub! /\s*(<script\b[^>]*?>[\s\S]*?<\/script>)\s*/i do |m|
         m.gsub!(/^\s+|\s+$/, '')
@@ -21,7 +36,7 @@ module HtmlPress
           js_compressed = HtmlPress.js_compressor js
           m.gsub!(js, js_compressed)
         rescue Exception => e
-          # p e.message
+          log e.message
         end
         reserve m
       end
@@ -34,20 +49,11 @@ module HtmlPress
           css_compressed = HtmlPress.css_compressor css
           m.gsub!(css, css_compressed)
         rescue Exception => e
-          # p e.message
+          log e.message
         end
         reserve m
       end
 
-      # IE conditional comments
-      out.gsub! /\s*(<!--\[[^\]]+\]>[\s\S]*?<!\[[^\]]+\]-->)\s*/ do |m|
-        m.gsub!(/^\s+|\s+$/, '')
-        comment = m.gsub(/\s*<!--\[[^\]]+\]>([\s\S]*?)<!\[[^\]]+\]-->\s*/, "\\1")
-        comment_compressed = Html.new.compile(comment)
-        m.gsub!(comment, comment_compressed)
-        reserve m
-      end
-
       # remove out comments (not containing IE conditional comments).
       out.gsub! /<!--([\s\S]*?)-->/ do |m|
         ''
@@ -72,7 +78,7 @@ module HtmlPress
 
       re = '\\s+(<\\/?(?:area|base(?:font)?|blockquote|body' +
         '|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form' +
-        '|frame(?:set)?|h[1-6]|head|hr|out|legend|li|link|map|menu|meta' +
+        '|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta' +
         '|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h|r|foot|itle)' +
         '|ul)\\b[^>]*>)'
 
@@ -122,13 +128,13 @@ module HtmlPress
       end
       
       if attributes.size > 0
-        attributes_compressed = attributes.gsub(/\s*([a-z\-_]+(="[^"]*")?(='[^']*')?)\s*/i, " \\1")
+        attributes_compressed = attributes.gsub(/\s*([a-z\-_:]+(="[^"]*")?(='[^']*')?)\s*/i, " \\1")
   
-        attributes_compressed.gsub! /([a-z\-_]+="[^"]*")/ do |k|
+        attributes_compressed.gsub! /([a-z\-_:]+="[^"]*")/i do |k|
           attr k, "\"", tag
         end
   
-        attributes_compressed.gsub! /([a-z\-_]+='[^']*')/ do |k|
+        attributes_compressed.gsub! /([a-z\-_:]+='[^']*')/i do |k|
           attr k, "'", tag
         end
   
@@ -139,7 +145,7 @@ module HtmlPress
     end
 
     def attr(attribute, delimiter, tag)
-      re = "([a-z\\-_]+)(=" + delimiter + "[^" + delimiter + "]*" + delimiter + ")?"
+      re = "([a-z\\-_:]+)(=" + delimiter + "[^" + delimiter + "]*" + delimiter + ")?"
       re = Regexp.new re
       value = attribute.gsub(re, "\\2")
 

data/lib/html_press/version.rb

@@ -1,3 +1,3 @@
 module HtmlPress
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/html_press.rb

@@ -4,7 +4,7 @@ require "html_press/uglifier"
 require "html_press/html"
 
 module HtmlPress
-    def self.compress(text)
-      self::Html.new.compile text
+    def self.compress(text, options = nil)
+      self::Html.new(options).compile text
     end
 end

data/spec/html_press_spec.rb

@@ -2,6 +2,16 @@
 
 require_relative "../lib/html_press"
 
+class Lg
+  attr_accessor :warns
+  def initialize
+    @warns = []
+  end
+  def warn text
+    @warns.push text
+  end
+end
+
 describe HtmlPress do
   before :each do
   end
@@ -12,6 +22,7 @@ describe HtmlPress do
 
   it "should leave no whitespaces between block tags" do
     HtmlPress.compress("<div></div> \t\r\n  <div></div>").should eql "<div></div><div></div>"
+    HtmlPress.compress("<div>  <div> \t\r\n  </div>  </div>").should eql "<div><div></div></div>"
   end
 
   it "should leave only one whitespace in text" do
@@ -80,6 +91,11 @@ describe HtmlPress do
     text = "<!--[if IE]>" + text + "<![endif]-->"
     text2 = "<!--[if IE]>" + text2 + "<![endif]-->"
     HtmlPress.compress(text).should eql text2
+    text = "<script> (function(undefined){ var a;}()) </script>"
+    text2 = HtmlPress.compress(text)
+    text = "<!--[if IE]>" + text + "<![endif]-->"
+    text2 = "<!--[if IE]>" + text2 + "<![endif]-->"
+    HtmlPress.compress(text).should eql text2
   end
 
   it "should remove unnecessary whitespaces in html attributes (class)" do
@@ -91,6 +107,25 @@ describe HtmlPress do
     HtmlPress.compress("<p style=\"display: none;\"></p>").should eql "<p style=\"display:none;\"></p>"
   end
 
+  it "should work with namespaces" do
+    text = "<html xmlns:og=\"http://ogp.me/ns#\" class=\"a b\"><og:like>like</og:like></html>"
+    HtmlPress.compress(text).should eql text
+  end
+
+  it "should not modify input value" do
+    text = "<div> </div>"
+    text1 = text + ""
+    HtmlPress.compress(text)
+    text.should eql text1
+  end
+  
+  it "should not modify input value" do
+    script_with_error = "<script>function(){</script>"
+    l = Lg.new
+    l.warns.size.should eql 0
+    HtmlPress.compress(script_with_error, {:logger => l}).should eql script_with_error
+    l.warns.size.should eql 1
+  end
   # it "should remove unnecessary attributes" do
     # HtmlPress.compress("<script type=\"text/javascript\">var a;</script>").should eql "<script>var a;</script>"
   # end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_press
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19832364 !ruby/object:Gem::Requirement
+  requirement: &25089276 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19832364
+  version_requirements: *25089276
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &20531592 !ruby/object:Gem::Requirement
+  requirement: &25978872 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20531592
+  version_requirements: *25978872
 - !ruby/object:Gem::Dependency
   name: rainpress
-  requirement: &20756364 !ruby/object:Gem::Requirement
+  requirement: &26094612 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20756364
+  version_requirements: *26094612
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &21077148 !ruby/object:Gem::Requirement
+  requirement: &26094228 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21077148
+  version_requirements: *26094228
 description: Ruby gem for compressing html
 email:
 - stereobooster@gmail.com