execjs 1.1.3 → 1.2.0

data/README.md

@@ -8,14 +8,16 @@ returns the result to you as a Ruby object.
 ExecJS supports these runtimes:
 
 * [therubyracer](https://github.com/cowboyd/therubyracer) - Google V8
-  embedded within MRI Ruby
+  embedded within Ruby
 * [therubyrhino](https://github.com/cowboyd/therubyrhino) - Mozilla
   Rhino embedded within JRuby
+* [Johnson](https://github.com/jbarnette/johnson) - Mozilla
+  SpiderMonkey embedded within Ruby
 * [Mustang](https://github.com/nu7hatch/mustang) - Mustang V8
   embedded within Ruby
 * [Node.js](http://nodejs.org/)
 * Apple JavaScriptCore - Included with Mac OS X
-* [Mozilla Spidermonkey](http://www.mozilla.org/js/spidermonkey/)
+* [Mozilla SpiderMonkey](http://www.mozilla.org/js/spidermonkey/)
 * [Microsoft Windows Script Host](http://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx) (JScript)
 
 A short example:

data/lib/execjs/johnson_runtime.rb

@@ -0,0 +1,112 @@
+module ExecJS
+  class JohnsonRuntime
+    class Context
+      def initialize(source = "")
+        @runtime = Johnson::Runtime.new
+        @runtime.evaluate(source)
+      end
+
+      def exec(source, options = {})
+        souce = source.encode('UTF-8') if source.respond_to?(:encode)
+
+        if /\S/ =~ source
+          eval "(function(){#{source}})()", options
+        end
+      end
+
+      def eval(source, options = {})
+        souce = source.encode('UTF-8') if source.respond_to?(:encode)
+
+        if /\S/ =~ source
+          unbox @runtime.evaluate("(#{source})")
+        end
+      rescue Johnson::Error => e
+        if syntax_error?(e)
+          raise RuntimeError, e.message
+        else
+          raise ProgramError, e.message
+        end
+      end
+
+      def call(properties, *args)
+        unbox @runtime.evaluate(properties).call(*args)
+      rescue Johnson::Error => e
+        if syntax_error?(e)
+          raise RuntimeError, e.message
+        else
+          raise ProgramError, e.message
+        end
+      end
+
+      def unbox(value)
+        case
+        when function?(value)
+          nil
+        when string?(value)
+          value.respond_to?(:force_encoding) ?
+            value.force_encoding('UTF-8') :
+            value
+        when array?(value)
+          value.map { |v| unbox(v) }
+        when object?(value)
+          value.inject({}) do |vs, (k, v)|
+            vs[k] = unbox(v) unless function?(v)
+            vs
+          end
+        else
+          value
+        end
+      end
+
+      private
+        def syntax_error?(error)
+          error.message =~ /^syntax error at /
+        end
+
+        def function?(value)
+          value.respond_to?(:function?) && value.function?
+        end
+
+        def string?(value)
+          value.is_a?(String)
+        end
+
+        def array?(value)
+          array_test.call(value)
+        end
+
+        def object?(value)
+          value.respond_to?(:inject)
+        end
+
+        def array_test
+          @array_test ||= @runtime.evaluate("(function(a) {return a instanceof [].constructor})")
+        end
+    end
+
+    def name
+      "Johnson (SpiderMonkey)"
+    end
+
+    def exec(source)
+      context = Context.new
+      context.exec(source)
+    end
+
+    def eval(source)
+      context = Context.new
+      context.eval(source)
+    end
+
+    def compile(source)
+      Context.new(source)
+    end
+
+    def available?
+      require "johnson"
+      true
+    rescue LoadError
+      false
+    end
+  end
+end

data/lib/execjs/module.rb

@@ -1,8 +1,7 @@
+require "execjs/version"
 require "rbconfig"
 
 module ExecJS
-  VERSION = "1.1.3"
-
   class Error           < ::StandardError; end
   class RuntimeError              < Error; end
   class ProgramError              < Error; end

data/lib/execjs/runtimes.rb

@@ -1,5 +1,6 @@
 require "execjs/module"
 require "execjs/external_runtime"
+require "execjs/johnson_runtime"
 require "execjs/mustang_runtime"
 require "execjs/ruby_racer_runtime"
 require "execjs/ruby_rhino_runtime"
@@ -10,6 +11,8 @@ module ExecJS
 
     RubyRhino = RubyRhinoRuntime.new
 
+    Johnson = JohnsonRuntime.new
+
     Mustang = MustangRuntime.new
 
     Node = ExternalRuntime.new(
@@ -25,8 +28,8 @@ module ExecJS
       :conversion => { :from => "ISO8859-1", :to => "UTF-8" }
     )
 
-    Spidermonkey = ExternalRuntime.new(
-      :name        => "Spidermonkey",
+    SpiderMonkey = Spidermonkey = ExternalRuntime.new(
+      :name        => "SpiderMonkey",
       :command     => "js",
       :runner_path => ExecJS.root + "/support/basic_runner.js"
     )
@@ -54,7 +57,7 @@ module ExecJS
           if runtime.available?
             runtime if runtime.available?
           else
-            raise RuntimeUnavailable, "#{name} runtime is not available on this system"
+            raise RuntimeUnavailable, "#{runtime.name} runtime is not available on this system"
           end
         elsif !name.empty?
           raise RuntimeUnavailable, "#{name} runtime is not defined"
@@ -63,17 +66,18 @@ module ExecJS
     end
 
     def self.names
-      constants
+      @names ||= constants.inject({}) { |h, name| h.merge(const_get(name) => name) }.values
     end
 
     def self.runtimes
       @runtimes ||= [
         RubyRacer,
         RubyRhino,
+        Johnson,
         Mustang,
         Node,
         JavaScriptCore,
-        Spidermonkey,
+        SpiderMonkey,
         JScript
       ]
     end

data/lib/execjs/version.rb

@@ -0,0 +1,3 @@
+module ExecJS
+  VERSION = "1.2.0"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -05:00
+date: 2011-06-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: johnson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,6 +48,62 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mustang
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: therubyracer
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: therubyrhino
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: "    ExecJS lets you run JavaScript code from Ruby.\n"
 email: 
 - sstephenson@gmail.com
@@ -61,7 +117,9 @@ extra_rdoc_files: []
 files: 
 - lib/execjs.rb
 - lib/execjs/external_runtime.rb
+- lib/execjs/johnson_runtime.rb
 - lib/execjs/module.rb
+- lib/execjs/version.rb
 - lib/execjs/mustang_runtime.rb
 - lib/execjs/ruby_racer_runtime.rb
 - lib/execjs/ruby_rhino_runtime.rb
@@ -103,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby