lib/uglifier.rb in uglifier-0.5.4 vs lib/uglifier.rb in uglifier-1.0.0

@@ -1,42 +1,61 @@
+# encoding: UTF-8
+
 require "execjs"
 require "multi_json"
 
 class Uglifier
   Error = ExecJS::Error
   # MultiJson.engine = :json_gem
 
+  # Default options for compilation
   DEFAULTS = {
     :mangle => true, # Mangle variables names
     :toplevel => false, # Mangle top-level variable names
+    :except => [], # Variable names to be excluded from mangling
+    :max_line_length => 32 * 1024, # Maximum line length
     :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
     :seqs => true, # Reduce consecutive statements in blocks into single statement
     :dead_code => true, # Remove dead code (e.g. after return)
     :unsafe => false, # Optimizations known to be unsafe in some situations
     :copyright => true, # Show copyright message
     :beautify => false, # Ouput indented code
     :beautify_options => {
       :indent_level => 4,
       :indent_start => 0,
       :quote_keys => false,
-      :space_colon => 0
+      :space_colon => 0,
+      :ascii_only => false
     }
   }
 
   SourcePath = File.expand_path("../uglify.js", __FILE__)
   ES5FallbackPath = File.expand_path("../es5.js", __FILE__)
 
+  # Minifies JavaScript code using implicit context.
+  #
+  # source should be a String or IO object containing valid JavaScript.
+  # options contain optional overrides to Uglifier::DEFAULTS
+  #
+  # Returns minified code as String
   def self.compile(source, options = {})
     self.new(options).compile(source)
   end
 
-  # Create new instance of Uglifier with given options
+  # Initialize new context for Uglifier with given options
+  #
+  # options - Hash of options to override Uglifier::DEFAULTS
   def initialize(options = {})
     @options = DEFAULTS.merge(options)
-    @context = ExecJS.compile(File.read(ES5FallbackPath) + File.read(SourcePath))
+    @context = ExecJS.compile(File.open(ES5FallbackPath, "r:UTF-8").read + File.open(SourcePath, "r:UTF-8").read)
   end
 
+  # Minifies JavaScript code
+  #
+  # source should be a String or IO object containing valid JavaScript.
+  #
+  # Returns minified code as String
   def compile(source)
     source = source.respond_to?(:read) ? source.read : source.to_s
 
     js = []
     js << "var result = '';"
@@ -64,20 +83,29 @@
     if @options[:unsafe]
       js << "ast = UglifyJS.uglify.ast_squeeze_more(ast);"
     end
 
     js << "result += UglifyJS.uglify.gen_code(ast, #{MultiJson.encode(gen_code_options)});"
+
+    if !@options[:beautify] && @options[:max_line_length]
+      js << "result = UglifyJS.uglify.split_lines(result, #{@options[:max_line_length].to_i})"
+    end
+
     js << "return result;"
 
     @context.exec js.join("\n")
   end
   alias_method :compress, :compile
 
   private
 
   def mangle_options
-    @options[:toplevel]
+    {
+      "toplevel" => @options[:toplevel],
+      "defines" => {},
+      "except" => @options[:except]
+    }
   end
 
   def squeeze_options
     {
       "make_seqs" => @options[:seqs],
@@ -85,8 +113,9 @@
       "keep_comps" => !@options[:unsafe]
     }
   end
 
   def gen_code_options
-    @options[:beautify] ? @options[:beautify_options] : {}
+    
+    @options[:beautify] ? {:beautify => true}.merge(@options[:beautify_options]) : {}
   end
 end