execjs 0.3.4 → 0.4.0

data/lib/execjs.rb

@@ -1,9 +1,10 @@
 require "rbconfig"
 
 module ExecJS
-  class Error < ::StandardError; end
-  class RuntimeError    < Error; end
-  class ProgramError    < Error; end
+  class Error           < ::StandardError; end
+  class RuntimeError              < Error; end
+  class ProgramError              < Error; end
+  class RuntimeUnavailable < RuntimeError; end
 
   autoload :ExternalRuntime,  "execjs/external_runtime"
   autoload :MustangRuntime,   "execjs/mustang_runtime"
@@ -11,35 +12,40 @@ module ExecJS
   autoload :RubyRhinoRuntime, "execjs/ruby_rhino_runtime"
   autoload :Runtimes,         "execjs/runtimes"
 
-  def self.exec(source)
-    runtime.exec(source)
-  end
+  class << self
+    attr_reader :runtime
 
-  def self.eval(source)
-    runtime.eval(source)
-  end
+    def exec(source)
+      runtime.exec(source)
+    end
 
-  def self.compile(source)
-    runtime.compile(source)
-  end
+    def eval(source)
+      runtime.eval(source)
+    end
 
-  def self.runtimes
-    Runtimes.runtimes
-  end
+    def compile(source)
+      runtime.compile(source)
+    end
 
-  def self.runtime
-    @runtime ||= Runtimes.best_available ||
-      raise(ExecJS::RuntimeError, "Could not find a JavaScript runtime. See https://github.com/sstephenson/execjs for a list of available runtimes.")
-  end
+    def runtimes
+      Runtimes.runtimes
+    end
 
-  def self.root
-    @root ||= File.expand_path("../execjs", __FILE__)
-  end
+    def runtime=(runtime)
+      raise RuntimeUnavailable, "#{runtime.name} is unavailable on this system" unless runtime.available?
+      @runtime = runtime
+    end
+
+    def root
+      @root ||= File.expand_path("../execjs", __FILE__)
+    end
 
-  def self.windows?
-    @windows ||= RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+    def windows?
+      @windows ||= RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
+    end
   end
 
-  # Eager detect runtime
-  self.runtime
+  # Eagerly detect runtime
+  self.runtime ||= Runtimes.best_available ||
+    raise(RuntimeUnavailable, "Could not find a JavaScript runtime. See https://github.com/sstephenson/execjs for a list of available runtimes.")
 end

data/lib/execjs/support/jscript_runner.js

@@ -16,6 +16,6 @@
       }
     }
   } catch (err) {
-    print(JSON.stringify(['err', '' + err]));
+    print(JSON.stringify(['err', err.name + ': ' + err.message]));
   }
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
+date: 2011-05-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: execjs
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby