add support for embedding ruby instances

History.txt

@@ -3,6 +3,7 @@
   * easily manipulate javascript objects from ruby (NativeObject)
   * make NativeObject Enumerable
   * to_h and to_json for NativeObject
+  * embed ruby instances and call methods from javascript
 
 === 1.72.0 2009-09-24
 

lib/rhino.rb

@@ -3,9 +3,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 module Rhino
-  VERSION = '1.72.0'
+  VERSION = '1.72.1'
   require 'rhino/java'
   require 'rhino/context'
   require 'rhino/wormhole'
   require 'rhino/native_object'
+  require 'rhino/ruby_object'
 end

lib/rhino/context.rb

@@ -52,12 +52,17 @@ module Rhino
   end
     
   class Function < J::BaseFunction
-    def initialize(&block)
-      @block = block
+    def initialize(callable = nil, &block)
+      super()
+      @block = callable || block
     end
     
     def call(cxt, scope, this, args)
-      @block.call(*args)
+      @block.call(*(args.map {|a| To.ruby(a)}))
+    end
+    
+    def to_json(*args)
+      '"[Native Function]"'
     end
   end
     
@@ -67,8 +72,8 @@ module Rhino
       @native = native
     end
     
-    def message
-      @native.message
+    def message      
+      @native.cause.details
     end
     
     def javascript_backtrace

lib/rhino/native_object.rb

@@ -13,7 +13,7 @@ module Rhino
     end
     
     def []=(k,v)
-      @j.put(k.to_s,@j,v)
+      @j.put(k.to_s,@j,To.javascript(v))
     end
     
     def each

lib/rhino/ruby_object.rb

@@ -0,0 +1,35 @@
+
+module Rhino
+  class RubyObject < J::ScriptableObject
+    include J::Wrapper
+    
+    def initialize(object)
+      super()
+      @ruby = object
+    end
+    
+    def unwrap
+      @ruby
+    end
+    
+    def getClassName()
+      @ruby.class.name
+    end
+    
+    def getPrototype()
+      @prototype ||= J::NativeObject.new.tap do |p|
+        p.put("toString", p, Function.new {to_s})
+        for name in @ruby.public_methods(false).reject {|m| m == 'initialize'}
+          method = @ruby.method(name)                    
+          p.put(name.gsub(/_(\w)/) {$1.upcase}, p, Function.new(method) {})
+        end
+      end
+    end
+    
+    def to_s
+      "[Native #{@ruby.class.name}]"
+    end
+    
+    alias_method :prototype, :getPrototype
+  end
+end

lib/rhino/wormhole.rb

@@ -5,9 +5,10 @@ module Rhino
     
     def ruby(object)
       case object
-      when *JS_UNDEF      then nil
-      when J::Wrapper     then object.unwrap
-      when J::Scriptable  then NativeObject.new(object)
+      when *JS_UNDEF          then nil
+      when Rhino::RubyObject  then object
+      when J::Wrapper         then object.unwrap
+      when J::Scriptable      then NativeObject.new(object)
       else  object
       end        
     end
@@ -16,6 +17,7 @@ module Rhino
       case object
       when NativeObject then object.j
       when J::Scriptable then object
+      else RubyObject.new(object)
       end
     end
     

spec/rhino/wormhole_spec.rb

@@ -51,6 +51,24 @@ describe Rhino::To do
         To.javascript(o).should be(o)
       end
     end
-    
+
+    it "creates a prototype for the object based on its class" do
+      Class.new.tap do |c|
+        c.class_eval do
+          def foo(one, two)
+            "1: #{one}, 2: #{two}"
+          end
+        end
+
+        To.javascript(c.new).tap do |o|
+          o.should be_kind_of(RubyObject)
+          o.prototype.tap do |p|
+            p.should_not be_nil
+            p.get("foo", p).should_not be_nil
+            p.get("toString", p).should_not be_nil
+          end
+        end
+      end
+    end    
   end
 end