html_press 0.7.2 → 0.8.0

data/Gemfile

@@ -1,6 +1,6 @@
-source "http://rubygems.org"
+source :rubygems
 
 # Specify your gem's dependencies in html_press.gemspec
 gemspec
 
-gem "ruby-prof", :platforms => :mri
+# gem "ruby-prof", :platforms => :mri

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2012 sterebooster
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/html_press.gemspec

@@ -10,20 +10,17 @@ Gem::Specification.new do |s|
   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.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_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"
+  s.add_dependency "multi_css", ">= 0.1.0"
+  s.add_dependency "uglifier"
+  s.add_dependency "htmlentities"
 end

data/lib/html_press.rb

@@ -1,9 +1,10 @@
 require "html_press/version"
-require "html_press/css_press"
 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

data/lib/html_press/html.rb

@@ -89,7 +89,7 @@ module HtmlPress
           attrs(m, 'style', true)
         end
         begin
-          css_compressed = HtmlPress.style_compressor css
+          css_compressed = MultiCss.min css
           m.gsub!(css, css_compressed)
         rescue Exception => e
           log e.message
@@ -269,14 +269,14 @@ module HtmlPress
 
         if name == "style"
           begin
-            value_original = HtmlPress.css_compressor value_original
+            value_original = MultiCss.min_attr value_original
             # TODO what about escaped attribute values?
             if delimiter == "\""
               value_original.gsub!("\"", "'")
             else
               value_original.gsub!("'", "\"")
             end
-          rescue Exception => e
+          rescue MultiCss::ParseError => e
             log e.message
           end
         end

data/lib/html_press/version.rb

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

data/spec/html_press_spec.rb

@@ -52,7 +52,7 @@ describe HtmlPress do
 
   it "should compress css in style tags" do
     style = "  div { margin: 0px 0px; \n}  "
-    pressed_style = "<style>" + HtmlPress.style_compressor(style) + "</style>"
+    pressed_style = "<style>" + MultiCss.min(style) + "</style>"
     style = "  <style>" + style + "</style>  "
     HtmlPress.press(style).should eql pressed_style
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_press
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: css_press
+  name: multi_css
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -101,11 +101,11 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- LICENSE.txt
 - Rakefile
 - Readme.md
 - html_press.gemspec
 - lib/html_press.rb
-- lib/html_press/css_press.rb
 - lib/html_press/html.rb
 - lib/html_press/html_entities.rb
 - lib/html_press/uglifier.rb
@@ -114,7 +114,8 @@ files:
 - profile/profile.rb
 - spec/html_press_spec.rb
 homepage: https://github.com/stereobooster/html_press
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -132,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: html_press
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Compress html

data/lib/html_press/css_press.rb

@@ -1,21 +0,0 @@
-module HtmlPress
-  begin
-    require 'css_press'
-    def self.css_compressor (text)
-      text = "a{#{text}}"
-      text = CssPress.press text
-      text.gsub(/^a\{/, '').gsub(/\}$/, '')
-    end
-    def self.style_compressor (text)
-      CssPress.press text
-    end
-  rescue LoadError => e
-    def self.css_compressor (text)
-      text
-    end
-    def self.style_compressor (text)
-      text
-    end
-  end
-
-end