html_press 0.0.3 → 0.0.4

data/Readme.md

@@ -88,4 +88,3 @@ bundle exec jekyll
   - Support other minifiers (Closure, YUI compressor)
   - htmlTydi
   - add examples of usage with Sinatra and Rails
-  

data/html_press.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency "rainpress"
   s.add_runtime_dependency "uglifier"
+  s.add_runtime_dependency "htmlentities"
 end

data/lib/html_press.rb

@@ -1,6 +1,7 @@
 require "html_press/version"
 require "html_press/rainpress"
 require "html_press/uglifier"
+require "html_press/html_entities"
 require "html_press/html"
 
 module HtmlPress

data/lib/html_press/html.rb

@@ -59,6 +59,13 @@ module HtmlPress
         ''
       end
 
+      # replace entities
+      out.gsub! /<|<|>|>|&|&/ do |m|
+        reserve m
+      end
+
+      out = HtmlPress.entities_compressor out
+
       # replace PREs with placeholders
       out.gsub! /\s*(<pre\b[^>]*?>[\s\S]*?<\/pre>)\s*/i do |m|
         pre = m.gsub(/\s*<pre\b[^>]*?>([\s\S]*?)<\/pre>\s*/i, "\\1")

data/lib/html_press/html_entities.rb

@@ -0,0 +1,12 @@
+module HtmlPress
+  begin
+    require 'htmlentities'
+    def self.entities_compressor (text)
+      HTMLEntities.new.decode(text)
+    end
+  rescue LoadError => e
+    def self.entities_compressor (text)
+      text
+    end
+  end
+end

data/lib/html_press/version.rb

@@ -1,3 +1,3 @@
 module HtmlPress
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/html_press_spec.rb

@@ -172,6 +172,11 @@ describe HtmlPress do
     # input value "" ?
   end
 
+  it "should convert html entities to utf-8 symbols" do
+    HtmlPress.compress("< < > > & &").should eql "< < > > & &"
+    HtmlPress.compress("élan").should eql "élan"
+  end
+
   # it "should compress javascript in event attributes" do
     # # javascript: - remove
     # # onfocus
@@ -192,9 +197,5 @@ describe HtmlPress do
 # 
   # it "should remove unnecessary quotes for attributes values" do
   # end
-# 
-  # it "should convert html entities to utf-8 symbols" do
-    # # except <>&
-  # end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_press
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26078568 !ruby/object:Gem::Requirement
+  requirement: &25710912 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26078568
+  version_requirements: *25710912
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26078208 !ruby/object:Gem::Requirement
+  requirement: &25710636 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26078208
+  version_requirements: *25710636
 - !ruby/object:Gem::Dependency
   name: rainpress
-  requirement: &26077776 !ruby/object:Gem::Requirement
+  requirement: &25710348 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26077776
+  version_requirements: *25710348
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &26077452 !ruby/object:Gem::Requirement
+  requirement: &25710036 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26077452
+  version_requirements: *25710036
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: &25709748 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *25709748
 description: Ruby gem for compressing html
 email:
 - stereobooster@gmail.com
@@ -69,6 +80,7 @@ files:
 - html_press.gemspec
 - lib/html_press.rb
 - lib/html_press/html.rb
+- lib/html_press/html_entities.rb
 - lib/html_press/rainpress.rb
 - lib/html_press/uglifier.rb
 - lib/html_press/version.rb