closure-compiler 1.1.7 → 1.1.8

data/README.textile

@@ -2,19 +2,19 @@ h1. The Closure Compiler (as a Ruby Gem)
 
 The *closure-compiler* gem is a svelte wrapper around the "Google Closure Compiler":http://code.google.com/closure/compiler/ for JavaScript compression.
 
-Latest Version: *"1.1.7":http://rubygems.org/gems/closure-compiler*
+Latest Version: *"1.1.8":http://rubygems.org/gems/closure-compiler*
 
-The Closure Compiler's *2012-07-25* JAR-file is included with the gem.
+The Closure Compiler's *2012-12-12* JAR-file is included with the gem.
 
 h2. Installation
 
 <pre>
 sudo gem install closure-compiler
 </pre>
-  
+
 h2. Usage
 
-The @Closure::Compiler@ has a single method, @compile@, which can be passed a string or an open @IO@ object, and returns the compiled JavaScript. The result is returned as a string, or, if a block is passed, yields as an @IO@ object for streaming writes.
+The @Closure::Compiler@ has a @compile@ method, which can be passed a string or an open @IO@ object, and returns the compiled JavaScript. The result is returned as a string, or, if a block is passed, yields as an @IO@ object for streaming writes.
 
 <pre>
 require 'rubygems'
@@ -23,13 +23,23 @@ Closure::Compiler.new.compile(File.open('underscore.js', 'r'))
 
 => "(function(){var j=this,m=j._;function i(a){......
 </pre>
-    
+
+The @Closure::Compiler@ also has @compile_file@ and @compile_files@ methods, which can be passed a file path or an array of file paths respectively. The files are concatenated and compiled and, like the @compile@ method, the result is returned as a string or, if block is passed, yields an @IO@ object.
+
+<pre>
+require 'rubygems'
+require 'closure-compiler'
+Closure::Compiler.new.compile_files(['underscore.js', 'jasmine.js']))
+
+=> "(function(){var j=this,m=j._;function i(a){......
+</pre>
+
 When creating a @Closure::Compiler@, you can pass "any options that the command-line compiler accepts":http://code.google.com/closure/compiler/docs/gettingstarted_app.html to the initializer and they'll be forwarded. For example, to raise the compilation level up a notch:
 
 <pre>
 closure = Closure::Compiler.new(:compilation_level => 'ADVANCED_OPTIMIZATIONS')
 closure.compile(File.open('underscore.js', 'r'))
-  
+
 => "(function(){var j=this,m=j.h;function i(a){......
 </pre>
 

data/closure-compiler.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'closure-compiler'
-  s.version   = '1.1.7'            # Keep version in sync with closure-compiler.rb
-  s.date      = '2012-07-25'
+  s.version   = '1.1.8'            # Keep version in sync with closure-compiler.rb
+  s.date      = '2012-12-28'
 
   s.homepage    = "http://github.com/documentcloud/closure-compiler/"
   s.summary     = "Ruby Wrapper for the Google Closure Compiler"
@@ -21,4 +21,4 @@ Gem::Specification.new do |s|
 
   s.files = Dir['lib/**/*', 'vendor/**/*', 'closure-compiler.gemspec', 'README.textile', 'LICENSE', 'COPYING']
 
-end
+end

data/lib/closure-compiler.rb

@@ -1,8 +1,8 @@
 module Closure
 
-  VERSION           = "1.1.7"
+  VERSION           = "1.1.8"
 
-  COMPILER_VERSION  = "20120710"
+  COMPILER_VERSION  = "20121212"
 
   JAVA_COMMAND      = 'java'
 

data/lib/closure/compiler.rb

@@ -10,13 +10,16 @@ module Closure
   # much to see here.
   class Compiler
     
-    DEFAULT_OPTIONS = {:warning_level => 'QUIET'}
+    DEFAULT_OPTIONS = {
+      :warning_level => 'QUIET',
+      :language_in => 'ECMASCRIPT5'
+    }
 
     # When you create a Compiler, pass in the flags and options.
     def initialize(options={})
       @java     = options.delete(:java)     || JAVA_COMMAND
       @jar      = options.delete(:jar_file) || COMPILER_JAR
-      @options  = serialize_options(DEFAULT_OPTIONS.merge(options))
+      @options  = DEFAULT_OPTIONS.merge(options)
     end
 
     # Can compile a JavaScript string or open IO object. Returns the compiled
@@ -34,12 +37,30 @@ module Closure
       tempfile.flush
 
       begin
-        result = `#{command} --js #{tempfile.path} 2>&1`
-      rescue Exception
-        raise Error, "compression failed: #{result}"
+        result = compile_files(tempfile.path)
+      rescue Exception => e
+        raise e
       ensure
         tempfile.close!
       end
+
+      yield(StringIO.new(result)) if block_given?
+      result
+    end
+    alias_method :compress, :compile
+
+    # Takes an array of javascript file paths or a single path. Returns the
+    # resulting JavaScript as a string or yields an IO object containing the
+    # response to a block, for streaming.
+    def compile_files(files)
+      @options.merge!(:js => files)
+
+      begin
+        result = `#{command} 2>&1`
+      rescue Exception
+        raise Error, "compression failed: #{result}"
+      end
+
       unless $?.exitstatus.zero?
         raise Error, result
       end
@@ -47,8 +68,7 @@ module Closure
       yield(StringIO.new(result)) if block_given?
       result
     end
-    alias_method :compress, :compile
-
+    alias_method :compile_file, :compile_files
 
     private
 
@@ -64,7 +84,7 @@ module Closure
     end
 
     def command
-      [@java, '-jar', "\"#{@jar}\"", @options].flatten.join(' ')
+      [@java, '-jar', "\"#{@jar}\"", serialize_options(@options)].flatten.join(' ')
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: closure-compiler
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-12-28 00:00:00 Z
 dependencies: []
 
 description: "    A Ruby Wrapper for the Google Closure Compiler.\n"
@@ -29,7 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/closure/compiler.rb
-- lib/closure-compiler-20120710.jar
+- lib/closure-compiler-20121212.jar
 - lib/closure-compiler.rb
 - closure-compiler.gemspec
 - README.textile