uglifier 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb026fa4f1d075fee10aa54bc2e86f50bc688cfb
-  data.tar.gz: 52bf135ebd2d66a0bb0041908df6c88b0572f966
+  metadata.gz: 7062a8c1bbde4ac1923e93201a527af14f1e3cea
+  data.tar.gz: dc3085b345acd4c4f6e7a71cc26f8ad708e89d0c
 SHA512:
-  metadata.gz: 56a67dd0bb264a5a0ecc863bb775d9fe5e559712c958cca43cd829d3461286f27d639d54efa8764b16de11067efeb8394ae6e3f4abffae563b6418f5180e8798
-  data.tar.gz: c01510deda6fb3fbf9816e2572edbbffd9808a13691d0e0ee7f55b8f1a6c8acb29f57d47e2b2c98833110524be4d39a9d41897fb3868e7f34038817614bcf25e
+  metadata.gz: 46541d24080d33015418644c447949a7d7ca996d714640518b98d34d8f5cd50d47de18d33d7161be0e61224ac61fd49d8526a4c745ad49efa4e9ad6ff54879a3
+  data.tar.gz: 5c97052928028f300a8c6a5b9163bfb75b807dc6eef86b92e1a0689224eae93d76ded790fd0861d23c41db777a05d8ef819ba35572d5d5cd2299ffba7cd147f8

data/.gitignore

@@ -11,6 +11,7 @@ doc
 # bundler
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 
 # jeweler generated
 pkg

data/.travis.yml

@@ -21,3 +21,10 @@ matrix:
       gemfile: gemfiles/rubyracer
     - rvm: jruby-19mode
       gemfile: gemfiles/rubyrhino
+    - rvm: 2.2.0
+      gemfile: gemfiles/alaska
+      env: ALASKA=1
+  allow_failures:
+    - rvm: 2.2.0
+      gemfile: gemfiles/alaska
+      env: ALASKA=1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.7.1 (27 February 2015)
+
+- fix compatibility with experimental Alaska ExecJS runtime
+
 ## 2.7.0 (8 January 2015)
 
 - copyright comment preservation also includes comments starting with a bang (!)

data/gemfiles/alaska

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+gemspec :path=> "../"
+gem "alaska", github: "mavenlink/alaska"

data/lib/uglifier.rb

@@ -10,67 +10,68 @@ class Uglifier
   Error = ExecJS::Error
   # JavaScript code to call UglifyJS
   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;
+    (function(options) {
+      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;
         }
-      } 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);
+      var source = options.source;
+      var ast = UglifyJS.parse(source, options.parse_options);
       ast.figure_out_scope();
-    }
 
-    if (options.mangle) {
-      ast.compute_char_frequency();
-      ast.mangle_names(options.mangle);
-    }
+      if (options.compress) {
+        var compressor = UglifyJS.Compressor(options.compress);
+        ast = ast.transform(compressor);
+        ast.figure_out_scope();
+      }
 
-    if (options.enclose) {
-      ast = ast.wrap_enclose(options.enclose);
-    }
+      if (options.mangle) {
+        ast.compute_char_frequency();
+        ast.mangle_names(options.mangle);
+      }
 
-    var gen_code_options = options.output;
-    gen_code_options.comments = comments(options.output.comments);
+      if (options.enclose) {
+        ast = ast.wrap_enclose(options.enclose);
+      }
 
-    if (options.generate_map) {
-        var source_map = UglifyJS.SourceMap(options.source_map_options);
-        gen_code_options.source_map = source_map;
-    }
+      var gen_code_options = options.output;
+      gen_code_options.comments = comments(options.output.comments);
 
-    var stream = UglifyJS.OutputStream(gen_code_options);
+      if (options.generate_map) {
+          var source_map = UglifyJS.SourceMap(options.source_map_options);
+          gen_code_options.source_map = source_map;
+      }
 
-    ast.print(stream);
+      var stream = UglifyJS.OutputStream(gen_code_options);
 
-    if (options.source_map_options.map_url) {
-      stream += "\\n//# sourceMappingURL=" + options.source_map_options.map_url;
-    }
+      ast.print(stream);
 
-    if (options.source_map_options.url) {
-      stream += "\\n//# sourceURL=" + options.source_map_options.url;
-    }
+      if (options.source_map_options.map_url) {
+        stream += "\\n//# sourceMappingURL=" + options.source_map_options.map_url;
+      }
 
-    if (options.generate_map) {
-        return [stream.toString(), source_map.toString()];
-    } else {
-        return stream.toString();
-    }
+      if (options.source_map_options.url) {
+        stream += "\\n//# sourceURL=" + options.source_map_options.url;
+      }
+
+      if (options.generate_map) {
+          return [stream.toString(), source_map.toString()];
+      } else {
+          return stream.toString();
+      }
+    })
   JS
 
   # UglifyJS source path
@@ -197,7 +198,7 @@ class Uglifier
 
   # Run UglifyJS for given source code
   def run_uglifyjs(source, generate_map)
-    @context.exec(Uglifier::JS % json_encode(
+    options = {
       :source => read_source(source),
       :output => output_options,
       :compress => compressor_options,
@@ -206,7 +207,9 @@ class Uglifier
       :source_map_options => source_map_options,
       :generate_map => generate_map,
       :enclose => enclose_options
-    ))
+    }
+
+    @context.call(Uglifier::JS, options)
   end
 
   def read_source(source)
@@ -296,10 +299,6 @@ class Uglifier
     end
   end
 
-  def json_encode(obj)
-    JSON.dump(obj)
-  end
-
   def encode_regexp(regexp)
     modifiers = if regexp.casefold?
                   "i"

data/lib/uglifier/version.rb

@@ -1,4 +1,4 @@
 class Uglifier
   # Current version of Uglifier.
-  VERSION = "2.7.0"
+  VERSION = "2.7.1"
 end

data/spec/spec_helper.rb

@@ -7,6 +7,12 @@ require 'source_map'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+if ENV["ALASKA"]
+  require 'alaska'
+  require 'tempfile'
+  ExecJS.runtime = Alaska::Runtime.new
+end
+
 RSpec.configure do |config|
   config.mock_with :rspec do |mock|
     mock.syntax = :expect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -132,6 +132,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/alaska
 - gemfiles/rubyracer
 - gemfiles/rubyrhino
 - lib/es5.js