uglifier 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490f8fa1384ab714b69cf1f5b122cae495992d63
-  data.tar.gz: 7c76a87d94f13b7ba1aa122b3016a25a9b8d3550
+  metadata.gz: da19be0a44b400c082d673a8e9a0163ab02c1d9e
+  data.tar.gz: 53003f0c4bdfd9a404362fbf6950f03ebe25cc82
 SHA512:
-  metadata.gz: 9358bc4fd3a39d7586ff7caa48297fd1e8f03b5ad42708135a90a075c8f7486fc787b5b41aa6f5357b77f096cafd0892bc011f8f9e6f4a043d30daa7c1602b6e
-  data.tar.gz: 53f41790c6f3334203dff2e93a306cc84d3ffd78e3ec3cdf37a55e3c34d0c58627684f5f8a43cfff8cdffc3ce1020f35af1bb1f4506d93a956967327ad44ce7b
+  metadata.gz: 796edba31e0fd57cab4f987b638470ba009f5468608dea8c98c529f12abcef289622a66d58b9067f33f94169fa506949813baa1c52b90451bb6082d4230c6c02
+  data.tar.gz: 9cfb9e5dd1ed8b3eb8223f79256c5a6c69da05de769a88e91c3d6db83f341a00af1106b29b1ed4701790bcf0ca193d43fed756207ecdef3ac1149bd67035d84e

data/.rubocop.yml

@@ -0,0 +1,27 @@
+AllCops:
+  Exclude:
+    - uglifier.gemspec
+    - lib/uglifier/version.rb
+
+ClassLength:
+  Enabled: false
+
+# Offense count: 4
+# Cop supports --auto-correct.
+DeprecatedHashMethods:
+  Enabled: false
+
+HashSyntax:
+  EnforcedStyle: hash_rockets
+
+LineLength:
+  Max: 100
+
+MethodLength:
+  Max: 20
+
+SignalException:
+  Enabled: false
+
+StringLiterals:
+  Enabled: false

data/.travis.yml

@@ -3,9 +3,9 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - jruby-19mode
-  - rbx
+  - 2.1.2
+  - jruby
+  #- rbx-2 # Fails on Travis
 git:
   submodules: false
 gemfile:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.5.1 (13 June 2014)
+
+- update UglifyJS to 2.4.14
+
 ## 2.5.0 (15 March 2014)
 
 - update UglifyJS to 2.4.13

data/CONTRIBUTING.md

@@ -1,17 +1,42 @@
 # Contributing to Uglifier
 
-Any contributions to Uglifier are welcome, whether they are feedback, bug reports, or - even better - pull requests. 
+Any contributions to Uglifier are welcome, whether they are feedback, bug reports, or - even better - pull requests.
 
-## Reporting issues
+## Development
+
+To start working on Uglifier, fork the repo to your own account. [Ruby](https://www.ruby-lang.org), [bundler](http://bundler.io) and [Node.js](http://nodejs.org) are required as dependencies.
+
+Ensure that your local copy is up-to-date before you start working on a feature or a bug fix. You should write any new code in a topic branch.
+
+### Tests
+
+Try to write a test case that reproduces the problem you're trying to fix or describes a feature that you want to build. Tests are located in `spec/` directory.
+
+Tests as a pull request are appreciated even without a fix to highlight or reproduce a problem.
+
+To run tests, first install all project dependencies:
+
+    bundle install
+
+Then run tests using rake:
 
-Uglifier uses the [GitHub issue tracker](https://github.com/lautis/uglifier/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. You can indicate support for an existing issuse by voting it up. When submitting a bug report, please include a Gist that includes a stack trace and any details that may be necessary to reproduce the bug, including your gem version, Ruby version, and **ExecJS runtime**. Ideally, a bug report should include a pull request with failing specs.
+    bundle exec rake
 
-## Contributing to uglifier
+### Updating UglifyJS and source-map
+
+[UglifyJS](https://github.com/mishoo/UglifyJS2) and [source-map](https://github.com/mozilla/source-map/) are included in the project as Git submodules. To install submodules, run in your terminal
+
+    git submodule update --init
+
+After that, UglifyJS and source-map are checked out under `vendor/uglifyjs` and `vendor/source-map`.
+
+Use Git commands (e.g. git checkout master) to change the included version. You can even write custom code to yourself. After changing the dependencies, compile new version of the bundled JS file using
+
+    rake js
+
+After this, the new JS is used in your development version.
+
+
+## Reporting issues
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+Uglifier uses the [GitHub issue tracker](https://github.com/lautis/uglifier/issues) to track bugs and features. Before submitting a bug report or feature request, check to make sure it hasn't already been submitted. When submitting a bug report, please include a Gist that includes a stack trace and any details that may be necessary to reproduce the bug, including your gem version, Ruby version, and **ExecJS runtime**. Ideally, a bug report should include a pull request with failing specs.

data/Gemfile

@@ -3,5 +3,14 @@ source "https://rubygems.org"
 gemspec
 
 platforms :rbx do
+  gem 'racc'
   gem 'rubysl', '~> 2.0'
+  gem 'psych'
 end
+
+if RUBY_VERSION >= '1.9'
+  gem 'rubocop', '~> 0.23.0', :group => [:development]
+else
+  gem 'execjs', '~> 2.0.2'
+end
+

data/README.md

@@ -1,4 +1,4 @@
-# Uglifier  [![Build Status](https://img.shields.io/travis/lautis/uglifier/master.svg)](https://travis-ci.org/lautis/uglifier) [![Dependency Status](https://img.shields.io/gemnasium/lautis/uglifier.svg)](https://gemnasium.com/lautis/uglifier)
+# Uglifier [![Build Status](https://travis-ci.org/lautis/uglifier.svg?branch=master)](https://travis-ci.org/lautis/uglifier) [![Dependency Status](https://gemnasium.com/lautis/uglifier.svg)](https://gemnasium.com/lautis/uglifier)
 
 Ruby wrapper for [UglifyJS](https://github.com/mishoo/UglifyJS2) JavaScript compressor.
 
@@ -101,9 +101,11 @@ Available options and their defaults are
 
 ## Development
 
-Uglifier bundles its javascript dependencies using git submodules. If you want to rebuild the javascript you will first need to get the latest version of the code with `git submodule update --init`. After you have the git submodules at the desired versions, run `rake js` to recreate `lib/uglify.js`.
+Tests are run using
 
-See [CONTRIBUTING](https://github.com/lautis/uglifier/blob/master/CONTRIBUTING.md) for details about contributing to Uglifier.
+    bundle exec rake
+
+See [CONTRIBUTING](https://github.com/lautis/uglifier/blob/master/CONTRIBUTING.md) for details about working on and contributing to Uglifier.
 
 ## Copyright
 

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'bundler'
 require 'bundler/gem_tasks'
@@ -18,8 +20,6 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
-
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -51,3 +51,11 @@ task :js do
 
   File.write("lib/uglify.js", source)
 end
+
+if RUBY_VERSION < '1.9.3'
+  task :default => [:spec]
+else
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new(:rubocop)
+  task :default => [:rubocop, :spec]
+end

data/gemfiles/rubyracer

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gemspec :path=>"../"
 gem 'therubyracer'
+gem 'rubocop', '0.23.0'

data/gemfiles/rubyrhino

@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gemspec :path=>"../"
 gem 'therubyrhino'
+gem 'rubocop', '0.23.0'

data/lib/uglifier.rb

@@ -4,11 +4,74 @@ require "execjs"
 require "json"
 require "uglifier/version"
 
+# A wrapper around the UglifyJS interface
 class Uglifier
   Error = ExecJS::Error
+  JS = <<-JS
+    function comments(option) {
+      if (Object.prototype.toString.call(option) === '[object Array]') {
+        return new RegExp(option[0], option[1]);
+      } else if (option == "jsdoc") {
+        return function(node, comment) {
+          if (comment.type == "comment2") {
+            return /@preserve|@license|@cc_on/i.test(comment.value);
+          } else {
+            return false;
+          }
+        }
+      } else {
+        return option;
+      }
+    }
+
+    var options = %s;
+    var source = options.source;
+    var ast = UglifyJS.parse(source, options.parse_options);
+    ast.figure_out_scope();
+
+    if (options.compress) {
+      var compressor = UglifyJS.Compressor(options.compress);
+      ast = ast.transform(compressor);
+      ast.figure_out_scope();
+    }
+
+    if (options.mangle) {
+      ast.compute_char_frequency();
+      ast.mangle_names(options.mangle);
+    }
+
+    if (options.enclose) {
+      ast = ast.wrap_enclose(options.enclose);
+    }
+
+    var gen_code_options = options.output;
+    gen_code_options.comments = comments(options.output.comments);
+
+    if (options.generate_map) {
+        var source_map = UglifyJS.SourceMap(options.source_map_options);
+        gen_code_options.source_map = source_map;
+    }
+
+    var stream = UglifyJS.OutputStream(gen_code_options);
+
+    ast.print(stream);
+    if (options.generate_map) {
+        return [stream.toString(), source_map.toString()];
+    } else {
+        return stream.toString();
+    }
+  JS
+
+  # UglifyJS source patch
+  SourcePath = File.expand_path("../uglify.js", __FILE__)
+  # ES5 shims source path
+  ES5FallbackPath = File.expand_path("../es5.js", __FILE__)
+  # String.split shim source path
+  SplitFallbackPath = File.expand_path("../split.js", __FILE__)
 
   # Default options for compilation
   DEFAULTS = {
+    # rubocop:disable LineLength
     :output => {
       :ascii_only => true, # Escape non-ASCII characterss
       :comments => :copyright, # Preserve comments (:all, :jsdoc, :copyright, :none)
@@ -63,10 +126,7 @@ class Uglifier
     :input_source_map => nil, # The contents of the source map describing the input
     :screw_ie8 => false # Don't bother to generate safe code for IE8
   }
-
-  SourcePath = File.expand_path("../uglify.js", __FILE__)
-  ES5FallbackPath = File.expand_path("../es5.js", __FILE__)
-  SplitFallbackPath = File.expand_path("../split.js", __FILE__)
+  # rubocop:enable LineLength
 
   # Minifies JavaScript code using implicit context.
   #
@@ -75,7 +135,7 @@ class Uglifier
   #
   # Returns minified code as String
   def self.compile(source, options = {})
-    self.new(options).compile(source)
+    new(options).compile(source)
   end
 
   # Minifies JavaScript code and generates a source map using implicit context.
@@ -85,7 +145,7 @@ class Uglifier
   #
   # Returns a pair of [minified code as String, source map as a String]
   def self.compile_with_map(source, options = {})
-    self.new(options).compile_with_map(source)
+    new(options).compile_with_map(source)
   end
 
   # Initialize new context for Uglifier with given options
@@ -93,7 +153,7 @@ class Uglifier
   # options - Hash of options to override Uglifier::DEFAULTS
   def initialize(options = {})
     (options.keys - DEFAULTS.keys - [:comments, :squeeze, :copyright])[0..1].each do |missing|
-      raise ArgumentError.new("Invalid option: #{missing}")
+      raise ArgumentError, "Invalid option: #{missing}"
     end
     @options = options
     @context = ExecJS.compile(File.open(ES5FallbackPath, "r:UTF-8").read +
@@ -107,7 +167,7 @@ class Uglifier
   #
   # Returns minified code as String
   def compile(source)
-    really_compile(source, false)
+    run_uglifyjs(source, false)
   end
   alias_method :compress, :compile
 
@@ -117,90 +177,40 @@ class Uglifier
   #
   # Returns a pair of [minified code as String, source map as a String]
   def compile_with_map(source)
-    really_compile(source, true)
+    run_uglifyjs(source, true)
   end
 
   private
 
-  # Minifies JavaScript code
-  #
-  # source should be a String or IO object containing valid JavaScript.
-  def really_compile(source, generate_map)
-    source = source.respond_to?(:read) ? source.read : source.to_s
-
-    js = <<-JS
-      function comments(option) {
-        if (Object.prototype.toString.call(option) === '[object Array]') {
-          return new RegExp(option[0], option[1]);
-        } else if (option == "jsdoc") {
-          return function(node, comment) {
-            if (comment.type == "comment2") {
-              return /@preserve|@license|@cc_on/i.test(comment.value);
-            } else {
-              return false;
-            }
-          }
-        } else {
-          return option;
-        }
-      }
-
-      var options = %s;
-      var source = options.source;
-      var ast = UglifyJS.parse(source, options.parse_options);
-      ast.figure_out_scope();
-
-      if (options.compress) {
-        var compressor = UglifyJS.Compressor(options.compress);
-        ast = ast.transform(compressor);
-        ast.figure_out_scope();
-      }
-
-      if (options.mangle) {
-        ast.compute_char_frequency();
-        ast.mangle_names(options.mangle);
-      }
-
-      if (options.enclose) {
-        ast = ast.wrap_enclose(options.enclose);
-      }
-
-      var gen_code_options = options.output;
-      gen_code_options.comments = comments(options.output.comments);
-
-      if (options.generate_map) {
-          var source_map = UglifyJS.SourceMap(options.source_map_options);
-          gen_code_options.source_map = source_map;
-      }
-
-      var stream = UglifyJS.OutputStream(gen_code_options);
-
-      ast.print(stream);
-      if (options.generate_map) {
-          return [stream.toString(), source_map.toString()];
-      } else {
-          return stream.toString();
-      }
-    JS
-
-    @context.exec(js % json_encode(
-      :source => source,
+  # Run UglifyJS for given source code
+  def run_uglifyjs(source, generate_map)
+    @context.exec(Uglifier::JS % json_encode(
+      :source => read_source(source),
       :output => output_options,
       :compress => compressor_options,
       :mangle => mangle_options,
       :parse_options => parse_options,
       :source_map_options => source_map_options,
-      :generate_map => (!!generate_map),
+      :generate_map => generate_map,
       :enclose => enclose_options
     ))
   end
 
+  def read_source(source)
+    if source.respond_to?(:read)
+      source.read
+    else
+      source.to_s
+    end
+  end
+
   def mangle_options
     conditional_option(@options[:mangle], DEFAULTS[:mangle])
   end
 
   def compressor_options
-    defaults = conditional_option(DEFAULTS[:compress],
+    defaults = conditional_option(
+      DEFAULTS[:compress],
       :global_defs => @options[:define] || {},
       :screw_ie8 => @options[:screw_ie8] || DEFAULTS[:screw_ie8]
     )
@@ -208,17 +218,7 @@ class Uglifier
   end
 
   def comment_options
-    val = if @options.has_key?(:output) && @options[:output].has_key?(:comments)
-      @options[:output][:comments]
-    elsif @options.has_key?(:comments)
-      @options[:comments]
-    elsif @options[:copyright] == false
-      :none
-    else
-      DEFAULTS[:output][:comments]
-    end
-
-    case val
+    case comment_setting
     when :all, true
       true
     when :jsdoc
@@ -226,23 +226,37 @@ class Uglifier
     when :copyright
       encode_regexp(/Copyright/i)
     when Regexp
-      encode_regexp(val)
+      encode_regexp(comment_setting)
     else
       false
     end
   end
 
-  def output_options
-    screw_ie8 = if (@options[:output] || {}).has_key?(:ie_proof)
-      false
+  def comment_setting
+    if @options.has_key?(:output) && @options[:output].has_key?(:comments)
+      @options[:output][:comments]
+    elsif @options.has_key?(:comments)
+      @options[:comments]
+    elsif @options[:copyright] == false
+      :none
     else
-      @options[:screw_ie8] || DEFAULTS[:screw_ie8]
+      DEFAULTS[:output][:comments]
     end
+  end
 
+  def output_options
     DEFAULTS[:output].merge(@options[:output] || {}).merge(
       :comments => comment_options,
-      :screw_ie8 => screw_ie8
-    ).reject { |key,value| key == :ie_proof}
+      :screw_ie8 => screw_ie8?
+    ).reject { |key, _| key == :ie_proof }
+  end
+
+  def screw_ie8?
+    if (@options[:output] || {}).has_key?(:ie_proof)
+      false
+    else
+      @options[:screw_ie8] || DEFAULTS[:screw_ie8]
+    end
   end
 
   def source_map_options
@@ -254,7 +268,7 @@ class Uglifier
   end
 
   def parse_options
-    {:filename => @options[:source_filename]}
+    { :filename => @options[:source_filename] }
   end
 
   def enclose_options
@@ -273,16 +287,16 @@ class Uglifier
 
   def encode_regexp(regexp)
     modifiers = if regexp.casefold?
-      "i"
-    else
-      ""
-    end
+                  "i"
+                else
+                  ""
+                end
 
     [regexp.source, modifiers]
   end
 
   def conditional_option(value, defaults)
-    if value == true || value == nil
+    if value == true || value.nil?
       defaults
     elsif value
       defaults.merge(value)