From d19c7601863464233f5c18702ff01cb1740c1ce3 Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Wed, 9 Feb 2011 21:27:56 -0600
Subject: [PATCH] Less magic

---
 lib/execjs.rb                    |  4 ++
 lib/execjs/external_runtime.rb   |  3 ++
 lib/execjs/ruby_racer_runtime.rb |  3 +-
 lib/execjs/ruby_rhino_runtime.rb |  3 +-
 lib/execjs/runtimes.rb           | 81 ++++++++++++++++++--------------
 test/test_runtimes.rb            | 30 +++++-------
 6 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/lib/execjs.rb b/lib/execjs.rb
index 1ab48ec..88242a8 100644
--- a/lib/execjs.rb
+++ b/lib/execjs.rb
@@ -18,6 +18,10 @@ module ExecJS
     runtime.eval(source)
   end
 
+  def self.runtimes
+    Runtimes.runtimes
+  end
+
   def self.runtime
     @runtime ||= Runtimes.best_available
   end
diff --git a/lib/execjs/external_runtime.rb b/lib/execjs/external_runtime.rb
index f81bac6..5e1f123 100644
--- a/lib/execjs/external_runtime.rb
+++ b/lib/execjs/external_runtime.rb
@@ -3,7 +3,10 @@ require "tempfile"
 
 module ExecJS
   class ExternalRuntime
+    attr_reader :name
+
     def initialize(options)
+      @name        = options[:name]
       @command     = options[:command]
       @runner_path = options[:runner_path]
       @test_args   = options[:test_args]
diff --git a/lib/execjs/ruby_racer_runtime.rb b/lib/execjs/ruby_racer_runtime.rb
index 1fc74c3..fac00c8 100644
--- a/lib/execjs/ruby_racer_runtime.rb
+++ b/lib/execjs/ruby_racer_runtime.rb
@@ -1,6 +1,7 @@
 module ExecJS
   class RubyRacerRuntime
-    def initialize(options)
+    def name
+      "therubyracer (V8)"
     end
 
     def exec(source)
diff --git a/lib/execjs/ruby_rhino_runtime.rb b/lib/execjs/ruby_rhino_runtime.rb
index ee3cf79..1803273 100644
--- a/lib/execjs/ruby_rhino_runtime.rb
+++ b/lib/execjs/ruby_rhino_runtime.rb
@@ -1,6 +1,7 @@
 module ExecJS
   class RubyRhinoRuntime
-    def initialize(options)
+    def name
+      "therubyrhino (Rhino)"
     end
 
     def exec(source)
diff --git a/lib/execjs/runtimes.rb b/lib/execjs/runtimes.rb
index 018a3a4..8333d3d 100644
--- a/lib/execjs/runtimes.rb
+++ b/lib/execjs/runtimes.rb
@@ -1,45 +1,56 @@
 module ExecJS
   module Runtimes
+    RubyRacer = RubyRacerRuntime.new
+
+    RubyRhino = RubyRhinoRuntime.new
+
+    V8 = ExternalRuntime.new(
+      :name        => "V8",
+      :command     => "v8",
+      :test_args   => "--help",
+      :test_match  => /--crankshaft/,
+      :runner_path => ExecJS.root + "/support/basic_runner.js"
+    )
+
+    Node = ExternalRuntime.new(
+      :name        => "Node.js (V8)",
+      :command     => ["nodejs", "node"],
+      :runner_path => ExecJS.root + "/support/node_runner.js"
+    )
+
+    JavaScriptCore = ExternalRuntime.new(
+      :name        => "JavaScriptCore",
+      :command     => "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
+      :runner_path => ExecJS.root + "/support/basic_runner.js"
+    )
+
+    Spidermonkey = ExternalRuntime.new(
+      :name        => "Spidermonkey",
+      :command     => "js",
+      :runner_path => ExecJS.root + "/support/basic_runner.js"
+    )
+
+    JScript = ExternalRuntime.new(
+      :name        => "JScript",
+      :command     => "cscript //E:jscript //Nologo",
+      :runner_path => ExecJS.root + "/support/jscript_runner.js"
+    )
+
+
     def self.best_available
       runtimes.find(&:available?)
     end
 
     def self.runtimes
-      @runtimes ||= []
+      @runtimes ||= [
+        RubyRacer,
+        RubyRhino,
+        V8,
+        Node,
+        JavaScriptCore,
+        Spidermonkey,
+        JScript
+      ]
     end
-
-    def self.define_runtime(name, options)
-      klass = options[:as] || ExternalRuntime
-      runtimes.push runtime = klass.new(options)
-      const_set(name, runtime)
-    end
-
-    define_runtime :RubyRacer,
-      :as => RubyRacerRuntime
-
-    define_runtime :RubyRhino,
-      :as => RubyRhinoRuntime
-
-    define_runtime :V8,
-      :command => "v8",
-      :test_args => "--help",
-      :test_match => /--crankshaft/,
-      :runner_path => ExecJS.root + "/support/basic_runner.js"
-
-    define_runtime :Node,
-      :command => ["nodejs", "node"],
-      :runner_path => ExecJS.root + "/support/node_runner.js"
-
-    define_runtime :JavaScriptCore,
-      :command => "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
-      :runner_path => ExecJS.root + "/support/basic_runner.js"
-
-    define_runtime :Spidermonkey,
-      :command => "js",
-      :runner_path => ExecJS.root + "/support/basic_runner.js"
-
-    define_runtime :JScript,
-      :command => "cscript //E:jscript //Nologo",
-      :runner_path => ExecJS.root + "/support/jscript_runner.js"
   end
 end
diff --git a/test/test_runtimes.rb b/test/test_runtimes.rb
index 82105ae..422ce1e 100644
--- a/test/test_runtimes.rb
+++ b/test/test_runtimes.rb
@@ -45,39 +45,31 @@ module TestRuntime
   end
 end
 
-def test_runtime(name, description = nil)
-  runtime = ExecJS::Runtimes.const_get(name)
-  title = [name, description].join(" ")
+warn "Runtime Support:"
+ExecJS.runtimes.each do |runtime|
   ok = runtime.available?
 
-  warn "%s %-16s %s" %
+  warn " %s %-21s %s" %
     if ok
-      ["✓", title, "Found"]
+      ["✓", runtime.name, "Found"]
     else
-      [" ", title, "Not found"]
+      [" ", runtime.name, "Not found"]
     end
 
   if ok
     Class.new(Test::Unit::TestCase) do
-      (class << self; self end).send(:define_method, :name) do
-        "#{name}Test"
-      end
-
       include TestRuntime
 
+      instance_exec do
+        define_method(:name) do
+          runtime.name
+        end
+      end
+
       define_method(:setup) do
         instance_variable_set(:@runtime, runtime)
       end
     end
   end
 end
-
-warn "Runtime support:"
-test_runtime :RubyRacer, "(V8)"
-test_runtime :RubyRhino
-test_runtime :V8
-test_runtime :Node, "(V8)"
-test_runtime :JavaScriptCore
-test_runtime :Spidermonkey
-test_runtime :JScript
 warn ""