execjs 1.3.0 → 1.3.1

data/lib/execjs/external_runtime.rb

@@ -1,3 +1,4 @@
+require "multi_json"
 require "shellwords"
 require "tempfile"
 
@@ -15,7 +16,7 @@ module ExecJS
         source = source.encode('UTF-8') if source.respond_to?(:encode)
 
         if /\S/ =~ source
-          exec("return eval(#{MultiJson.encode("(#{source})")})")
+          exec("return eval(#{json_encode("(#{source})")})")
         end
       end
 
@@ -29,7 +30,7 @@ module ExecJS
       end
 
       def call(identifier, *args)
-        eval "#{identifier}.apply(this, #{MultiJson.encode(args)})"
+        eval "#{identifier}.apply(this, #{json_encode(args)})"
       end
 
       protected
@@ -49,7 +50,7 @@ module ExecJS
             end
             output.sub!('#{encoded_source}') do
               encoded_source = encode_unicode_codepoints(source)
-              MultiJson.encode("(function(){ #{encoded_source} })()")
+              json_encode("(function(){ #{encoded_source} })()")
             end
             output.sub!('#{json2_source}') do
               IO.read(ExecJS.root + "/support/json2.js")
@@ -58,7 +59,7 @@ module ExecJS
         end
 
         def extract_result(output)
-          status, value = output.empty? ? [] : MultiJson.decode(output)
+          status, value = output.empty? ? [] : json_decode(output)
           if status == "ok"
             value
           elsif value =~ /SyntaxError:/
@@ -83,6 +84,26 @@ module ExecJS
             end
           end
         end
+
+        if MultiJson.respond_to?(:load)
+          def json_decode(obj)
+            MultiJson.load(obj)
+          end
+        else
+          def json_decode(obj)
+          MultiJson.decode(obj)
+          end
+        end
+
+        if MultiJson.respond_to?(:dump)
+          def json_encode(obj)
+            MultiJson.dump(obj)
+          end
+        else
+          def json_encode(obj)
+            MultiJson.encode(obj)
+          end
+        end
     end
 
     attr_reader :name
@@ -112,7 +133,6 @@ module ExecJS
     end
 
     def available?
-      require "multi_json"
       binary ? true : false
     end
 

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: execjs
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 -08:00
-default_executable: 
+date: 2012-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -132,7 +131,6 @@ files:
 - lib/execjs/support/spidermonkey_runner.js
 - lib/execjs/version.rb
 - lib/execjs.rb
-has_rdoc: true
 homepage: https://github.com/sstephenson/execjs
 licenses: []
 
@@ -162,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby