execjs 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021a19b46b741b3d85475f23e28ab2fcaa92f7fb
-  data.tar.gz: 7f284ac676523a23cff15992506f53e4538d0760
+  metadata.gz: b6c21deff91972c3dd78ad9cd59ac2b0c155aac7
+  data.tar.gz: bc434905c2f108e8e3a8a03b4c4acea3de19d481
 SHA512:
-  metadata.gz: c77ce889ab7f9e871bc56d22ab505b0d175500b8dfd987fec7ba099b1211bae1d933a3001937f9d9d2285f3bc9bcfae37c8c02670e0af2d89392273b454720c2
-  data.tar.gz: 59748635e20cbe379fe90e7ab229fa9ac3a563f472ea31ce676e03791b721734a1c30ce092a986ae60d522d38c1242dd7dc397025f70eda85494ca0d76f97d40
+  metadata.gz: 148ae528714f32a5c08728b48d24464a8f2a45ae8cae92dd5ac66b9b7e2618ca0236dcdcad4cec465298036e19cefec0fd533bed7cef198a5cc7daebf531227d
+  data.tar.gz: 76ad76dbcdb7cf54895e9d8137f9ecd2c9a7aee2c75b0704fe1afbfe6fa45ce7e3b42f69b1025be88c88ed9c41140bc11da123ff948085eae14fcc06cc66ecaf

data/lib/execjs/external_runtime.rb

@@ -1,4 +1,4 @@
-require "tempfile"
+require "tmpdir"
 require "execjs/runtime"
 
 module ExecJS
@@ -22,9 +22,13 @@ module ExecJS
       def exec(source, options = {})
         source = encode(source)
         source = "#{@source}\n#{source}" if @source
+        source = @runtime.compile_source(source)
 
-        compile_to_tempfile(source) do |file|
-          extract_result(@runtime.send(:exec_runtime, file.path))
+        tmpfile = write_to_tempfile(source)
+        begin
+          extract_result(@runtime.exec_runtime(tmpfile.path))
+        ensure
+          File.unlink(tmpfile)
         end
       end
 
@@ -33,28 +37,21 @@ module ExecJS
       end
 
       protected
-        def compile_to_tempfile(source)
-          tempfile = Tempfile.open(['execjs', '.js'])
-          tempfile.write compile(source)
-          tempfile.close
-          yield tempfile
-        ensure
-          tempfile.close!
+        # See Tempfile.create on Ruby 2.1
+        def create_tempfile(basename)
+          tmpfile = nil
+          Dir::Tmpname.create(basename) do |tmpname|
+            mode    = File::WRONLY | File::CREAT | File::EXCL
+            tmpfile = File.open(tmpname, mode, 0600)
+          end
+          tmpfile
         end
 
-        def compile(source)
-          @runtime.send(:runner_source).dup.tap do |output|
-            output.sub!('#{source}') do
-              source
-            end
-            output.sub!('#{encoded_source}') do
-              encoded_source = encode_unicode_codepoints(source)
-              ::JSON.generate("(function(){ #{encoded_source} })()", quirks_mode: true)
-            end
-            output.sub!('#{json2_source}') do
-              IO.read(ExecJS.root + "/support/json2.js")
-            end
-          end
+        def write_to_tempfile(contents)
+          tmpfile = create_tempfile(['execjs', 'js'])
+          tmpfile.write(contents)
+          tmpfile.close
+          tmpfile
         end
 
         def extract_result(output)
@@ -67,12 +64,6 @@ module ExecJS
             raise ProgramError, value
           end
         end
-
-        def encode_unicode_codepoints(str)
-          str.gsub(/[\u0080-\uffff]/) do |ch|
-            "\\u%04x" % ch.codepoints.to_a
-          end
-        end
     end
 
     attr_reader :name
@@ -84,6 +75,14 @@ module ExecJS
       @encoding    = options[:encoding]
       @deprecated  = !!options[:deprecated]
       @binary      = nil
+
+      @popen_options = {}
+      @popen_options[:external_encoding] = @encoding if @encoding
+      @popen_options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
+
+      if @runner_path
+        instance_eval generate_compile_method(@runner_path)
+      end
     end
 
     def available?
@@ -117,18 +116,44 @@ module ExecJS
       end
 
     protected
-      def runner_source
-        @runner_source ||= IO.read(@runner_path)
+      def generate_compile_method(path)
+        <<-RUBY
+        def compile_source(source)
+          <<-RUNNER
+          #{IO.read(path)}
+          RUNNER
+        end
+        RUBY
+      end
+
+      def json2_source
+        @json2_source ||= IO.read(ExecJS.root + "/support/json2.js")
+      end
+
+      def encode_source(source)
+        encoded_source = encode_unicode_codepoints(source)
+        ::JSON.generate("(function(){ #{encoded_source} })()", quirks_mode: true)
+      end
+
+      def encode_unicode_codepoints(str)
+        str.gsub(/[\u0080-\uffff]/) do |ch|
+          "\\u%04x" % ch.codepoints.to_a
+        end
       end
 
       def exec_runtime(filename)
-        output = sh(binary.split(' ') + [filename, {err: [:child, :out]}])
+        io = IO.popen(binary.split(' ') + [filename, {err: [:child, :out]}], @popen_options)
+        output = io.read
+        io.close
+
         if $?.success?
           output
         else
           raise RuntimeError, output
         end
       end
+      # Internally exposed for Context.
+      public :exec_runtime
 
       def which(command)
         Array(command).find do |name|
@@ -140,13 +165,5 @@ module ExecJS
           args ? "#{path} #{args}" : path
         end
       end
-
-      def sh(command)
-        output, options = nil, {}
-        options[:external_encoding] = @encoding if @encoding
-        options[:internal_encoding] = ::Encoding.default_internal || 'UTF-8'
-        IO.popen(command, options) { |f| output = f.read }
-        output
-      end
   end
 end

data/lib/execjs/support/jsc_runner.js

@@ -1,5 +1,5 @@
 (function(program, execJS) { execJS(program) })(function() {
-  return eval(#{encoded_source});
+  return eval(#{encode_source(source)});
 }, function(program) {
   var output;
   try {

data/lib/execjs/support/jscript_runner.js

@@ -1,5 +1,5 @@
 (function(program, execJS) { execJS(program) })(function() {
-  return eval(#{encoded_source});
+  return eval(#{encode_source(source)});
 }, function(program) {
   #{json2_source}
   var output, print = function(string) {

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: execjs
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake