execjs 1.2.1 → 1.2.2

data/lib/execjs/external_runtime.rb

@@ -45,6 +45,10 @@ module ExecJS
             output.sub!('#{source}') do
               source
             end
+            output.sub!('#{encoded_source}') do
+              encoded_source = encode_unicode_codepoints(source)
+              MultiJson.encode("(function(){ #{encoded_source} })()")
+            end
             output.sub!('#{json2_source}') do
               IO.read(ExecJS.root + "/support/json2.js")
             end
@@ -55,10 +59,26 @@ module ExecJS
           status, value = output.empty? ? [] : MultiJson.decode(output)
           if status == "ok"
             value
+          elsif value == "SyntaxError: Parse error"
+            raise RuntimeError, value
           else
             raise ProgramError, value
           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.unpack("U*").map { |b|
+              b >= 128 ? "\\u%04x" % b : b.chr
+            }.join("")
+          end
+        end
     end
 
     attr_reader :name
@@ -69,7 +89,6 @@ module ExecJS
       @runner_path = options[:runner_path]
       @test_args   = options[:test_args]
       @test_match  = options[:test_match]
-      @conversion  = options[:conversion]
       @binary      = locate_binary
     end
 
@@ -98,7 +117,8 @@ module ExecJS
       end
 
       def exec_runtime(filename)
-        output = sh("#{@binary} #{filename} 2>&1")
+        output = nil
+        IO.popen("#{@binary} #{filename} 2>&1") { |f| output = f.read }
         if $?.success?
           output
         else
@@ -132,29 +152,5 @@ module ExecJS
         end
         nil
       end
-
-      if "".respond_to?(:force_encoding)
-        def sh(command)
-          output, options = nil, {}
-          options[:external_encoding] = 'UTF-8'
-          options[:internal_encoding] = @conversion[:from] if @conversion
-          IO.popen(command, options) { |f| output = f.read }
-          output.force_encoding(@conversion[:to]) if @conversion
-          output
-        end
-      else
-        require "iconv"
-
-        def sh(command)
-          output = nil
-          IO.popen(command) { |f| output = f.read }
-
-          if @conversion
-            Iconv.iconv(@conversion[:from], @conversion[:to], output).first
-          else
-            output
-          end
-        end
-      end
   end
 end

data/lib/execjs/johnson_runtime.rb

@@ -7,7 +7,7 @@ module ExecJS
       end
 
       def exec(source, options = {})
-        souce = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = source.encode('UTF-8') if source.respond_to?(:encode)
 
         if /\S/ =~ source
           eval "(function(){#{source}})()", options
@@ -15,7 +15,7 @@ module ExecJS
       end
 
       def eval(source, options = {})
-        souce = source.encode('UTF-8') if source.respond_to?(:encode)
+        source = source.encode('UTF-8') if source.respond_to?(:encode)
 
         if /\S/ =~ source
           unbox @runtime.evaluate("(#{source})")

data/lib/execjs/ruby_rhino_runtime.rb

@@ -42,14 +42,21 @@ module ExecJS
       end
 
       def unbox(value)
-        case value
+        case value = ::Rhino::To.ruby(value)
         when ::Rhino::NativeFunction
           nil
         when ::Rhino::NativeObject
           value.inject({}) do |vs, (k, v)|
-            vs[k] = unbox(v) unless v.is_a?(::Rhino::NativeFunction)
+            case v
+            when ::Rhino::NativeFunction, ::Rhino::J::Function
+              nil
+            else
+              vs[k] = unbox(v)
+            end
             vs
           end
+        when Array
+          value.map { |v| unbox(v) }
         else
           value
         end

data/lib/execjs/runtimes.rb

@@ -24,8 +24,7 @@ module ExecJS
     JavaScriptCore = ExternalRuntime.new(
       :name        => "JavaScriptCore",
       :command     => "/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc",
-      :runner_path => ExecJS.root + "/support/basic_runner.js",
-      :conversion => { :from => "ISO8859-1", :to => "UTF-8" }
+      :runner_path => ExecJS.root + "/support/jsc_runner.js"
     )
 
     SpiderMonkey = Spidermonkey = ExternalRuntime.new(

data/lib/execjs/version.rb

@@ -1,3 +1,3 @@
 module ExecJS
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,113 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: execjs
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
+version: !ruby/object:Gem::Version
+  version: 1.2.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sam Stephenson
 - Josh Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70354656032380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: johnson
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70354656032380
+- !ruby/object:Gem::Dependency
+  name: johnson
+  requirement: &70354656031960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mustang
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70354656031960
+- !ruby/object:Gem::Dependency
+  name: mustang
+  requirement: &70354656031500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70354656031500
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70354656031080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70354656031080
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: &70354656030660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: therubyrhino
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70354656030660
+- !ruby/object:Gem::Dependency
+  name: therubyrhino
+  requirement: &70354656030240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: "    ExecJS lets you run JavaScript code from Ruby.\n"
-email: 
+  prerelease: false
+  version_requirements: *70354656030240
+description: ! '    ExecJS lets you run JavaScript code from Ruby.
+
+'
+email:
 - sstephenson@gmail.com
 - josh@joshpeek.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/execjs.rb
 - lib/execjs/external_runtime.rb
 - lib/execjs/johnson_runtime.rb
@@ -124,37 +104,28 @@ files:
 - lib/execjs/support/which.bat
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: https://github.com/sstephenson/execjs
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Run JavaScript code from Ruby
 test_files: []
-