coffee-script 2.0.0 → 2.1.0

data/README.md

@@ -11,28 +11,47 @@ Installation
 
     gem install coffee-script
 
-*This compiler lib has replaced the original CoffeeScript compiler that was written in Ruby*
+*Note: This compiler library has replaced the original CoffeeScript
+ compiler that was written in Ruby.*
 
 
 Dependencies
 ------------
 
-The compiler depends on the `coffee-script-source` gem which is updated any time a new version of CoffeeScript is released. The gem's version number is sync'd up with the javascript release. This way you can build against different versions of CoffeeScript from this compiler.
+This library depends on the `coffee-script-source` gem which is
+updated any time a new version of CoffeeScript is released. (The
+`coffee-script-source` gem's version number is synced with each
+official CoffeeScript release.) This way you can build against
+different versions of CoffeeScript by requiring the correct version of
+the `coffee-script-source` gem.
 
-You can also use this lib with unreleased versions of CoffeeScript:
+In addition, you can use this library with unreleased versions of
+CoffeeScript by setting the `COFFEESCRIPT_SOURCE_PATH` environment
+variable:
 
     export COFFEESCRIPT_SOURCE_PATH=/path/to/coffee-script/extras/coffee-script.js
 
-The json library is also required but is not explicity stated as a gem dependency. If you're on 1.8 you'll need to install the json or json_pure gem. Its already included in 1.9.
+The `json` library is also required but is not explicitly stated as a
+gem dependency. If you're on Ruby 1.8 you'll need to install the
+`json` or `json_pure` gem. On Ruby 1.9, `json` is included in the
+standard library.
 
 
 Engines
 -------
 
-The `coffee-script` lib will automatically choose the best JavaScript engine for your platform. The currently implemented engines are:
+The `coffee-script` library will automatically choose the best
+JavaScript engine for your platform. The currently implemented engines
+are:
 
-* **Node.js**. If the `node` binary is available in $PATH, it will be used to invoke the CoffeeScript compiler.
+* **Node.js**. If the `node` binary is available in `$PATH`, it will
+    be used to invoke the CoffeeScript compiler.
 
-* **JavaScript Core**. If you're on OS X and don't have Node.js installed, the lib will fall back to the built-in JavaScript Core binary, `jsc`. This way you don't need any additional dependencies.
+* **JavaScript Core**. If you're on OS X and don't have Node.js
+    installed, the library will fall back to the built-in JavaScript
+    Core binary, `jsc`. This way you don't need to install any
+    additional dependencies.
 
-* **V8**. Shelling out to Node.js may be too slow for your production environment. In this case, install `therubyracer` gem, which provides a fast bridge between Ruby and V8.
+* **V8**. Shelling out to Node.js may be too slow for your production
+    environment. In this case, install `therubyracer` gem, which
+    provides a fast bridge between Ruby and V8.

data/lib/coffee_script.rb

@@ -4,6 +4,10 @@ require 'tempfile'
 require 'coffee_script/source'
 
 module CoffeeScript
+  class Error  < ::StandardError; end
+  class EngineError      < Error; end
+  class CompilationError < Error; end
+
   module Source
     def self.path
       @path ||= ENV['COFFEESCRIPT_SOURCE_PATH'] || bundled_path
@@ -27,6 +31,45 @@ module CoffeeScript
     end
   end
 
+  module ExternalEngine
+    class << self
+      def compile(command, script, options)
+        yield f = Tempfile.open("coffee.js")
+        f.puts compile_js(script, options)
+        f.close
+
+        execute("#{command} #{f.path}")
+      ensure
+        f.close! if f
+      end
+
+      def execute(command)
+        out = `#{command}`.chomp
+        if $?.success?
+          status, result = out[0, 1], out[1..-1]
+          if status == "+"
+            result
+          else
+            raise CompilationError, result[/^(?:Error: )?(.*)/, 1]
+          end
+        else
+          raise EngineError, out
+        end
+      end
+
+      def compile_js(script, options)
+        options = options[:bare] ? "{#{Source.bare_option} : true}" : "{}"
+        <<-JS
+          try {
+            print('+' + CoffeeScript.compile(#{script.to_json}, #{options}));
+          } catch (e) {
+            print('-' + e);
+          }
+        JS
+      end
+    end
+  end
+
   module Engines
     module JavaScriptCore
       BIN = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc"
@@ -37,17 +80,9 @@ module CoffeeScript
         end
 
         def compile(script, options = {})
-          options = options[:bare] ? "{#{Source.bare_option} : true}" : "{}"
-
-          f = Tempfile.open("coffee.js")
-          f.puts "load(#{Source.path.to_json});"
-          f.puts "print(CoffeeScript.compile(#{script.to_json}, #{options}));"
-          f.close
-
-          out = `#{BIN} #{f.path}`
-          $?.success? ? out.chomp : nil
-        ensure
-          f.close! if f
+          ExternalEngine.compile(BIN, script, options) do |f|
+            f.puts "load(#{Source.path.to_json});"
+          end
         end
       end
     end
@@ -60,17 +95,10 @@ module CoffeeScript
         end
 
         def compile(script, options = {})
-          options = options[:bare] ? "{#{Source.bare_option} : true}" : "{}"
-
-          f = Tempfile.open("coffee.js")
-          f.puts Source.contents
-          f.puts "console.log(this.CoffeeScript.compile(#{script.to_json}, #{options}));"
-          f.close
-
-          out = `node #{f.path}`
-          $?.success? ? out.chomp : nil
-        ensure
-          f.close! if f
+          ExternalEngine.compile("node", script, options) do |f|
+            f.puts Source.contents
+            f.puts "var CoffeeScript = this.CoffeeScript, print = console.log;"
+          end
         end
       end
     end
@@ -86,6 +114,8 @@ module CoffeeScript
 
         def compile(script, options = {})
           coffee_module['compile'].call(script, Source.bare_option => options[:bare])
+        rescue ::V8::JSError => e
+          raise CompilationError, e.message
         end
 
         private
@@ -97,6 +127,8 @@ module CoffeeScript
             context = ::V8::Context.new
             context.eval(Source.contents)
             context['CoffeeScript']
+          rescue ::V8::JSError => e
+            raise EngineError, e.message
           end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coffee-script
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -06:00
+date: 2010-11-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency