execjs 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37eb677376847f2bfe3abf9691b02bb7ac413eb
-  data.tar.gz: 0e44ddbc91755ce29cf30dc4f4bf775afde29f89
+  metadata.gz: fde57c2c3957d81859359cf4c369f608a644551b
+  data.tar.gz: e28210a8d96d0c21c113f3cf7be58f763f42fb87
 SHA512:
-  metadata.gz: 5d1e57303da891beb4ed994fe590bfa1480785edebc12c6babd02075a0dbf8051d1e2f73089aea28e3da70c41f3702fd0c65cbd76fd8d316d63cabbfbe974279
-  data.tar.gz: 2e12d615380795a7ea63b519f9c3ae556536fc72aa4856e56a5cb467167c941cd78c3e03e87eaf943c753f527957f29a79277fc81a01e81ab05a0fde2c9def01
+  metadata.gz: 8ee2ee0d5407bda28d4351701bbcfd0a9b39bbb0de18843c78c258cd89ee39ee73fbfb9ec2f1172b43027c2ffcf8320d9471dc98de80c3c9cfb4804be8dac8f5
+  data.tar.gz: ac21345c3a7c2283d70f65f86f7b4577f694d184783d5d93e4d1a72d93fe3fa95c6e31612728efeb503f8216d8f4dfd7558f77cf9e94440b62ed5dbf000cdffb

data/README.md

@@ -64,7 +64,7 @@ older stock runtimes like JSC on OSX and JScript on Windows may not. You should
 only count on ES3 features being available. Prefer feature checking these APIs
 rather than hard coding support for specific runtimes.
 
-**Can I ExecJS be used to sandbox scripts?**
+**Can ExecJS be used to sandbox scripts?**
 
 No, ExecJS shouldn't be used for any security related sandboxing. Since runtimes
 are automatically detected, each runtime has different sandboxing properties.

data/lib/execjs/external_runtime.rb

@@ -24,12 +24,12 @@ module ExecJS
 
       def exec(source, options = {})
         source = encode(source)
-        source = "#{@source}\n#{source}" if @source
+        source = "#{@source}\n#{source}" if @source != ""
         source = @runtime.compile_source(source)
 
         tmpfile = write_to_tempfile(source)
         begin
-          extract_result(@runtime.exec_runtime(tmpfile.path))
+          extract_result(@runtime.exec_runtime(tmpfile.path), tmpfile.path)
         ensure
           File.unlink(tmpfile)
         end
@@ -57,14 +57,25 @@ module ExecJS
           tmpfile
         end
 
-        def extract_result(output)
-          status, value = output.empty? ? [] : ::JSON.parse(output, create_additions: false)
+        def extract_result(output, filename)
+          status, value, stack = output.empty? ? [] : ::JSON.parse(output, create_additions: false)
           if status == "ok"
             value
-          elsif value =~ /SyntaxError:/
-            raise RuntimeError, value
           else
-            raise ProgramError, value
+            stack ||= ""
+            real_filename = File.realpath(filename)
+            stack = stack.split("\n").map do |line|
+              line.sub(" at ", "")
+                  .sub(real_filename, "(execjs)")
+                  .sub(filename, "(execjs)")
+                  .strip
+            end
+            stack.reject! { |line| ["eval code", "eval@[native code]"].include?(line) }
+            stack.shift unless stack[0].to_s.include?("(execjs)")
+            error_class = value =~ /SyntaxError:/ ? RuntimeError : ProgramError
+            error = error_class.new(value)
+            error.set_backtrace(stack + caller)
+            raise error
           end
         end
     end
@@ -158,7 +169,7 @@ module ExecJS
           if $?.success?
             output
           else
-            raise RuntimeError, output
+            raise exec_runtime_error(output)
           end
         end
 
@@ -181,7 +192,7 @@ module ExecJS
           if $?.success?
             output
           else
-            raise RuntimeError, output
+            raise exec_runtime_error(output)
           end
         end
       else
@@ -193,13 +204,22 @@ module ExecJS
           if $?.success?
             output
           else
-            raise RuntimeError, output
+            raise exec_runtime_error(output)
           end
         end
       end
       # Internally exposed for Context.
       public :exec_runtime
 
+      def exec_runtime_error(output)
+        error = RuntimeError.new(output)
+        lines = output.split("\n")
+        lineno = lines[0][/:(\d+)$/, 1] if lines[0]
+        lineno ||= 1
+        error.set_backtrace(["(execjs):#{lineno}"] + caller)
+        error
+      end
+
       def which(command)
         Array(command).find do |name|
           name, args = name.split(/\s+/, 2)

data/lib/execjs/ruby_racer_runtime.rb

@@ -12,11 +12,7 @@ module ExecJS
           begin
             @v8_context.eval(source)
           rescue ::V8::JSError => e
-            if e.value["name"] == "SyntaxError"
-              raise RuntimeError, e.value.to_s
-            else
-              raise ProgramError, e.value.to_s
-            end
+            raise wrap_error(e)
           end
         end
       end
@@ -37,11 +33,7 @@ module ExecJS
             begin
               unbox @v8_context.eval("(#{source})")
             rescue ::V8::JSError => e
-              if e.value["name"] == "SyntaxError"
-                raise RuntimeError, e.value.to_s
-              else
-                raise ProgramError, e.value.to_s
-              end
+              raise wrap_error(e)
             end
           end
         end
@@ -52,11 +44,7 @@ module ExecJS
           begin
             unbox @v8_context.eval(properties).call(*args)
           rescue ::V8::JSError => e
-            if e.value["name"] == "SyntaxError"
-              raise RuntimeError, e.value.to_s
-            else
-              raise ProgramError, e.value.to_s
-            end
+            raise wrap_error(e)
           end
         end
       end
@@ -96,6 +84,20 @@ module ExecJS
             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

data/lib/execjs/ruby_rhino_runtime.rb

@@ -10,7 +10,7 @@ module ExecJS
         fix_memory_limit! @rhino_context
         @rhino_context.eval(source)
       rescue Exception => e
-        reraise_error(e)
+        raise wrap_error(e)
       end
 
       def exec(source, options = {})
@@ -28,13 +28,13 @@ module ExecJS
           unbox @rhino_context.eval("(#{source})")
         end
       rescue Exception => e
-        reraise_error(e)
+        raise wrap_error(e)
       end
 
       def call(properties, *args)
         unbox @rhino_context.eval(properties).call(*args)
       rescue Exception => e
-        reraise_error(e)
+        raise wrap_error(e)
       end
 
       def unbox(value)
@@ -58,17 +58,18 @@ module ExecJS
         end
       end
 
-      def reraise_error(e)
-        case e
-        when ::Rhino::JSError
-          if e.message == "syntax error"
-            raise RuntimeError, e.message
-          else
-            raise ProgramError, e.message
-          end
-        else
-          raise e
-        end
+      def wrap_error(e)
+        return e unless e.is_a?(::Rhino::JSError)
+
+        error_class = e.message == "syntax error" ? RuntimeError : ProgramError
+
+        stack = e.backtrace
+        stack = stack.map { |line| line.sub(" at ", "").sub("<eval>", "(execjs)").strip }
+        stack.unshift("(execjs):1") if e.javascript_backtrace.empty?
+
+        error = error_class.new(e.value.to_s)
+        error.set_backtrace(stack)
+        error
       end
 
       private

data/lib/execjs/support/jsc_runner.js

@@ -9,10 +9,10 @@
       try {
         print(JSON.stringify(['ok', result]));
       } catch (err) {
-        print('["err"]');
+        print(JSON.stringify(['err', '' + err, err.stack]));
       }
     }
   } catch (err) {
-    print(JSON.stringify(['err', '' + err]));
+    print(JSON.stringify(['err', '' + err, err.stack]));
   }
 });

data/lib/execjs/support/jscript_runner.js

@@ -13,10 +13,10 @@
       try {
         print(JSON.stringify(['ok', result]));
       } catch (err) {
-        print('["err"]');
+        print(JSON.stringify(['err', err.name + ': ' + err.message, err.stack]));
       }
     }
   } catch (err) {
-    print(JSON.stringify(['err', err.name + ': ' + err.message]));
+    print(JSON.stringify(['err', err.name + ': ' + err.message, err.stack]));
   }
 });

data/lib/execjs/support/node_runner.js

@@ -11,10 +11,10 @@
       try {
         print(JSON.stringify(['ok', result]));
       } catch (err) {
-        print('["err"]');
+        print(JSON.stringify(['err', '' + err, err.stack]));
       }
     }
   } catch (err) {
-    print(JSON.stringify(['err', '' + err]));
+    print(JSON.stringify(['err', '' + err, err.stack]));
   }
 });

data/lib/execjs/support/spidermonkey_runner.js

@@ -9,10 +9,10 @@
       try {
         print(JSON.stringify(['ok', result]));
       } catch (err) {
-        print('["err"]');
+        print(JSON.stringify(['err', '' + err, err.stack]));
       }
     }
   } catch (err) {
-    print(JSON.stringify(['err', '' + err]));
+    print(JSON.stringify(['err', '' + err, err.stack]));
   }
 });

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: execjs
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Run JavaScript code from Ruby