execjs 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa9a93a77554f102fc5a3e16c26d5b305c573ffb
-  data.tar.gz: 072920c3b99406ac62c0e6aec41a03ef62ecbf31
+  metadata.gz: 021a19b46b741b3d85475f23e28ab2fcaa92f7fb
+  data.tar.gz: 7f284ac676523a23cff15992506f53e4538d0760
 SHA512:
-  metadata.gz: 8f1a9db146000f618fb57bc2af26b2da6e0f6073fa783b9d6984fb00040254a0ef67b6227eb687010a231488a1529801fd22cd8b76974a822606db6da43a4945
-  data.tar.gz: 6615b7125a6c6c3e8bd0b436a2d033090d9248db4c63972d1228b673dac43fcf130f93f5c01bd49f1077ba0a28bc4d0f24f2528674f7f7a905409769eb0a2511
+  metadata.gz: c77ce889ab7f9e871bc56d22ab505b0d175500b8dfd987fec7ba099b1211bae1d933a3001937f9d9d2285f3bc9bcfae37c8c02670e0af2d89392273b454720c2
+  data.tar.gz: 59748635e20cbe379fe90e7ab229fa9ac3a563f472ea31ce676e03791b721734a1c30ce092a986ae60d522d38c1242dd7dc397025f70eda85494ca0d76f97d40

data/LICENSE

@@ -1,5 +1,5 @@
-Copyright (c) 2013 Sam Stephenson
-Copyright (c) 2013 Josh Peek
+Copyright (c) 2014 Sam Stephenson
+Copyright (c) 2014 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

@@ -17,26 +17,44 @@ ExecJS supports these runtimes:
 
 A short example:
 
-    require "execjs"
-    ExecJS.eval "'red yellow blue'.split(' ')"
-    # => ["red", "yellow", "blue"]
+``` ruby
+require "execjs"
+ExecJS.eval "'red yellow blue'.split(' ')"
+# => ["red", "yellow", "blue"]
+```
 
 A longer example, demonstrating how to invoke the CoffeeScript compiler:
 
-    require "execjs"
-    require "open-uri"
-    source = open("http://jashkenas.github.com/coffee-script/extras/coffee-script.js").read
+``` ruby
+require "execjs"
+require "open-uri"
+source = open("http://coffeescript.org/extras/coffee-script.js").read
 
-    context = ExecJS.compile(source)
-    context.call("CoffeeScript.compile", "square = (x) -> x * x", :bare => true)
-    # => "var square;\nsquare = function(x) {\n  return x * x;\n};"
+context = ExecJS.compile(source)
+context.call("CoffeeScript.compile", "square = (x) -> x * x", bare: true)
+# => "var square;\nsquare = function(x) {\n  return x * x;\n};"
+```
 
 # Installation
 
-    $ gem install execjs
+```
+$ gem install execjs
+```
+
+
+# FAQ
+
+**Why can't I use CommonJS `require()` inside ExecJS?**
+
+ExecJS provides a lowest common denominator interface to any JavaScript runtime.
+Use ExecJS when it doesn't matter which JavaScript interpreter your code runs
+in. If you want to access the Node API, you should check another library like
+[commonjs.rb](https://github.com/cowboyd/commonjs.rb) designed to provide a
+consistent interface.
+
 
 # License
 
-Copyright (c) 2013 Sam Stephenson and Josh Peek.
+Copyright (c) 2014 Sam Stephenson and Josh Peek.
 
 Released under the MIT license. See `LICENSE` for details.

data/lib/execjs/encoding.rb

@@ -1,32 +1,25 @@
 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')
+    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')
+          unless data.valid_encoding?
+            raise ::Encoding::UndefinedConversionError, "Could not encode ASCII-8BIT data #{string.dump} as UTF-8"
           end
-          data
-        end
-      else
-        def encode(string)
-          string.encode('UTF-8')
+        else
+          data = string.encode('UTF-8')
         end
+        data
       end
     else
-      # Define no-op on 1.8
       def encode(string)
-        string
+        string.encode('UTF-8')
       end
     end
   end

data/lib/execjs/external_runtime.rb

@@ -1,4 +1,3 @@
-require "shellwords"
 require "tempfile"
 require "execjs/runtime"
 
@@ -16,7 +15,7 @@ module ExecJS
         source = encode(source)
 
         if /\S/ =~ source
-          exec("return eval(#{::JSON.generate("(#{source})", :quirks_mode => true)})")
+          exec("return eval(#{::JSON.generate("(#{source})", quirks_mode: true)})")
         end
       end
 
@@ -50,7 +49,7 @@ module ExecJS
             end
             output.sub!('#{encoded_source}') do
               encoded_source = encode_unicode_codepoints(source)
-              ::JSON.generate("(function(){ #{encoded_source} })()", :quirks_mode => true)
+              ::JSON.generate("(function(){ #{encoded_source} })()", quirks_mode: true)
             end
             output.sub!('#{json2_source}') do
               IO.read(ExecJS.root + "/support/json2.js")
@@ -59,7 +58,7 @@ module ExecJS
         end
 
         def extract_result(output)
-          status, value = output.empty? ? [] : ::JSON.parse(output, :create_additions => false)
+          status, value = output.empty? ? [] : ::JSON.parse(output, create_additions: false)
           if status == "ok"
             value
           elsif value =~ /SyntaxError:/
@@ -69,19 +68,9 @@ module ExecJS
           end
         end
 
-        if "".respond_to?(:codepoints)
-          def encode_unicode_codepoints(str)
-            str.gsub(/[\u0080-\uffff]/) do |ch|
-              "\\u%04x" % ch.codepoints.to_a
-            end
-          end
-        else
-          def encode_unicode_codepoints(str)
-            str.gsub(/([\xC0-\xDF][\x80-\xBF]|
-                       [\xE0-\xEF][\x80-\xBF]{2}|
-                       [\xF0-\xF7][\x80-\xBF]{3})+/nx) do |ch|
-              "\\u%04x" % ch.unpack("U*")
-            end
+        def encode_unicode_codepoints(str)
+          str.gsub(/[\u0080-\uffff]/) do |ch|
+            "\\u%04x" % ch.codepoints.to_a
           end
         end
     end
@@ -92,8 +81,6 @@ module ExecJS
       @name        = options[:name]
       @command     = options[:command]
       @runner_path = options[:runner_path]
-      @test_args   = options[:test_args]
-      @test_match  = options[:test_match]
       @encoding    = options[:encoding]
       @deprecated  = !!options[:deprecated]
       @binary      = nil
@@ -110,7 +97,7 @@ module ExecJS
 
     private
       def binary
-        @binary ||= locate_binary
+        @binary ||= which(@command)
       end
 
       def locate_executable(cmd)
@@ -135,7 +122,7 @@ module ExecJS
       end
 
       def exec_runtime(filename)
-        output = sh("#{shell_escape(*(binary.split(' ') << filename))} 2>&1")
+        output = sh(binary.split(' ') + [filename, {err: [:child, :out]}])
         if $?.success?
           output
         else
@@ -143,17 +130,6 @@ module ExecJS
         end
       end
 
-      def locate_binary
-        if binary = which(@command)
-          if @test_args
-            output = `#{shell_escape(binary, @test_args)} 2>&1`
-            binary if output.match(@test_match)
-          else
-            binary
-          end
-        end
-      end
-
       def which(command)
         Array(command).find do |name|
           name, args = name.split(/\s+/, 2)
@@ -165,41 +141,12 @@ module ExecJS
         end
       end
 
-      if "".respond_to?(:force_encoding)
-        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
-      else
-        require "iconv"
-
-        def sh(command)
-          output = nil
-          IO.popen(command) { |f| output = f.read }
-
-          if @encoding
-            Iconv.new('UTF-8', @encoding).iconv(output)
-          else
-            output
-          end
-        end
-      end
-
-      if ExecJS.windows?
-        def shell_escape(*args)
-          # see http://technet.microsoft.com/en-us/library/cc723564.aspx#XSLTsection123121120120
-          args.map { |arg|
-            arg = %Q("#{arg.gsub('"','""')}") if arg.match(/[&|()<>^ "]/)
-            arg
-          }.join(" ")
-        end
-      else
-        def shell_escape(*args)
-          Shellwords.join(args)
-        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/johnson_runtime.rb

@@ -47,9 +47,7 @@ module ExecJS
         when function?(value)
           nil
         when string?(value)
-          value.respond_to?(:force_encoding) ?
-            value.force_encoding('UTF-8') :
-            value
+          value.force_encoding('UTF-8')
         when array?(value)
           value.map { |v| unbox(v) }
         when object?(value)

data/lib/execjs/ruby_racer_runtime.rb

@@ -64,9 +64,7 @@ module ExecJS
             vs
           end
         when String
-          value.respond_to?(:force_encoding) ?
-            value.force_encoding('UTF-8') :
-            value
+          value.force_encoding('UTF-8')
         else
           value
         end

data/lib/execjs/runtimes.rb

@@ -19,30 +19,30 @@ module ExecJS
     Mustang = MustangRuntime.new
 
     Node = ExternalRuntime.new(
-      :name        => "Node.js (V8)",
-      :command     => ["nodejs", "node"],
-      :runner_path => ExecJS.root + "/support/node_runner.js",
-      :encoding    => 'UTF-8'
+      name:        "Node.js (V8)",
+      command:     ["nodejs", "node"],
+      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",
-      :runner_path => ExecJS.root + "/support/jsc_runner.js"
+      name:        "JavaScriptCore",
+      command:     "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
+      runner_path: ExecJS.root + "/support/jsc_runner.js"
     )
 
     SpiderMonkey = Spidermonkey = ExternalRuntime.new(
-      :name        => "SpiderMonkey",
-      :command     => "js",
-      :runner_path => ExecJS.root + "/support/spidermonkey_runner.js",
-      :deprecated  => true
+      name:        "SpiderMonkey",
+      command:     "js",
+      runner_path: ExecJS.root + "/support/spidermonkey_runner.js",
+      deprecated:  true
     )
 
     JScript = ExternalRuntime.new(
-      :name        => "JScript",
-      :command     => "cscript //E:jscript //Nologo //U",
-      :runner_path => ExecJS.root + "/support/jscript_runner.js",
-      :encoding    => 'UTF-16LE' # CScript with //U returns UTF-16LE
+      name:        "JScript",
+      command:     "cscript //E:jscript //Nologo //U",
+      runner_path: ExecJS.root + "/support/jscript_runner.js",
+      encoding:    'UTF-16LE' # CScript with //U returns UTF-16LE
     )
 
 

data/lib/execjs/version.rb

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

metadata

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