execjs 1.3.2 → 1.4.0

data/README.md

@@ -11,13 +11,8 @@ ExecJS supports these runtimes:
   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/)
 * [Microsoft Windows Script Host](http://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx) (JScript)
 
 A short example:

data/lib/execjs/disabled_runtime.rb

@@ -1,5 +1,7 @@
+require "execjs/runtime"
+
 module ExecJS
-  class DisabledRuntime
+  class DisabledRuntime < Runtime
     def name
       "Disabled"
     end
@@ -16,6 +18,10 @@ module ExecJS
       raise Error, "ExecJS disabled"
     end
 
+    def deprecated?
+      true
+    end
+
     def available?
       true
     end

data/lib/execjs/encoding.rb

@@ -0,0 +1,33 @@
+module ExecJS
+  # Encodes strings as UTF-8
+  module Encoding
+    if "".respond_to?(:encode)
+      if RUBY_ENGINE == 'jruby' || RUBY_ENGINE == 'rbx'
+        # workaround for jruby bug http://jira.codehaus.org/browse/JRUBY-6588
+        # workaround for rbx bug https://github.com/rubinius/rubinius/issues/1729
+        def encode(string)
+          if string.encoding.name == 'ASCII-8BIT'
+            data = string.dup
+            data.force_encoding('UTF-8')
+
+            unless data.valid_encoding?
+              raise ::Encoding::UndefinedConversionError, "Could not encode ASCII-8BIT data #{string.dump} as UTF-8"
+            end
+          else
+            data = string.encode('UTF-8')
+          end
+          data
+        end
+      else
+        def encode(string)
+          string.encode('UTF-8')
+        end
+      end
+    else
+      # Define no-op on 1.8
+      def encode(string)
+        string
+      end
+    end
+  end
+end

data/lib/execjs/external_runtime.rb

@@ -1,27 +1,27 @@
-require "multi_json"
 require "shellwords"
 require "tempfile"
+require "execjs/runtime"
 
 module ExecJS
-  class ExternalRuntime
-    class Context
+  class ExternalRuntime < Runtime
+    class Context < Runtime::Context
       def initialize(runtime, source = "")
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         @runtime = runtime
         @source  = source
       end
 
       def eval(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
-          exec("return eval(#{json_encode("(#{source})")})")
+          exec("return eval(#{JSON.encode("(#{source})")})")
         end
       end
 
       def exec(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
         source = "#{@source}\n#{source}" if @source
 
         compile_to_tempfile(source) do |file|
@@ -30,7 +30,7 @@ module ExecJS
       end
 
       def call(identifier, *args)
-        eval "#{identifier}.apply(this, #{json_encode(args)})"
+        eval "#{identifier}.apply(this, #{JSON.encode(args)})"
       end
 
       protected
@@ -50,7 +50,7 @@ module ExecJS
             end
             output.sub!('#{encoded_source}') do
               encoded_source = encode_unicode_codepoints(source)
-              json_encode("(function(){ #{encoded_source} })()")
+              JSON.encode("(function(){ #{encoded_source} })()")
             end
             output.sub!('#{json2_source}') do
               IO.read(ExecJS.root + "/support/json2.js")
@@ -59,7 +59,7 @@ module ExecJS
         end
 
         def extract_result(output)
-          status, value = output.empty? ? [] : json_decode(output)
+          status, value = output.empty? ? [] : JSON.decode(output)
           if status == "ok"
             value
           elsif value =~ /SyntaxError:/
@@ -84,24 +84,6 @@ module ExecJS
             end
           end
         end
-
-        if MultiJson.respond_to?(:dump)
-          def json_decode(obj)
-            MultiJson.load(obj)
-          end
-
-          def json_encode(obj)
-            MultiJson.dump(obj)
-          end
-        else
-          def json_decode(obj)
-            MultiJson.decode(obj)
-          end
-
-          def json_encode(obj)
-            MultiJson.encode(obj)
-          end
-        end
     end
 
     attr_reader :name
@@ -113,27 +95,19 @@ module ExecJS
       @test_args   = options[:test_args]
       @test_match  = options[:test_match]
       @encoding    = options[:encoding]
+      @deprecated  = !!options[:deprecated]
       @binary      = nil
     end
 
-    def exec(source)
-      context = Context.new(self)
-      context.exec(source)
-    end
-
-    def eval(source)
-      context = Context.new(self)
-      context.eval(source)
-    end
-
-    def compile(source)
-      Context.new(self, source)
-    end
-
     def available?
+      require "execjs/json"
       binary ? true : false
     end
 
+    def deprecated?
+      @deprecated
+    end
+
     private
       def binary
         @binary ||= locate_binary
@@ -195,7 +169,7 @@ module ExecJS
         def sh(command)
           output, options = nil, {}
           options[:external_encoding] = @encoding if @encoding
-          options[:internal_encoding] = Encoding.default_internal || 'UTF-8'
+          options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
           IO.popen(command, options) { |f| output = f.read }
           output
         end

data/lib/execjs/johnson_runtime.rb

@@ -1,13 +1,17 @@
+require "execjs/runtime"
+
 module ExecJS
-  class JohnsonRuntime
-    class Context
-      def initialize(source = "")
+  class JohnsonRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "")
+        source = encode(source)
+
         @runtime = Johnson::Runtime.new
         @runtime.evaluate(source)
       end
 
       def exec(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           eval "(function(){#{source}})()", options
@@ -15,7 +19,7 @@ module ExecJS
       end
 
       def eval(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           unbox @runtime.evaluate("(#{source})")
@@ -88,25 +92,15 @@ module ExecJS
       "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
+
+    def deprecated?
+      true
+    end
   end
 end

data/lib/execjs/json.rb

@@ -0,0 +1,23 @@
+require "multi_json"
+
+module ExecJS
+  module JSON
+    if MultiJson.respond_to?(:dump)
+      def self.decode(obj)
+        MultiJson.load(obj)
+      end
+
+      def self.encode(obj)
+        MultiJson.dump(obj)
+      end
+    else
+      def self.decode(obj)
+        MultiJson.decode(obj)
+      end
+
+      def self.encode(obj)
+        MultiJson.encode(obj)
+      end
+    end
+  end
+end

data/lib/execjs/mustang_runtime.rb

@@ -1,15 +1,17 @@
+require "execjs/runtime"
+
 module ExecJS
-  class MustangRuntime
-    class Context
-      def initialize(source = "")
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+  class MustangRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "")
+        source = encode(source)
 
         @v8_context = ::Mustang::Context.new
         @v8_context.eval(source)
       end
 
       def exec(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           eval "(function(){#{source}})()", options
@@ -17,7 +19,7 @@ module ExecJS
       end
 
       def eval(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           unbox @v8_context.eval("(#{source})")
@@ -60,25 +62,15 @@ module ExecJS
       "Mustang (V8)"
     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 "mustang"
       true
     rescue LoadError
       false
     end
+
+    def deprecated?
+      true
+    end
   end
 end

data/lib/execjs/ruby_racer_runtime.rb

@@ -1,8 +1,10 @@
+require "execjs/runtime"
+
 module ExecJS
-  class RubyRacerRuntime
-    class Context
-      def initialize(source = "")
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+  class RubyRacerRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "")
+        source = encode(source)
 
         lock do
           @v8_context = ::V8::Context.new
@@ -11,7 +13,7 @@ module ExecJS
       end
 
       def exec(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           eval "(function(){#{source}})()", options
@@ -19,7 +21,7 @@ module ExecJS
       end
 
       def eval(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           lock do
@@ -27,9 +29,9 @@ module ExecJS
               unbox @v8_context.eval("(#{source})")
             rescue ::V8::JSError => e
               if e.value["name"] == "SyntaxError"
-                raise RuntimeError, e.message
+                raise RuntimeError, e.value.to_s
               else
-                raise ProgramError, e.message
+                raise ProgramError, e.value.to_s
               end
             end
           end
@@ -42,9 +44,9 @@ module ExecJS
             unbox @v8_context.eval(properties).call(*args)
           rescue ::V8::JSError => e
             if e.value["name"] == "SyntaxError"
-              raise RuntimeError, e.message
+              raise RuntimeError, e.value.to_s
             else
-              raise ProgramError, e.message
+              raise ProgramError, e.value.to_s
             end
           end
         end
@@ -93,20 +95,6 @@ module ExecJS
       "therubyracer (V8)"
     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 "v8"
       true

data/lib/execjs/ruby_rhino_runtime.rb

@@ -1,8 +1,10 @@
+require "execjs/runtime"
+
 module ExecJS
-  class RubyRhinoRuntime
-    class Context
-      def initialize(source = "")
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+  class RubyRhinoRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "")
+        source = encode(source)
 
         @rhino_context = ::Rhino::Context.new
         fix_memory_limit! @rhino_context
@@ -10,7 +12,7 @@ module ExecJS
       end
 
       def exec(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           eval "(function(){#{source}})()", options
@@ -18,13 +20,13 @@ module ExecJS
       end
 
       def eval(source, options = {})
-        source = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = encode(source)
 
         if /\S/ =~ source
           unbox @rhino_context.eval("(#{source})")
         end
-      rescue ::Rhino::JavascriptError => e
-        if e.message == "syntax error"
+      rescue ::Rhino::JSError => e
+        if e.message =~ /^syntax error/
           raise RuntimeError, e.message
         else
           raise ProgramError, e.message
@@ -33,7 +35,7 @@ module ExecJS
 
       def call(properties, *args)
         unbox @rhino_context.eval(properties).call(*args)
-      rescue ::Rhino::JavascriptError => e
+      rescue ::Rhino::JSError => e
         if e.message == "syntax error"
           raise RuntimeError, e.message
         else
@@ -42,13 +44,13 @@ module ExecJS
       end
 
       def unbox(value)
-        case value = ::Rhino::To.ruby(value)
-        when ::Rhino::NativeFunction
+        case value = ::Rhino::to_ruby(value)
+        when Java::OrgMozillaJavascript::NativeFunction
           nil
-        when ::Rhino::NativeObject
+        when Java::OrgMozillaJavascript::NativeObject
           value.inject({}) do |vs, (k, v)|
             case v
-            when ::Rhino::NativeFunction, ::Rhino::J::Function
+            when Java::OrgMozillaJavascript::NativeFunction, ::Rhino::JS::Function
               nil
             else
               vs[k] = unbox(v)
@@ -77,20 +79,6 @@ module ExecJS
       "therubyrhino (Rhino)"
     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 "rhino"
       true

data/lib/execjs/runtime.rb

@@ -0,0 +1,55 @@
+require "execjs/encoding"
+
+module ExecJS
+  # Abstract base class for runtimes
+  class Runtime
+    class Context
+      include Encoding
+
+      def initialize(runtime, source = "")
+      end
+
+      def exec(source, options = {})
+        raise NotImplementedError
+      end
+
+      def eval(source, options = {})
+        raise NotImplementedError
+      end
+
+      def call(properties, *args)
+        raise NotImplementedError
+      end
+    end
+
+    def name
+      raise NotImplementedError
+    end
+
+    def context_class
+      self.class::Context
+    end
+
+    def exec(source)
+      context = context_class.new(self)
+      context.exec(source)
+    end
+
+    def eval(source)
+      context = context_class.new(self)
+      context.eval(source)
+    end
+
+    def compile(source)
+      context_class.new(self, source)
+    end
+
+    def deprecated?
+      false
+    end
+
+    def available?
+      raise NotImplementedError
+    end
+  end
+end

data/lib/execjs/runtimes.rb

@@ -34,7 +34,8 @@ module ExecJS
     SpiderMonkey = Spidermonkey = ExternalRuntime.new(
       :name        => "SpiderMonkey",
       :command     => "js",
-      :runner_path => ExecJS.root + "/support/spidermonkey_runner.js"
+      :runner_path => ExecJS.root + "/support/spidermonkey_runner.js",
+      :deprecated  => true
     )
 
     JScript = ExternalRuntime.new(
@@ -52,7 +53,7 @@ module ExecJS
     end
 
     def self.best_available
-      runtimes.find(&:available?)
+      runtimes.reject(&:deprecated?).find(&:available?)
     end
 
     def self.from_environment

data/lib/execjs/support/node_runner.js

@@ -1,4 +1,4 @@
-(function(program, execJS) { execJS(program) })(function(module, exports, require) { #{source}
+(function(program, execJS) { execJS(program) })(function(module, exports, require, console) { #{source}
 }, function(program) {
   var output, print = function(string) {
     process.stdout.write('' + string);

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-07 00:00:00 Z
+date: 2012-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: johnson
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,63 +47,7 @@ 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"
+description: ExecJS lets you run JavaScript code from Ruby.
 email: 
 - sstephenson@gmail.com
 - josh@joshpeek.com
@@ -117,12 +61,15 @@ files:
 - README.md
 - LICENSE
 - lib/execjs/disabled_runtime.rb
+- lib/execjs/encoding.rb
 - lib/execjs/external_runtime.rb
 - lib/execjs/johnson_runtime.rb
+- lib/execjs/json.rb
 - lib/execjs/module.rb
 - lib/execjs/mustang_runtime.rb
 - lib/execjs/ruby_racer_runtime.rb
 - lib/execjs/ruby_rhino_runtime.rb
+- lib/execjs/runtime.rb
 - lib/execjs/runtimes.rb
 - lib/execjs/support/jsc_runner.js
 - lib/execjs/support/jscript_runner.js