uglifier 1.0.4 → 1.1.0

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - jruby
 before_script: "git submodule update --init --recursive"
 env:
@@ -13,6 +14,8 @@ matrix:
       env: EXECJS_RUNTIME=RubyRhino
     - rvm: 1.9.2
       env: EXECJS_RUNTIME=RubyRhino
+    - rvm: 1.9.3
+      env: EXECJS_RUNTIME=RubyRhino
     - rvm: jruby
       env: EXECJS_RUNTIME=RubyRacer
     - rvm: jruby

data/Gemfile

@@ -18,8 +18,9 @@ end
 gem ENV["MULTI_JSON_ENGINE"], :group => :development if ENV["MULTI_JSON_ENGINE"]
 
 group :development do
-  gem "rspec", "~> 2.6.0"
+  gem "rspec", "~> 2.7"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem "rcov", ">= 0"
+  gem "rdoc", "~> 3.11"
 end

data/README.rdoc

@@ -38,15 +38,17 @@ Available options and their defaults are
     :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
     :seqs => true, # Reduce consecutive statements in blocks into single statement
     :dead_code => true, # Remove dead code (e.g. after return)
+    :lift_vars => false, # Lift all var declarations at the start of the scope
     :unsafe => false, # Optimizations known to be unsafe in some situations
     :copyright => true, # Show copyright message
+    :ascii_only => false, # Encode non-ASCII characters as Unicode code points
+    :inline_script => false, # Escape </script
+    :quote_keys => false, # Quote keys in object literals
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
       :indent_start => 0,
-      :quote_keys => false,
-      :space_colon => 0,
-      :ascii_only => false
+      :space_colon => false
     }
   }
 

data/Rakefile

@@ -33,7 +33,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.0

data/lib/es5.js

@@ -150,4 +150,38 @@ if (!Array.prototype.reduce)
 
     return accumulator;
   };
-}
+}
+
+// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+        "use strict";
+        if (this === void 0 || this === null) {
+            throw new TypeError();
+        }
+        var t = Object(this);
+        var len = t.length >>> 0;
+        if (len === 0) {
+            return -1;
+        }
+        var n = 0;
+        if (arguments.length > 0) {
+            n = Number(arguments[1]);
+            if (n !== n) { // shortcut for verifying if it's NaN
+                n = 0;
+            } else if (n !== 0 && n !== Infinity && n !== -Infinity) {
+                n = (n > 0 || -1) * Math.floor(Math.abs(n));
+            }
+        }
+        if (n >= len) {
+            return -1;
+        }
+        var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+        for (; k < len; k++) {
+            if (k in t && t[k] === searchElement) {
+                return k;
+            }
+        }
+        return -1;
+    }
+}

data/lib/uglifier.rb

@@ -16,15 +16,17 @@ class Uglifier
     :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
     :seqs => true, # Reduce consecutive statements in blocks into single statement
     :dead_code => true, # Remove dead code (e.g. after return)
+    :lift_vars => false, # Lift all var declarations at the start of the scope
     :unsafe => false, # Optimizations known to be unsafe in some situations
     :copyright => true, # Show copyright message
+    :ascii_only => false, # Encode non-ASCII characters as Unicode code points
+    :inline_script => false, # Escape </script
+    :quote_keys => false, # Quote keys in object literals
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
       :indent_start => 0,
-      :quote_keys => false,
-      :space_colon => 0,
-      :ascii_only => false
+      :space_colon => false
     }
   }
 
@@ -62,6 +64,10 @@ class Uglifier
     js << "var source = #{MultiJson.encode(source)};"
     js << "var ast = UglifyJS.parser.parse(source);"
 
+    if @options[:lift_vars]
+      js << "ast = UglifyJS.uglify.ast_lift_variables(ast);"
+    end
+
     if @options[:copyright]
       js << <<-JS
       var comments = UglifyJS.parser.tokenizer(source)().comments_before;
@@ -115,7 +121,16 @@ class Uglifier
   end
 
   def gen_code_options
-    
-    @options[:beautify] ? {:beautify => true}.merge(@options[:beautify_options]) : {}
+    options = {
+      :ascii_only => @options[:ascii_only],
+      :inline_script => @options[:inline_script],
+      :quote_keys => @options[:quote_keys]
+    }
+
+    if @options[:beautify]
+      options.merge(:beautify => true).merge(@options[:beautify_options])
+    else
+      options
+    end
   end
 end

data/spec/uglifier_spec.rb

@@ -87,6 +87,26 @@ describe "Uglifier" do
     Uglifier.compile(code, :max_line_length => 8).split("\n").length.should == 2
   end
 
+  it "lifts vars to top of the scope" do
+    code = "function something() { var foo = 123; foo = 1234; var bar = 123456; return foo + bar}"
+    Uglifier.compile(code, :lift_vars => true).should include("var a,b")
+  end
+
+  it "can be configured to output only ASCII" do
+    code = "function emoji() { return '\\ud83c\\ude01'; }"
+    Uglifier.compile(code, :ascii_only => true).should include("\\ud83c\\ude01")
+  end
+
+  it "escapes </script when asked to" do
+    code = "function test() { return '</script>';}"
+    Uglifier.compile(code, :inline_script => true).should_not include("</script>")
+  end
+
+  it "quotes keys" do
+    code = "var a = {foo: 1}"
+    Uglifier.compile(code, :quote_keys => true).should include('"foo"')
+  end
+
   describe "Input Formats" do
     it "handles strings" do
       lambda {

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "uglifier"
-  s.version = "1.0.4"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = "2011-10-18"
+  s.date = "2011-11-15"
   s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -44,25 +44,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<execjs>, [">= 0.3.0"])
       s.add_runtime_dependency(%q<multi_json>, [">= 1.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.7"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.11"])
     else
       s.add_dependency(%q<execjs>, [">= 0.3.0"])
       s.add_dependency(%q<multi_json>, [">= 1.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.7"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.11"])
     end
   else
     s.add_dependency(%q<execjs>, [">= 0.3.0"])
     s.add_dependency(%q<multi_json>, [">= 1.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.7"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.11"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uglifier
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 4
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ville Lautanala
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 Z
+date: 2011-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  name: execjs
   prerelease: false
-  type: :runtime
-  requirement: *id001
+  name: execjs
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,28 +46,27 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  name: multi_json
   prerelease: false
-  type: :runtime
-  requirement: *id002
+  name: multi_json
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 13
         segments: 
         - 2
-        - 6
-        - 0
-        version: 2.6.0
-  name: rspec
+        - 7
+        version: "2.7"
   prerelease: false
-  type: :development
-  requirement: *id003
+  name: rspec
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +77,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   prerelease: false
-  type: :development
-  requirement: *id004
+  name: bundler
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +93,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id005
+  name: jeweler
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,10 +107,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   prerelease: false
+  name: rcov
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: *id006
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 3
+        - 11
+        version: "3.11"
+  prerelease: false
+  name: rdoc
+  version_requirements: *id007
 description: 
 email: lautis@gmail.com
 executables: []