kotovalexarian-likes-github/execjs
1
0
Fork 0
mirror of https://github.com/rails/execjs synced 2023-03-27 23:21:20 -04:00
Code Releases Activity

Fix unboxing nested functions on RubyRhino

Browse source
This commit is contained in:
Sylvester Keil 2011-08-03 09:51:25 -05:00 committed by Joshua Peek
parent 8deaaf16a8
commit 6ffac45215
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/execjs/ruby_rhino_runtime.rb
View file

@ -42,14 +42,21 @@ module ExecJS
end end
def unbox(value) def unbox(value)
case value case value = ::Rhino::To.ruby(value)
when ::Rhino::NativeFunction when ::Rhino::NativeFunction
nil nil
when ::Rhino::NativeObject when ::Rhino::NativeObject
value.inject({}) do |vs, (k, v)| 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 vs
end end
when Array
value.map { |v| unbox(v) }
else else
value value
end end

2
test/test_runtime.rb
View file

@ -29,8 +29,10 @@ class TestRuntime < Test::Unit::TestCase
assert_equal 0, @runtime.eval("0") assert_equal 0, @runtime.eval("0")
assert_equal true, @runtime.eval("true") assert_equal true, @runtime.eval("true")
assert_equal [1, 2], @runtime.eval("[1, 2]") assert_equal [1, 2], @runtime.eval("[1, 2]")
assert_equal [1, nil], @runtime.eval("[1, function() {}]")
assert_equal "hello", @runtime.eval("'hello'") assert_equal "hello", @runtime.eval("'hello'")
assert_equal({"a"=>1,"b"=>2}, @runtime.eval("{a:1,b:2}")) assert_equal({"a"=>1,"b"=>2}, @runtime.eval("{a:1,b:2}"))
assert_equal({"a"=>true}, @runtime.eval("{a:true,b:function (){}}"))
assert_equal "café", @runtime.eval("'café'") assert_equal "café", @runtime.eval("'café'")
assert_equal "☃", @runtime.eval('"☃"') assert_equal "☃", @runtime.eval('"☃"')
assert_equal "\\", @runtime.eval('"\\\\"') assert_equal "\\", @runtime.eval('"\\\\"')