coffee-script 1.1.0 → 2.0.0

data/README.md

@@ -1,15 +1,38 @@
 Ruby CoffeeScript
 =================
 
-Ruby CoffeeScript is a thin wrapper around the `coffee` binary.
+Ruby CoffeeScript is a bridge to the official CoffeeScript compiler.
+
+    CoffeeScript.compile File.read("script.coffee")
+
+
+Installation
+------------
+
+    gem install coffee-script
+
+*This compiler lib has replaced the original CoffeeScript compiler that was written in Ruby*
 
-    CoffeeScript.compile File.open("script.coffee")
 
 Dependencies
 ------------
 
-This is **not** the CoffeeScript parser. This means you need to install `node` and `coffee`.
+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.
+
+You can also use this lib with unreleased versions of CoffeeScript:
+
+    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.
+
+
+Engines
+-------
+
+The `coffee-script` lib 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.
 
-If your `coffee` binary is in a weird location, you can specify the path by hand.
+* **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.
 
-    CoffeeScript.coffee_bin = "/usr/local/bin/coffee"
+* **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

@@ -1,64 +1,138 @@
+require 'json'
+require 'tempfile'
+
+require 'coffee_script/source'
+
 module CoffeeScript
-  class << self
-    def locate_coffee_bin
-      out = `which coffee`
-      if $?.success?
-        out.chomp
-      else
-        raise LoadError, "could not find `coffee` in PATH"
-      end
+  module Source
+    def self.path
+      @path ||= ENV['COFFEESCRIPT_SOURCE_PATH'] || bundled_path
     end
 
-    def coffee_bin
-      @@coffee_bin ||= locate_coffee_bin
+    def self.path=(path)
+      @contents = @version = @bare_option = nil
+      @path = path
     end
 
-    def coffee_bin=(path)
-      @@coffee_bin = path
+    def self.contents
+      @contents ||= File.read(path)
     end
 
-    def version
-      `#{coffee_bin} --version`[/(\d|\.)+/]
+    def self.version
+      @version ||= contents[/CoffeeScript Compiler v([\d.]+)/, 1]
     end
 
-    # Compile a script (String or IO) to JavaScript.
-    def compile(script, options = {})
-      args = "-sp"
+    def self.bare_option
+      @bare_option ||= contents.match(/noWrap/) ? 'noWrap' : 'bare'
+    end
+  end
 
-      if options[:wrap] == false ||
-          options.key?(:bare) ||
-          options.key?(:no_wrap)
-        args += " --#{no_wrap_flag}"
-      end
+  module Engines
+    module JavaScriptCore
+      BIN = "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc"
 
-      execute_coffee(script, args)
-    end
+      class << self
+        def supported?
+          File.exist?(BIN)
+        end
+
+        def compile(script, options = {})
+          options = options[:bare] ? "{#{Source.bare_option} : true}" : "{}"
 
-    # Evaluate a script (String or IO) and return the stdout.
-    # Note: the first argument will be process.argv[3], the second
-    # process.argv[4], etc.
-    def evaluate(script, *args)
-      execute_coffee(script, "-s #{args.join(' ')}")
+          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
+        end
+      end
     end
 
-    private
-      def execute_coffee(script, args)
-        command = "#{coffee_bin} #{args}"
-        script  = script.read if script.respond_to?(:read)
+    module Node
+      class << self
+        def supported?
+          `which node`
+          $?.success?
+        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
 
-        IO.popen(command, "w+") do |f|
-          f << script
-          f.close_write
-          f.read
+          out = `node #{f.path}`
+          $?.success? ? out.chomp : nil
+        ensure
+          f.close! if f
         end
       end
+    end
+
+    module V8
+      class << self
+        def supported?
+          require 'v8'
+          true
+        rescue LoadError
+          false
+        end
 
-      def no_wrap_flag
-        if `#{coffee_bin} --help`.lines.grep(/--no-wrap/).any?
-          'no-wrap'
-        else
-          'bare'
+        def compile(script, options = {})
+          coffee_module['compile'].call(script, Source.bare_option => options[:bare])
         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']
+          end
+      end
+    end
+  end
+
+  class << self
+    def engine
+      @engine ||= nil
+    end
+
+    def engine=(engine)
+      @engine = engine
+    end
+
+    def version
+      Source.version
+    end
+
+    # Compile a script (String or IO) to JavaScript.
+    def compile(script, options = {})
+      script = script.read if script.respond_to?(:read)
+
+      if options.key?(:bare)
+      elsif options.key?(:no_wrap)
+        options[:bare] = options[:no_wrap]
+      else
+        options[:bare] = false
       end
+
+      engine.compile(script, options)
+    end
   end
+
+  self.engine ||= [
+    Engines::V8,
+    Engines::Node,
+    Engines::JavaScriptCore
+  ].detect(&:supported?)
 end

metadata

@@ -1,26 +1,54 @@
 --- !ruby/object:Gem::Specification 
 name: coffee-script
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Jeremy Ashkenas
 - Joshua Peek
+- Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -05:00
+date: 2010-11-12 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
-description: "    Ruby CoffeeScript is a thin wrapper around the coffee binary.\n"
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: coffee-script-source
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: therubyracer
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: "    Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler.\n"
 email: josh@joshpeek.com
 executables: []
 
@@ -60,13 +88,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 0
       version: "0"
-requirements: 
-- node
-- coffee-script
+requirements: []
+
 rubyforge_project: coffee-script
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby CoffeeScript wrapper
+summary: Ruby CoffeeScript Compiler
 test_files: []