uglifier 1.2.7 → 1.3.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "execjs", ">=0.3.0"
-gem "multi_json", "~> 1.3"
+gem "multi_json", "~> 1.0", ">= 1.0.2"
 
 # Depend on defined ExecJS runtime
 execjs_runtimes = {

data/README.md

@@ -43,6 +43,7 @@ Available options and their defaults are
       :ascii_only => false, # Encode non-ASCII characters as Unicode code points
       :inline_script => false, # Escape </script
       :quote_keys => false, # Quote keys in object literals
+      :define => {}, # Define values for symbol replacement
       :beautify => false, # Ouput indented code
       :beautify_options => {
         :indent_level => 4,

data/VERSION

@@ -1 +1 @@
-1.2.7
+1.3.0

data/lib/uglifier.rb

@@ -22,6 +22,7 @@ class Uglifier
     :ascii_only => false, # Encode non-ASCII characters as Unicode code points
     :inline_script => false, # Escape </script
     :quote_keys => false, # Quote keys in object literals
+    :define => {}, # Define values for symbol replacement
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
@@ -61,7 +62,7 @@ class Uglifier
 
     js = []
     js << "var result = '';"
-    js << "var source = #{MultiJson.dump(source)};"
+    js << "var source = #{json_encode(source)};"
     js << "var ast = UglifyJS.parser.parse(source);"
 
     if @options[:lift_vars]
@@ -78,17 +79,17 @@ class Uglifier
       JS
     end
 
-    js << "ast = UglifyJS.uglify.ast_mangle(ast, #{MultiJson.dump(mangle_options)});"
+    js << "ast = UglifyJS.uglify.ast_mangle(ast, #{json_encode(mangle_options)});"
 
     if @options[:squeeze]
-      js << "ast = UglifyJS.uglify.ast_squeeze(ast, #{MultiJson.dump(squeeze_options)});"
+      js << "ast = UglifyJS.uglify.ast_squeeze(ast, #{json_encode(squeeze_options)});"
     end
 
     if @options[:unsafe]
       js << "ast = UglifyJS.uglify.ast_squeeze_more(ast);"
     end
 
-    js << "result += UglifyJS.uglify.gen_code(ast, #{MultiJson.dump(gen_code_options)});"
+    js << "result += UglifyJS.uglify.gen_code(ast, #{json_encode(gen_code_options)});"
 
     if !@options[:beautify] && @options[:max_line_length]
       js << "result = UglifyJS.uglify.split_lines(result, #{@options[:max_line_length].to_i})"
@@ -106,7 +107,7 @@ class Uglifier
     {
       "mangle" => @options[:mangle],
       "toplevel" => @options[:toplevel],
-      "defines" => {},
+      "defines" => defines,
       "except" => @options[:except],
       "no_functions" => @options[:mangle] == :vars
     }
@@ -120,6 +121,21 @@ class Uglifier
     }
   end
 
+  def defines
+    Hash[(@options[:define] || {}).map do |k, v|
+      token = if v.is_a? Numeric
+        ['num', v]
+      elsif [true, false].include?(v)
+        ['name', v.to_s]
+      elsif v == nil
+        ['name', 'null']
+      else
+        ['string', v.to_s]
+      end
+      [k, token]
+    end]
+  end
+
   def gen_code_options
     options = {
       :ascii_only => @options[:ascii_only],
@@ -133,4 +149,15 @@ class Uglifier
       options
     end
   end
+
+  # MultiJson API detection
+  if MultiJson.respond_to? :dump
+    def json_encode(obj)
+      MultiJson.dump(obj)
+    end
+  else
+    def json_encode(obj)
+      MultiJson.encode(obj)
+    end
+  end
 end

data/spec/uglifier_spec.rb

@@ -120,6 +120,16 @@ describe "Uglifier" do
     Uglifier.compile(code, :quote_keys => true).should include('"foo"')
   end
 
+  it "handles constant definitions" do
+    code = "if (BOOLEAN) { var a = STRING; var b = NULL; var c = NUMBER; }"
+    defines = {"NUMBER" => 1234, "BOOLEAN" => true, "NULL" => nil, "STRING" => "str"}
+    processed = Uglifier.compile(code, :define => defines)
+    processed.should include("a=\"str\"")
+    processed.should_not include("if")
+    processed.should include("b=null")
+    processed.should include("c=1234")
+  end
+
   describe "Input Formats" do
     let(:code) { "function hello() { return 'hello world'; }" }
 

data/uglifier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "uglifier"
-  s.version = "1.2.7"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ville Lautanala"]
-  s.date = "2012-08-02"
+  s.date = "2012-09-02"
   s.email = "lautis@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -43,14 +43,14 @@ 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.3"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 1.0.2", "~> 1.0"])
       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"])
     else
       s.add_dependency(%q<execjs>, [">= 0.3.0"])
-      s.add_dependency(%q<multi_json>, ["~> 1.3"])
+      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"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<execjs>, [">= 0.3.0"])
-    s.add_dependency(%q<multi_json>, ["~> 1.3"])
+    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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uglifier
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -32,17 +32,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3465563417105298794
+      hash: -550840341360460746
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: