html_press 0.6.6 → 0.6.7

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in html_press.gemspec
-gemspec
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in html_press.gemspec
+gemspec

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-
-[:build, :install, :release].each do |task_name|
-  Rake::Task[task_name].prerequisites << :spec
-end
-
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new
-
-task :default => :spec
+require "bundler/gem_tasks"
+
+[:build, :install, :release].each do |task_name|
+  Rake::Task[task_name].prerequisites << :spec
+end
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new
+
+task :default => :spec

data/Readme.md

@@ -14,90 +14,57 @@ Remove all whitespace junk. Leave only HTML
 
 ## Usage
 
-### Jekyll
-
-Gemfile
-
-```ruby
-gem "jekyll"
-gem "html_press"
-```
-
-_plugins/strip_tag.rb
-
+### Ruby
 ```ruby
-module Jekyll
-  class StripTag < Liquid::Block
-    @total_economy = 0
-    class << self 
-      attr_accessor :total_economy
-    end 
-
-    begin
-      require 'html_press'
-      def render(context)
-        text = super
-        before = text.bytesize
-        text = HtmlPress.press text
-        after = text.bytesize
-
-        self.class.total_economy += before - after
-        economy = (self.class.total_economy.to_f / 1024).round(2)
-        p 'totally saved: ' + economy.to_s + ' Kb'
-        text
-      end
-    rescue LoadError => e
-      p "Unable to load 'html_press'"
-    end
-  end
-end
-
-Liquid::Template.register_tag('strip', Jekyll::StripTag)
+require 'html_press'
+compressed_html = HtmlPress.press html
 ```
 
-In templates
+### Jekyll
+see [jekyll_press](https://github.com/stereobooster/jekyll_press)
 
-```liquid
-{% strip %}
-here goes text...
-{% endstrip %}
-```
+### Rails
+TODO :exclamation:
 
-Run
+### Sinatra
+TODO :exclamation:
 
-```
-bundle install
-bundle exec jekyll
-```
+### Command line
+TODO :exclamation:
 
 ## TODO
-
   - use parser ([鋸](https://github.com/tenderlove/nokogiri)) instead of regexp's
-  - check if all utf-8 symbols, are smaller than html entities
-  - ambigious ampersands
-  - cli
+    - add option to convert relative urls to absolute urls (for SEO)
+  - [ambigious ampersands](http://mathiasbynens.be/notes/ambiguous-ampersands) for compression?
   - Support other js/css minifiers (Closure, YUI compressor)
   - htmlTydi
-  - add examples of usage with Sinatra and Rails
+  - Rack plugin
 
 ## Alternatives
-
-  - [html-minifier](https://github.com/kangax/html-minifier) (js), [test suite](https://github.com/kangax/html-minifier/blob/gh-pages/tests/index.html), [ruby wrapper - html_minifier](https://github.com/stereobooster/html_minifier)
+  - [html-minifier](https://github.com/kangax/html-minifier) (js), [test suite](https://github.com/kangax/html-minifier/blob/gh-pages/tests/index.html), ruby wrapper - [html_minifier](https://github.com/stereobooster/html_minifier)
   - [htmlcompressor](http://code.google.com/p/htmlcompressor/) (java), [test suite](http://code.google.com/p/htmlcompressor/source/browse/#svn%2Ftrunk%2Fsrc%2Ftest%2Fresources%2Fhtml%253Fstate%253Dclosed)
   - PHPTal compress (php), [test suite](https://svn.motion-twin.com/phptal/trunk/tests/CompressTest.php)
   - [W3 total cache](http://wordpress.org/extend/plugins/w3-total-cache/) - WP plugin from smashingmagazine contains html minifier (php)
 
 ## Additional tools
-
-  - https://github.com/gfranco/jeanny
-  - https://github.com/aanand/deadweight
-  - https://github.com/aberant/css-spriter
-  - https://github.com/sstephenson/sprockets
-  - https://github.com/documentcloud/jammit
-  - https://github.com/cjohansen/juicer
-  - https://github.com/alexdunae/w3c_validators
+  - [jeanny](https://github.com/gfranco/jeanny) - rename css classes and ids in css and html files
+    - make shorter pathes for images in css
+  - [deadweight](https://github.com/aanand/deadweight) - remove unused css rules from css files
+  - [css-spriter](https://github.com/aberant/css-spriter), [sprite-factory](https://github.com/jakesgordon/sprite-factory) - combine images in sprites
+  - resize images by size defined in html and vice versa embed size of images in html
+  - [#1](http://habrahabr.ru/post/90761/), [#2](http://ap-project.org/English/Article/View/53/) - inline small images in css
+  - [smusher](https://github.com/grosser/smusher), jpegtran, optipng - losslessly minify images
+  - [sprockets](https://github.com/sstephenson/sprockets), [jammit](https://github.com/documentcloud/jammit) - asset bundlers
+  - [w3c_validators](https://github.com/alexdunae/w3c_validators)
+  - [reduce](https://github.com/grosser/reduce)
 
 ## Resources
+
+### Minimize HTML
   - http://perfectionkills.com/experimenting-with-html-minifier
   - http://perfectionkills.com/optimizing-html
-  - https://developers.google.com/speed/articles/optimizing-html
+  - https://developers.google.com/speed/articles/optimizing-html
+
+### Front-end optimization
+  - https://developers.google.com/speed/docs/insights/rules
+  - http://developer.yahoo.com/performance/rules.html

data/html_press.gemspec

@@ -1,29 +1,29 @@
-# -*- 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.rubyforge_project = "html_press"
-
-  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_dependency "nokogiri"
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rake"
-  
-  s.add_runtime_dependency "css_press", ">=0.3.2"
-  s.add_runtime_dependency "uglifier"
-  s.add_runtime_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.rubyforge_project = "html_press"
+
+  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_dependency "nokogiri"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
+  
+  s.add_runtime_dependency "css_press", ">=0.3.2"
+  s.add_runtime_dependency "uglifier"
+  s.add_runtime_dependency "htmlentities"
+end

data/lib/html_press/html.rb

@@ -75,21 +75,17 @@ 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")
         pre_compressed = pre.gsub(/\s+$/, '')
+        pre_compressed = HtmlPress.entities_compressor pre_compressed
         m.gsub!(pre, pre_compressed)
         reserve m
       end
 
+      out = HtmlPress.entities_compressor out
+
       # replace TEXTAREAs with placeholders
       out.gsub! /\s*(<textarea\b[^>]*?>[\s\S]*?<\/textarea>)\s*/i do |m|
         reserve m

data/lib/html_press/html_entities.rb

@@ -1,12 +1,37 @@
+require 'htmlentities'
+
 module HtmlPress
-  begin
-    require 'htmlentities'
-    def self.entities_compressor (text)
-      HTMLEntities.new.decode(text)
+  class Entities
+    def initialize
+      @replacement_hash = 'MINIFYENTITY' + Time.now.to_i.to_s
+      @placeholders = []
     end
-  rescue LoadError => e
-    def self.entities_compressor (text)
-      text
+
+    def reserve(content)
+      @placeholders.push content
+      '%' + @replacement_hash + '%' + (@placeholders.size - 1).to_s + '%'
     end
+
+    def minify text
+      out = text.dup
+
+      out.gsub! /<|<|>|>|&|&/ do |m|
+        reserve m
+      end
+
+      out = HTMLEntities.new.decode(out)
+
+      re = Regexp.new('%' + @replacement_hash + '%(\d+)%')
+      out.gsub! re do |m|
+        m.gsub!(re, "\\1")
+        @placeholders[m.to_i]
+      end
+
+      out
+    end
+  end
+
+  def self.entities_compressor (text)
+    Entities.new.minify(text)
   end
 end

data/lib/html_press/version.rb

@@ -1,3 +1,3 @@
-module HtmlPress
-  VERSION = "0.6.6"
-end
+module HtmlPress
+  VERSION = "0.6.7"
+end

data/lib/html_press.rb

@@ -1,17 +1,17 @@
-require "html_press/version"
-require "html_press/css_press"
-require "html_press/uglifier"
-require "html_press/html_entities"
-require "html_press/html"
-
-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/css_press"
+require "html_press/uglifier"
+require "html_press/html_entities"
+require "html_press/html"
+
+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

data/spec/html_press_spec.rb

@@ -180,6 +180,9 @@ describe HtmlPress do
   it "should convert html entities to utf-8 symbols" do
     HtmlPress.press("< < > > & &").should eql "< < > > & &"
     HtmlPress.press("élan").should eql "élan"
+    %W{textarea pre}.each do |t|
+      HtmlPress.press("<#{t}>&#39;</#{t}>").should eql "<#{t}>'</#{t}>"
+    end
   end
 
   it "should remove unnecessary quotes for attribute values" do

metadata

@@ -1,105 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: html_press
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.6.7
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 6
-  version: 0.6.6
 platform: ruby
-authors: 
+authors:
 - stereobooster
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-07 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-  prerelease: false
+date: 2012-09-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: css_press
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: uglifier
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: htmlentities
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby gem for compressing html
-email: 
+email:
 - stereobooster@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -113,39 +111,34 @@ files:
 - lib/html_press/uglifier.rb
 - lib/html_press/version.rb
 - spec/html_press_spec.rb
-has_rdoc: true
 homepage: https://github.com/stereobooster/html_press
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 26551057
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 26551057
 requirements: []
-
 rubyforge_project: html_press
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Compress html
 test_files: []
-