uglifier 1.3.0 → 2.0.0

data/spec/source_map_spec.rb

@@ -0,0 +1,86 @@
+# encoding: UTF-8
+require 'stringio'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Uglifier" do
+  it "generates source maps" do
+    source = File.open("lib/uglify.js", "r:UTF-8").read
+    minified, map = Uglifier.new.compile_with_map(source)
+    minified.length.should < source.length
+    map.length.should > 0
+    lambda {
+      JSON.parse(map)
+    }.should_not raise_error
+  end
+
+  it "generates source maps with the correct meta-data" do
+    source = <<-JS
+      function hello () {
+        function world () {
+          return 2;
+        };
+
+        return world() + world();
+      };
+    JS
+
+    minified, map = Uglifier.compile_with_map(source,
+                                              :source_filename => "ahoy.js",
+                                              :output_filename => "ahoy.min.js",
+                                              :source_root => "http://localhost/")
+
+    map = SourceMap.from_s(map)
+    map.file.should == "ahoy.min.js"
+    map.sources.should == ["ahoy.js"]
+    map.names.should == ["hello", "world"]
+    map.source_root.should == "http://localhost/"
+    map.mappings.first[:generated_line].should == 1
+  end
+
+  it "should skip copyright lines in source maps" do
+    source = <<-JS
+      /* @copyright Conrad Irwin */
+      function hello () {
+        function world () {
+          return 2;
+        };
+
+        return world() + world();
+      };
+    JS
+
+    minified, map = Uglifier.compile_with_map(source,
+                                              :source_filename => "ahoy.js",
+                                              :source_root => "http://localhost/")
+    map = SourceMap.from_s(map)
+    map.mappings.first[:generated_line].should == 2
+  end
+
+  it "should be able to handle an input source map" do
+    source = <<-JS
+      function hello () {
+        function world () {
+          return 2;
+        };
+
+        return world() + world();
+      };
+    JS
+
+    minified1, map1 = Uglifier.compile_with_map(source,
+                                               :source_filename => "ahoy.js",
+                                               :source_root => "http://localhost/",
+                                               :mangle => false)
+
+    minified2, map2 = Uglifier.compile_with_map(source,
+                                               :input_source_map => map1,
+                                               :mangle => true)
+
+    minified1.lines.to_a.length.should == 1
+
+    map = SourceMap.from_s(map2)
+    map.sources.should == ["http://localhost/ahoy.js"]
+    map.mappings.first[:source_line].should == 1
+    map.mappings.last[:source_line].should == 6
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'uglifier'
 require 'rspec'
+require 'source_map'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/uglifier_spec.rb

@@ -13,64 +13,113 @@ describe "Uglifier" do
   end
 
   it "throws an exception when compilation fails" do
-    lambda {
+    expect {
       Uglifier.new.compile(")(")
-    }.should raise_error(Uglifier::Error)
+    }.to raise_error(Uglifier::Error)
   end
 
-  it "doesn't omit null character in strings" do
-    Uglifier.new.compile('var foo="\0bar"').should match(/(\0|\\0)/)
+  it "throws an exception on invalid option" do
+    expect {
+      Uglifier.new(:foo => true)
+    }.to raise_error(ArgumentError)
   end
 
-  it "doesn't try to mangle $super by default to avoid breaking PrototypeJS" do
-    Uglifier.new.compile('function foo($super) {return $super}').should include("$super")
+  it "doesn't omit null character in strings" do
+    Uglifier.new.compile('var foo="\0bar"').should match(/(\0|\\0)/)
   end
 
   it "adds trailing semicolon to minified source" do
-    source = "function id(i) {return i;};"
+    source = "(function id(i) {return i;}());"
     Uglifier.new.compile(source)[-1].should eql(";"[0])
   end
 
-  describe "Copyright Preservation" do
-    before :all do
-      @source = <<-EOS
-        /* Copyright Notice */
+  describe "argument name mangling" do
+    it "doesn't try to mangle $super by default to avoid breaking PrototypeJS" do
+      Uglifier.compile('function foo($super) {return $super}').should include("$super")
+    end
+
+    it "allows variables to be excluded from mangling" do
+      code = "function bar(foo) {return foo + 'bar'};"
+      Uglifier.compile(code, :mangle => {:except => ["foo"]}).should include("(foo)")
+    end
+
+    it "skips mangling when set to false" do
+      code = "function bar(foo) {return foo + 'bar'};"
+      Uglifier.compile(code, :mangle => false).should include("(foo)")
+    end
+
+    it "mangles argumen names by default" do
+      code = "function bar(foo) {return foo + 'bar'};"
+      Uglifier.compile(code, :mangle => true).should_not include("(foo)")
+    end
+  end
+
+  describe "comment preservation" do
+    let(:source) {
+      <<-EOS
+        /* @preserve Copyright Notice */
         /* (c) 2011 */
         // INCLUDED
         function identity(p) { return p; }
+        /* Another Copyright */
+        function add(a, b) { return a + b; }
       EOS
-      @minified = Uglifier.compile(@source, :copyright => true)
-    end
+    }
 
-    it "preserves copyright notice" do
-      @minified.should match /Copyright Notice/
-    end
+    describe ":copyright" do
+      subject { Uglifier.compile(source, :comments => :copyright) }
 
-    it "handles multiple copyright blocks" do
-      @minified.should match /\(c\) 2011/
+      it "preserves comments with string Copyright" do
+        subject.should match /Copyright Notice/
+        subject.should match /Another Copyright/
+      end
+
+      it "ignores other comments" do
+        subject.should_not match /INCLUDED/
+      end
     end
 
-    it "does include different comment types" do
-      @minified.should match /INCLUDED/
+    describe ":jsdoc" do
+      subject { Uglifier.compile(source, :output => {:comments => :jsdoc}) }
+
+      it "preserves jsdoc license/preserve blocks" do
+        subject.should match /Copyright Notice/
+      end
+
+      it "ignores other comments" do
+        subject.should_not match /Another Copyright/
+      end
     end
 
-    it "puts comments on own lines" do
-      @minified.split("\n").should have(4).items
+    describe ":all" do
+      subject { Uglifier.compile(source, :comments => :all) }
+
+      it "preserves all comments" do
+        subject.should match /INCLUDED/
+        subject.should match /2011/
+      end
     end
 
-    it "omits copyright notification if copyright parameter is set to false" do
-      Uglifier.compile(@source, :copyright => false).should_not match /Copyright/
+    describe ":none" do
+      subject { Uglifier.compile(source, :comments => :none) }
+
+      it "omits all comments" do
+        subject.should_not match /\/\//
+        subject.should_not match /\/\*/
+      end
     end
-  end
 
-  it "does additional squeezing when unsafe options is true" do
-    unsafe_input = "function a(b){b.toString();}"
-    Uglifier.new(:unsafe => true).compile(unsafe_input).length.should < Uglifier.new(:unsafe => false).compile(unsafe_input).length
-  end
+    describe "regular expression" do
+      subject { Uglifier.compile(source, :comments => /included/i) }
+
+      it "matches comment blocks with regex" do
+        subject.should match /INCLUDED/
+      end
 
-  it "mangles variables only if mangle is set to true" do
-    code = "function longFunctionName(){};"
-    Uglifier.new(:mangle => false).compile(code).length.should == code.length
+      it "omits other blocks" do
+        subject.should_not match /2011/
+      end
+    end
   end
 
   it "squeezes code only if squeeze is set to true" do
@@ -78,46 +127,29 @@ describe "Uglifier" do
     Uglifier.compile(code, :squeeze => false).length.should > Uglifier.compile(code, :squeeze => true).length
   end
 
-  it "should allow top level variables to be mangled" do
-    code = "var foo = 123"
-    Uglifier.compile(code, :toplevel => true).should_not include("var foo")
-  end
-
-  it "allows variables to be excluded from mangling" do
-    code = "var foo = {bar: 123};"
-    Uglifier.compile(code, :except => ["foo"], :toplevel => true).should include("var foo")
-  end
-
-  it "allows disabling of function name mangling" do
-    code = "function sample() {var bar = 1; function foo() { return bar; }}"
-    mangled = Uglifier.compile(code, :mangle => :vars)
-    mangled.should include("foo()")
-    mangled.should_not include("bar")
-  end
-
   it "honors max line length" do
-    code = "var foo = 123;var bar = 123456"
-    Uglifier.compile(code, :max_line_length => 8).split("\n").length.should == 2
+    code = "var foo = 123;function bar() { return foo; }"
+    Uglifier.compile(code, :output => {:max_line_len => 16}, :compress => false).split("\n").length.should == 2
   end
 
-  it "lifts vars to top of the scope" do
+  it "hoists 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 match /var \w,\w/
+    Uglifier.compile(code, :compress => {:hoist_vars => true}).should match /var \w,\w/
   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")
+    Uglifier.compile(code, :output => {: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>")
+    Uglifier.compile(code, :output => {: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"')
+    Uglifier.compile(code, :output => {:quote_keys => true}).should include('"foo"')
   end
 
   it "handles constant definitions" do

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "uglifier"
-  s.version = "1.3.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = "2012-09-02"
+  s.date = "2013-04-06"
   s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -20,20 +20,22 @@ Gem::Specification.new do |s|
     ".gitmodules",
     ".rspec",
     ".travis.yml",
+    "CONTRIBUTING.md",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
-    "build.js",
     "lib/es5.js",
     "lib/uglifier.rb",
     "lib/uglify.js",
+    "spec/source_map_spec.rb",
     "spec/spec_helper.rb",
     "spec/uglifier_spec.rb",
     "uglifier.gemspec"
   ]
   s.homepage = "http://github.com/lautis/uglifier"
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"
   s.summary = "Ruby wrapper for UglifyJS JavaScript compressor"
@@ -47,14 +49,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.7"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.11"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.11"])
+      s.add_development_dependency(%q<source_map>, [">= 0"])
     else
       s.add_dependency(%q<execjs>, [">= 0.3.0"])
       s.add_dependency(%q<multi_json>, [">= 1.0.2", "~> 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.7"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<rdoc>, ["~> 3.11"])
+      s.add_dependency(%q<rdoc>, [">= 3.11"])
+      s.add_dependency(%q<source_map>, [">= 0"])
     end
   else
     s.add_dependency(%q<execjs>, [">= 0.3.0"])
@@ -62,7 +66,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.7"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<rdoc>, ["~> 3.11"])
+    s.add_dependency(%q<rdoc>, [">= 3.11"])
+    s.add_dependency(%q<source_map>, [">= 0"])
   end
 end
 

metadata

@@ -1,35 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 1.3.0
   prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-02 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: execjs
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
-  type: :runtime
+  name: execjs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,9 +37,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
+  name: multi_json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,8 +48,16 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
   name: rspec
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -58,15 +65,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
+        version: '1.0'
   name: bundler
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -74,15 +81,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+        version: 1.8.3
   name: jeweler
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -90,29 +97,38 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
-- !ruby/object:Gem::Dependency
+        version: '3.11'
   name: rdoc
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.11'
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '0'
+  name: source_map
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
 description: 
 email: lautis@gmail.com
 executables: []
@@ -125,20 +141,22 @@ files:
 - .gitmodules
 - .rspec
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
-- build.js
 - lib/es5.js
 - lib/uglifier.rb
 - lib/uglify.js
+- spec/source_map_spec.rb
 - spec/spec_helper.rb
 - spec/uglifier_spec.rb
 - uglifier.gemspec
 homepage: http://github.com/lautis/uglifier
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -148,10 +166,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -550840341360460746
+      hash: 2998740811060118090
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: