coffee-script 2.1.3 → 2.2.0

data/README.md

@@ -31,27 +31,13 @@ variable:
 
     export COFFEESCRIPT_SOURCE_PATH=/path/to/coffee-script/extras/coffee-script.js
 
+### JSON
+
 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.
 
+### ExecJS
 
-Engines
--------
-
-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.
-
-* **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.
+The [ExecJS](https://github.com/sstephenson/execjs) library is used to automatically choose the best JavaScript engine for your platform. Check out its [README](https://github.com/sstephenson/execjs/blob/master/README.md) for a complete list of supported engines.

data/lib/coffee_script.rb

@@ -1,12 +1,9 @@
-require 'json'
-require 'tempfile'
-
+require 'execjs'
 require 'coffee_script/source'
 
 module CoffeeScript
-  class Error  < ::StandardError; end
-  class EngineError      < Error; end
-  class CompilationError < Error; end
+  EngineError      = ExecJS::RuntimeError
+  CompilationError = ExecJS::ProgramError
 
   module Source
     def self.path
@@ -14,7 +11,7 @@ module CoffeeScript
     end
 
     def self.path=(path)
-      @contents = @version = @bare_option = nil
+      @contents = @version = @bare_option = @context = nil
       @path = path
     end
 
@@ -29,126 +26,17 @@ module CoffeeScript
     def self.bare_option
       @bare_option ||= contents.match(/noWrap/) ? 'noWrap' : 'bare'
     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"
-
-      class << self
-        def supported?
-          File.exist?(BIN)
-        end
-
-        def compile(script, options = {})
-          ExternalEngine.compile(BIN, script, options) do |f|
-            f.puts "load(#{Source.path.to_json});"
-          end
-        end
-      end
-    end
-
-    module Node
-      class << self
-
-        def binary
-          @binary ||= `sh -c "which nodejs node"`.split("\n").first
-        end
-
-        def binary=(value)
-          @binary = value.nil? ? nil : value.to_s
-        end
-
-        def supported?
-          binary
-        end
-
-        def compile(script, options = {})
-          ExternalEngine.compile(binary, script, options) do |f|
-            f.puts Source.contents
-            f.puts "var CoffeeScript = this.CoffeeScript, print = console.log;"
-          end
-        end
-      end
-    end
-
-    module V8
-      class << self
-        def supported?
-          require 'v8'
-          true
-        rescue LoadError
-          false
-        end
-
-        def compile(script, options = {})
-          coffee_module['compile'].call(script, Source.bare_option => options[:bare])
-        rescue ::V8::JSError => e
-          raise CompilationError, e.message
-        end
 
-        private
-          def coffee_module
-            @coffee_module ||= build_coffee_module
-          end
-
-          def build_coffee_module
-            context = ::V8::Context.new
-            context.eval(Source.contents)
-            context['CoffeeScript']
-          rescue ::V8::JSError => e
-            raise EngineError, e.message
-          end
-      end
+    def self.context
+      @context ||= ExecJS.compile(contents)
     end
   end
 
   class << self
     def engine
-      @engine ||= nil
     end
 
     def engine=(engine)
-      @engine = engine
     end
 
     def version
@@ -166,13 +54,7 @@ module CoffeeScript
         options[:bare] = false
       end
 
-      engine.compile(script, options)
+      Source.context.call("CoffeeScript.compile", script, options)
     end
   end
-
-  self.engine ||= [
-    Engines::V8,
-    Engines::Node,
-    Engines::JavaScriptCore
-  ].detect(&:supported?)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coffee-script
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
-  - 3
-  version: 2.1.3
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -06:00
+date: 2010-03-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: therubyracer
+  name: execjs
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 description: "    Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.\n"
 email: josh@joshpeek.com
@@ -90,8 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: coffee-script
-rubygems_version: 1.4.1
+rubyforge_project: 
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Ruby CoffeeScript Compiler