html_press 0.7.0 → 0.7.1

data/lib/html_press/html.rb

@@ -5,7 +5,8 @@ module HtmlPress
       :logger => false,
       :unquoted_attributes => false,
       :drop_empty_values => false,
-      :strip_crlf => false
+      :strip_crlf => false,
+      :js_minifier_options => false
     }
 
     def initialize (options = {})
@@ -71,7 +72,7 @@ module HtmlPress
           attrs(m, 'script', true)
         end
         begin
-          js_compressed = HtmlPress.js_compressor js
+          js_compressed = HtmlPress.js_compressor js, @options[:js_minifier_options]
           m.gsub!(js, js_compressed)
         rescue Exception => e
           log e.message
@@ -292,7 +293,7 @@ module HtmlPress
         if events.include? name
           value_original.gsub! /^javascript:\s+|;$/, ''
           begin
-            value_original = HtmlPress.js_compressor value_original
+            value_original = HtmlPress.js_compressor value_original, @options[:js_minifier_options]
             # TODO what about escaped attribute values?
             if delimiter == "\""
               value_original.gsub! "\"", "'"

data/lib/html_press/uglifier.rb

@@ -1,11 +1,14 @@
 module HtmlPress
   begin
     require 'uglifier'
-    def self.js_compressor (text)
-      Uglifier.new.compile(text).gsub(/;$/,'')
+    # 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)
+    def self.js_compressor (text, options = nil)
       text
     end
   end

data/lib/html_press/version.rb

@@ -1,3 +1,3 @@
 module HtmlPress
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/html_press_spec.rb

@@ -44,6 +44,9 @@ describe HtmlPress do
     pressed_script = "<script>" + HtmlPress.js_compressor(script) + "</script>"
     script = "  <script>" + script + "</script>  "
     HtmlPress.press(script).should eql pressed_script
+
+    script = %q{<script>window.jQuery||document.write('<script src="/components/jquery/jquery.js"><\/script>')</script>}
+    HtmlPress.press(script).should eql script
   end
 
   it "should compress css in style tags" do

metadata

@@ -1,103 +1,104 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: html_press
-version: !ruby/object:Gem::Version
-  version: 0.7.0
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
-authors:
+authors: 
 - stereobooster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    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
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: css_press
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: uglifier
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: uglifier
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: htmlentities
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: Ruby gem for compressing html
-email:
+email: 
 - stereobooster@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -115,32 +116,36 @@ files:
 - spec/html_press_spec.rb
 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 769698289
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 769698289
+      version: "0"
 requirements: []
+
 rubyforge_project: html_press
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Compress html
 test_files: []
+