uglifier 1.2.5 → 1.2.6

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby
-before_script: "git submodule update --init --recursive"
 env:
   - EXECJS_RUNTIME=RubyRacer
   - EXECJS_RUNTIME=RubyRhino

data/README.md

@@ -4,11 +4,11 @@ Ruby wrapper for [UglifyJS](https://github.com/mishoo/UglifyJS) JavaScript compr
 
 ## Installation
 
-Uglifier is available as ruby gem.
+Uglifier is available as a ruby gem.
 
     $ gem install uglifier
 
-Ensure that your environment has a JavaScript interpreter supported by [ExecJS](https://github.com/sstephenson/execjs). Usually, installing therubyracer gem is the best alternative.
+Ensure that your environment has a JavaScript interpreter supported by [ExecJS](https://github.com/sstephenson/execjs). Installing `therubyracer` gem is a safe choice  and having `node` in `PATH` works too.
 
 ## Usage
 

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/uglify.js

@@ -2,19 +2,19 @@
 (function(/*! Stitch !*/) {
   if (!this.require) {
     var modules = {}, cache = {}, require = function(name, root) {
-      var path = expand(root, name), module = cache[path], fn;
+      var module = cache[name], path = expand(root, name), fn;
       if (module) {
-        return module.exports;
+        return module;
       } else if (fn = modules[path] || modules[path = expand(path, './index')]) {
-        module = {id: path, exports: {}};
+        module = {id: name, exports: {}};
         try {
-          cache[path] = module;
+          cache[name] = module.exports;
           fn(module.exports, function(name) {
             return require(name, dirname(path));
           }, module);
-          return module.exports;
+          return cache[name] = module.exports;
         } catch (err) {
-          delete cache[path];
+          delete cache[name];
           throw err;
         }
       } else {
@@ -2627,6 +2627,8 @@ exports.KEYWORDS = KEYWORDS;
 exports.ATOMIC_START_TOKEN = ATOMIC_START_TOKEN;
 exports.OPERATORS = OPERATORS;
 exports.is_alphanumeric_char = is_alphanumeric_char;
+exports.is_identifier_start = is_identifier_start;
+exports.is_identifier_char = is_identifier_char;
 exports.set_logger = function(logger) {
         warn = logger;
 };
@@ -2693,6 +2695,7 @@ exports.set_logger = function(logger) {
 var jsp = require("./parse-js"),
     slice = jsp.slice,
     member = jsp.member,
+    is_identifier_char = jsp.is_identifier_char,
     PRECEDENCE = jsp.PRECEDENCE,
     OPERATORS = jsp.OPERATORS;
 
@@ -4149,6 +4152,15 @@ function gen_code(ast, options) {
                 finally { indentation -= incr; }
         };
 
+        function last_char(str) {
+                str = str.toString();
+                return str.charAt(str.length - 1);
+        };
+
+        function first_char(str) {
+                return str.toString().charAt(0);
+        };
+
         function add_spaces(a) {
                 if (beautify)
                         return a.join(" ");
@@ -4157,7 +4169,8 @@ function gen_code(ast, options) {
                         var next = a[i + 1];
                         b.push(a[i]);
                         if (next &&
-                            ((/[a-z0-9_\x24]$/i.test(a[i].toString()) && /^[a-z0-9_\x24]/i.test(next.toString())) ||
+                            ((is_identifier_char(last_char(a[i])) && (is_identifier_char(first_char(next))
+                                                                      || first_char(next) == "\\")) ||
                              (/[\+\-]$/.test(a[i].toString()) && /^[\+\-]/.test(next.toString())))) {
                                 b.push(" ");
                         }

data/spec/uglifier_spec.rb

@@ -1,9 +1,10 @@
 # encoding: UTF-8
+require 'stringio'
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Uglifier" do
   it "minifies JS" do
-    source = File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8").read
+    source = File.open("lib/uglify.js", "r:UTF-8").read
     minified = Uglifier.new.compile(source)
     minified.length.should < source.length
     lambda {
@@ -120,15 +121,17 @@ describe "Uglifier" do
   end
 
   describe "Input Formats" do
+    let(:code) { "function hello() { return 'hello world'; }" }
+
     it "handles strings" do
       lambda {
-        Uglifier.new.compile(File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8").read).should_not be_empty
+        Uglifier.new.compile(code).should_not be_empty
       }.should_not raise_error
     end
 
-    it "handles files" do
+    it "handles IO objects" do
       lambda {
-        Uglifier.new.compile(File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8")).should_not be_empty
+        Uglifier.new.compile(StringIO.new(code)).should_not be_empty
       }.should_not raise_error
     end
   end

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "uglifier"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = "2012-06-19"
+  s.date = "2012-06-28"
   s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -145,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2972227698795069512
+      hash: 1608746242454897319
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: