execjs 2.5.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b661ea567392e0b28c52fa78afd62bb2f5c92928
-  data.tar.gz: d311797924e04937683fce5b9a5df34aab7a19d2
+SHA256:
+  metadata.gz: d8d9f5aa1c15a7f78fd46fac3e22c3341a196d4cf82212cbc37669bd49daa2a4
+  data.tar.gz: 4b720a645a2d68adbd09d7e9111b12e8034c4f038738a7fe2d7b1be928d80002
 SHA512:
-  metadata.gz: 30839a2f7f598ceb148df63481454de2ccb7868d9830441e64c996c01690fcd636dd76643174ed063daf73aa80534c241cd44579aa613942f6aa5981075d1af7
-  data.tar.gz: e026d891e649b617f2dcd526043a9a178f1eaf0659589e43e8c4cc60a3ce08452229fd929ee73c681b5d9c326f9a5904febf947deb9fffb700ae82ad9be38709
+  metadata.gz: 2388cc21b50bc84c26546c5e2ecd5be158f712e77fb3d505bc5b61d8fa292cc9a82796c2c25c56181a6cd84b6f9e09af7950648e0eacf3421e5a88fccab60d6d
+  data.tar.gz: c761477dff8eaeba2534175722b4ea0f386499a5a524ae202bd5310c230d861f4bcf6efd4b489b63f7958756615b6cd56d2128805ca239d98abf7894d98b1223

data/{LICENSE → MIT-LICENSE}

@@ -1,5 +1,5 @@
-Copyright (c) 2015 Sam Stephenson
-Copyright (c) 2015 Josh Peek
+Copyright (c) 2015-2016 Sam Stephenson
+Copyright (c) 2015-2016 Josh Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,14 +7,15 @@ returns the result to you as a Ruby object.
 
 ExecJS supports these runtimes:
 
-* [therubyracer](https://github.com/cowboyd/therubyracer) - Google V8
-  embedded within Ruby
 * [therubyrhino](https://github.com/cowboyd/therubyrhino) - Mozilla
   Rhino embedded within JRuby
 * [Duktape.rb](https://github.com/judofyr/duktape.rb) - Duktape JavaScript interpreter
 * [Node.js](http://nodejs.org/)
 * Apple JavaScriptCore - Included with Mac OS X
 * [Microsoft Windows Script Host](http://msdn.microsoft.com/en-us/library/9bbdkx3k.aspx) (JScript)
+* [Google V8](http://code.google.com/p/v8/)
+* [mini_racer](https://github.com/discourse/mini_racer) - Google V8
+  embedded within Ruby
 
 A short example:
 
@@ -42,7 +43,6 @@ context.call("CoffeeScript.compile", "square = (x) -> x * x", bare: true)
 $ gem install execjs
 ```
 
-
 # FAQ
 
 **Why can't I use CommonJS `require()` inside ExecJS?**
@@ -72,9 +72,12 @@ are automatically detected, each runtime has different sandboxing properties.
 You shouldn't use `ExecJS.eval` on any inputs you wouldn't feel comfortable Ruby
 `eval()`ing.
 
+## Contributing to ExecJS
 
-# License
+ExecJS is work of dozens of contributors. You're encouraged to submit pull requests, propose
+features and discuss issues.
 
-Copyright (c) 2015 Sam Stephenson and Josh Peek.
+See [CONTRIBUTING](CONTRIBUTING.md).
 
-Released under the MIT license. See `LICENSE` for details.
+## License
+ExecJS is released under the [MIT License](MIT-LICENSE).

data/lib/execjs/disabled_runtime.rb

@@ -6,15 +6,15 @@ module ExecJS
       "Disabled"
     end
 
-    def exec(source)
+    def exec(source, options = {})
       raise Error, "ExecJS disabled"
     end
 
-    def eval(source)
+    def eval(source, options = {})
       raise Error, "ExecJS disabled"
     end
 
-    def compile(source)
+    def compile(source, options = {})
       raise Error, "ExecJS disabled"
     end
 

data/lib/execjs/duktape_runtime.rb

@@ -4,7 +4,7 @@ require "json"
 module ExecJS
   class DuktapeRuntime < Runtime
     class Context < Runtime::Context
-      def initialize(runtime, source = "")
+      def initialize(runtime, source = "", options = {})
         @ctx = Duktape::Context.new(complex_object: nil)
         @ctx.exec_string(encode(source), '(execjs)')
       rescue Exception => e
@@ -26,7 +26,8 @@ module ExecJS
       end
 
       def call(identifier, *args)
-        @ctx.call_prop(identifier.split("."), *args)
+        @ctx.exec_string("__execjs_duktape_call = #{identifier}", '(execjs)')
+        @ctx.call_prop("__execjs_duktape_call", *args)
       rescue Exception => e
         raise wrap_error(e)
       end

data/lib/execjs/external_runtime.rb

@@ -4,7 +4,7 @@ require "execjs/runtime"
 module ExecJS
   class ExternalRuntime < Runtime
     class Context < Runtime::Context
-      def initialize(runtime, source = "")
+      def initialize(runtime, source = "", options = {})
         source = encode(source)
 
         @runtime = runtime
@@ -120,20 +120,25 @@ module ExecJS
         @binary ||= which(@command)
       end
 
-      def locate_executable(cmd)
-        if ExecJS.windows? && File.extname(cmd) == ""
-          cmd << ".exe"
-        end
-
-        if File.executable? cmd
-          cmd
-        else
-          path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |p|
-            full_path = File.join(p, cmd)
-            File.executable?(full_path) && File.file?(full_path)
+      def locate_executable(command)
+        commands = Array(command)
+        if ExecJS.windows? && File.extname(command) == ""
+          ENV['PATHEXT'].split(File::PATH_SEPARATOR).each { |p|
+            commands << (command + p)
           }
-          path && File.expand_path(cmd, path)
         end
+
+        commands.find { |cmd|
+          if File.executable? cmd
+            cmd
+          else
+            path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |p|
+              full_path = File.join(p, cmd)
+              File.executable?(full_path) && File.file?(full_path)
+            }
+            path && File.expand_path(cmd, path)
+          end
+        }
       end
 
     protected
@@ -168,7 +173,7 @@ module ExecJS
           begin
             command = binary.split(" ") << filename
             `#{shell_escape(*command)} 2>&1 > #{path}`
-            output = File.open(path, 'rb', @popen_options) { |f| f.read }
+            output = File.open(path, 'rb', **@popen_options) { |f| f.read }
           ensure
             File.unlink(path) if path
           end
@@ -192,7 +197,7 @@ module ExecJS
 
         def exec_runtime(filename)
           command = "#{Shellwords.join(binary.split(' ') << filename)} 2>&1"
-          io = IO.popen(command, @popen_options)
+          io = IO.popen(command, **@popen_options)
           output = io.read
           io.close
 
@@ -204,7 +209,7 @@ module ExecJS
         end
       else
         def exec_runtime(filename)
-          io = IO.popen(binary.split(' ') << filename, @popen_options.merge({err: [:child, :out]}))
+          io = IO.popen(binary.split(' ') << filename, **(@popen_options.merge({err: [:child, :out]})))
           output = io.read
           io.close
 

data/lib/execjs/mini_racer_runtime.rb

@@ -0,0 +1,103 @@
+require "execjs/runtime"
+
+module ExecJS
+  class MiniRacerRuntime < Runtime
+    class Context < Runtime::Context
+      def initialize(runtime, source = "", options={})
+        source = encode(source)
+        @context = ::MiniRacer::Context.new
+        @context.eval("delete this.console");
+        translate do
+          @context.eval(source)
+        end
+      end
+
+      def exec(source, options = {})
+        source = encode(source)
+
+        if /\S/ =~ source
+          eval "(function(){#{source}})()"
+        end
+      end
+
+      def eval(source, options = {})
+        source = encode(source)
+
+        if /\S/ =~ source
+          translate do
+            @context.eval("(#{source})")
+          end
+        end
+      end
+
+      def call(identifier, *args)
+        # TODO optimise generate
+        eval "#{identifier}.apply(this, #{::JSON.generate(args)})"
+      end
+
+      private
+
+      def strip_functions!(value)
+        if Array === value
+          value.map! do |v|
+            if MiniRacer::JavaScriptFunction === value
+              nil
+            else
+              strip_functions!(v)
+            end
+          end
+        elsif Hash === value
+          value.each do |k,v|
+            if MiniRacer::JavaScriptFunction === v
+              value.delete k
+            else
+              value[k] = strip_functions!(v)
+            end
+          end
+          value
+        elsif MiniRacer::JavaScriptFunction === value
+          nil
+        else
+          value
+        end
+      end
+
+      def translate
+        begin
+          strip_functions! yield
+        rescue MiniRacer::RuntimeError => e
+          ex = ProgramError.new e.message
+          if backtrace = e.backtrace
+            backtrace = backtrace.map { |line|
+              if line =~ /JavaScript at/
+                line.sub("JavaScript at ", "")
+                    .sub("<anonymous>", "(execjs)")
+                    .strip
+              else
+                line
+              end
+            }
+            ex.set_backtrace backtrace
+          end
+          raise ex
+        rescue MiniRacer::ParseError => e
+          ex = RuntimeError.new e.message
+          ex.set_backtrace(["(execjs):1"] + e.backtrace)
+          raise ex
+        end
+      end
+
+    end
+
+    def name
+      "mini_racer (V8)"
+    end
+
+    def available?
+      require "mini_racer"
+      true
+    rescue LoadError
+      false
+    end
+  end
+end

data/lib/execjs/module.rb

@@ -15,16 +15,16 @@ module ExecJS
       @runtime = runtime
     end
 
-    def exec(source)
-      runtime.exec(source)
+    def exec(source, options = {})
+      runtime.exec(source, options)
     end
 
-    def eval(source)
-      runtime.eval(source)
+    def eval(source, options = {})
+      runtime.eval(source, options)
     end
 
-    def compile(source)
-      runtime.compile(source)
+    def compile(source, options = {})
+      runtime.compile(source, options)
     end
 
     def root

data/lib/execjs/ruby_rhino_runtime.rb

@@ -3,7 +3,7 @@ require "execjs/runtime"
 module ExecJS
   class RubyRhinoRuntime < Runtime
     class Context < Runtime::Context
-      def initialize(runtime, source = "")
+      def initialize(runtime, source = "", options = {})
         source = encode(source)
 
         @rhino_context = ::Rhino::Context.new

data/lib/execjs/runtime.rb

@@ -6,18 +6,33 @@ module ExecJS
     class Context
       include Encoding
 
-      def initialize(runtime, source = "")
+      def initialize(runtime, source = "", options = {})
       end
 
+      # Evaluates the +source+ in the context of a function body and returns the
+      # returned value.
+      #
+      #   context.exec("return 1") # => 1
+      #   context.exec("1")        # => nil (nothing was returned)
       def exec(source, options = {})
         raise NotImplementedError
       end
 
+      # Evaluates the +source+ as an expression and returns the result.
+      #
+      #   context.eval("1")        # => 1
+      #   context.eval("return 1") # => Raises SyntaxError
       def eval(source, options = {})
         raise NotImplementedError
       end
 
-      def call(properties, *args)
+      # Evaluates +source+ as an expression (which should be of type
+      # +function+), and calls the function with the given arguments.
+      # The function will be evaluated with the global object as +this+.
+      #
+      #   context.call("function(a, b) { return a + b }", 1, 1) # => 2
+      #   context.call("CoffeeScript.compile", "1 + 1")
+      def call(source, *args)
         raise NotImplementedError
       end
     end
@@ -30,18 +45,32 @@ module ExecJS
       self.class::Context
     end
 
-    def exec(source)
-      context = context_class.new(self)
-      context.exec(source)
+    def exec(source, options = {})
+      context = compile("", options)
+
+      if context.method(:exec).arity == 1
+        context.exec(source)
+      else
+        context.exec(source, options)
+      end
     end
 
-    def eval(source)
-      context = context_class.new(self)
-      context.eval(source)
+    def eval(source, options = {})
+      context = compile("", options)
+
+      if context.method(:eval).arity == 1
+        context.eval(source)
+      else
+        context.eval(source, options)
+      end
     end
 
-    def compile(source)
-      context_class.new(self, source)
+    def compile(source, options = {})
+      if context_class.instance_method(:initialize).arity == 2
+        context_class.new(self, source)
+      else
+        context_class.new(self, source, options)
+      end
     end
 
     def deprecated?

data/lib/execjs/runtimes.rb

@@ -2,8 +2,8 @@ require "execjs/module"
 require "execjs/disabled_runtime"
 require "execjs/duktape_runtime"
 require "execjs/external_runtime"
-require "execjs/ruby_racer_runtime"
 require "execjs/ruby_rhino_runtime"
+require "execjs/mini_racer_runtime"
 
 module ExecJS
   module Runtimes
@@ -11,20 +11,23 @@ module ExecJS
 
     Duktape = DuktapeRuntime.new
 
-    RubyRacer = RubyRacerRuntime.new
-
     RubyRhino = RubyRhinoRuntime.new
 
+    MiniRacer = MiniRacerRuntime.new
+
     Node = ExternalRuntime.new(
       name:        "Node.js (V8)",
-      command:     ["nodejs", "node"],
+      command:     ["node", "nodejs"],
       runner_path: ExecJS.root + "/support/node_runner.js",
       encoding:    'UTF-8'
     )
 
     JavaScriptCore = ExternalRuntime.new(
       name:        "JavaScriptCore",
-      command:     "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
+      command:     [
+        "/System/Library/Frameworks/JavaScriptCore.framework/Versions/Current/Helpers/jsc",
+        "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
+      ],
       runner_path: ExecJS.root + "/support/jsc_runner.js"
     )
 
@@ -42,6 +45,13 @@ module ExecJS
       encoding:    'UTF-16LE' # CScript with //U returns UTF-16LE
     )
 
+    V8 = ExternalRuntime.new(
+      name:        "V8",
+      command:     "d8",
+      runner_path: ExecJS.root + "/support/v8_runner.js",
+      encoding:    'UTF-8'
+    )
+
 
     def self.autodetect
       from_environment || best_available ||
@@ -54,16 +64,14 @@ module ExecJS
     end
 
     def self.from_environment
-      if name = ENV["EXECJS_RUNTIME"]
-        if runtime = const_get(name)
-          if runtime.available?
-            runtime if runtime.available?
-          else
-            raise RuntimeUnavailable, "#{runtime.name} runtime is not available on this system"
-          end
-        elsif !name.empty?
-          raise RuntimeUnavailable, "#{name} runtime is not defined"
-        end
+      env = ENV["EXECJS_RUNTIME"]
+      if env && !env.empty?
+        name = env
+        raise RuntimeUnavailable, "#{name} runtime is not defined" unless const_defined?(name)
+        runtime = const_get(name)
+
+        raise RuntimeUnavailable, "#{runtime.name} runtime is not available on this system" unless runtime.available?
+        runtime
       end
     end
 
@@ -73,13 +81,14 @@ module ExecJS
 
     def self.runtimes
       @runtimes ||= [
-        RubyRacer,
         RubyRhino,
         Duktape,
-        JavaScriptCore,
+        MiniRacer,
         Node,
+        JavaScriptCore,
         SpiderMonkey,
-        JScript
+        JScript,
+        V8
       ]
     end
   end

data/lib/execjs/support/jsc_runner.js

@@ -2,6 +2,7 @@
 }, function(program) {
   var output;
   try {
+    delete this.console;
     result = program();
     if (typeof result == 'undefined' && result !== null) {
       print('["ok"]');

data/lib/execjs/support/node_runner.js

@@ -1,10 +1,20 @@
-(function(program, execJS) { execJS(program) })(function(global, module, exports, require, console, setTimeout, setInterval, clearTimeout, clearInterval, setImmediate, clearImmediate) { #{source}
+(function(program, execJS) { execJS(program) })(function(global, process, module, exports, require, console, setTimeout, setInterval, clearTimeout, clearInterval, setImmediate, clearImmediate) { #{source}
 }, function(program) {
   var output, print = function(string) {
     process.stdout.write('' + string);
   };
   try {
+    var __process__ = process;
+    delete this.process;
+    delete this.console;
+    delete this.setTimeout;
+    delete this.setInterval;
+    delete this.clearTimeout;
+    delete this.clearInterval;
+    delete this.setImmediate;
+    delete this.clearImmediate;
     result = program();
+    this.process = __process__;
     if (typeof result == 'undefined' && result !== null) {
       print('["ok"]');
     } else {
@@ -15,6 +25,8 @@
       }
     }
   } catch (err) {
+    this.process = __process__;
     print(JSON.stringify(['err', '' + err, err.stack]));
   }
+  __process__.exit(0);
 });

data/lib/execjs/support/v8_runner.js

@@ -0,0 +1,18 @@
+(function(program, execJS) { execJS(program) })(function() { #{source}
+}, function(program) {
+  var output;
+  try {
+    result = program();
+    if (typeof result == 'undefined' && result !== null) {
+      print('["ok"]');
+    } else {
+      try {
+        print(JSON.stringify(['ok', result]));
+      } catch (err) {
+        print(JSON.stringify(['err', '' + err, err.stack]));
+      }
+    }
+  } catch (err) {
+    print(JSON.stringify(['err', '' + err, err.stack]));
+  }
+});

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "2.5.0"
+  VERSION = "2.8.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: execjs
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Sam Stephenson
 - Josh Peek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -33,15 +33,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
+- MIT-LICENSE
 - README.md
 - lib/execjs.rb
 - lib/execjs/disabled_runtime.rb
 - lib/execjs/duktape_runtime.rb
 - lib/execjs/encoding.rb
 - lib/execjs/external_runtime.rb
+- lib/execjs/mini_racer_runtime.rb
 - lib/execjs/module.rb
-- lib/execjs/ruby_racer_runtime.rb
 - lib/execjs/ruby_rhino_runtime.rb
 - lib/execjs/runtime.rb
 - lib/execjs/runtimes.rb
@@ -50,12 +50,13 @@ files:
 - lib/execjs/support/json2.js
 - lib/execjs/support/node_runner.js
 - lib/execjs/support/spidermonkey_runner.js
+- lib/execjs/support/v8_runner.js
 - lib/execjs/version.rb
 homepage: https://github.com/rails/execjs
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,16 +64,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Run JavaScript code from Ruby
 test_files: []

data/lib/execjs/ruby_racer_runtime.rb

@@ -1,114 +0,0 @@
-require "execjs/runtime"
-
-module ExecJS
-  class RubyRacerRuntime < Runtime
-    class Context < Runtime::Context
-      def initialize(runtime, source = "")
-        source = encode(source)
-
-        lock do
-          @v8_context = ::V8::Context.new
-
-          begin
-            @v8_context.eval(source)
-          rescue ::V8::JSError => e
-            raise wrap_error(e)
-          end
-        end
-      end
-
-      def exec(source, options = {})
-        source = encode(source)
-
-        if /\S/ =~ source
-          eval "(function(){#{source}})()", options
-        end
-      end
-
-      def eval(source, options = {})
-        source = encode(source)
-
-        if /\S/ =~ source
-          lock do
-            begin
-              unbox @v8_context.eval("(#{source})")
-            rescue ::V8::JSError => e
-              raise wrap_error(e)
-            end
-          end
-        end
-      end
-
-      def call(properties, *args)
-        lock do
-          begin
-            unbox @v8_context.eval(properties).call(*args)
-          rescue ::V8::JSError => e
-            raise wrap_error(e)
-          end
-        end
-      end
-
-      def unbox(value)
-        case value
-        when ::V8::Function
-          nil
-        when ::V8::Array
-          value.map { |v| unbox(v) }
-        when ::V8::Object
-          value.inject({}) do |vs, (k, v)|
-            vs[k] = unbox(v) unless v.is_a?(::V8::Function)
-            vs
-          end
-        when String
-          value.force_encoding('UTF-8')
-        else
-          value
-        end
-      end
-
-      private
-        def lock
-          result, exception = nil, nil
-          V8::C::Locker() do
-            begin
-              result = yield
-            rescue Exception => e
-              exception = e
-            end
-          end
-
-          if exception
-            raise exception
-          else
-            result
-          end
-        end
-
-        def wrap_error(e)
-          error_class = e.value["name"] == "SyntaxError" ? RuntimeError : ProgramError
-
-          stack = e.value["stack"] || ""
-          stack = stack.split("\n")
-          stack.shift
-          stack = [e.message[/<eval>:\d+:\d+/, 0]].compact if stack.empty?
-          stack = stack.map { |line| line.sub(" at ", "").sub("<eval>", "(execjs)").strip }
-
-          error = error_class.new(e.value.to_s)
-          error.set_backtrace(stack + caller)
-          error
-        end
-    end
-
-    def name
-      "therubyracer (V8)"
-    end
-
-    def available?
-      require "v8"
-      true
-    rescue LoadError
-      false
-    end
-  end
-end