therubyrhino 1.72.4-jruby → 1.72.5-jruby

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.72.5 2009-11-12
+* 2 major enhancements:
+  * evaluate javascript with a ruby object as it's scope using Context#open(:with => object)
+  * add eval_js() method to Object to evaluate in the context of that object
+
 === 1.72.4 2009-11-12
 * 3 major enhancements:
   * automatically wrap/unwrap ruby and javascript arrays

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/rhino/context.rb
 lib/rhino/java.rb
 lib/rhino/native_function.rb
 lib/rhino/native_object.rb
+lib/rhino/object.rb
 lib/rhino/rhino-1.7R2.jar
 lib/rhino/ruby_function.rb
 lib/rhino/ruby_object.rb

data/README.rdoc

@@ -17,18 +17,40 @@ Embed the Mozilla Rhino Javascript interpreter into Ruby
 1. Ruby Objects goes into Javascript
 1. Our shark's in the Javascript!
 
+  require 'rhino'
+  
 # evaluate some simple javascript
-
-  Rhino::Context.open do |context|
-    context.eval("7 * 6") #=> 42
-  end
-
+  eval_js "7 * 6" #=> 42
+  
 # evaluate a ruby function from javascript
   
   Rhino::Context.open do |context|
     context["say"] = lambda {|word, times| word * times}
     context.eval("say("Hello", 3)") #=> HelloHelloHello
   end
+  
+# embed a ruby object into your javascript environment
+
+  class MyMath
+    def plus(lhs, rhs)
+      lhs + rhs
+    end
+  end
+
+  Rhino::Context.open do |context|
+    context["math"] = MyMath.new
+    context.eval("math.plus(20,22)") #=> 42
+  end
+  
+# make a ruby object *be* your javascript environment
+  math = MyMath.new
+  Rhino::Context.open(:with => math) do |context|
+    context.eval("plus(20,22)") #=> 42
+  end
+  
+  #or the equivalent
+  
+  math.eval_js("plus(20,22)")
 
 # Configure your embedding setup
 

data/lib/rhino.rb

@@ -3,8 +3,9 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 module Rhino
-  VERSION = '1.72.4'
+  VERSION = '1.72.5'
   require 'rhino/java'
+  require 'rhino/object'
   require 'rhino/context'
   require 'rhino/wormhole'
   require 'rhino/ruby_object'

data/lib/rhino/context.rb

@@ -15,10 +15,16 @@ module Rhino
     
     def initialize(native, options) #:nodoc:
       @native = native
-      @scope = NativeObject.new(@native.initStandardObjects(nil, options[:sealed] == true))
+      @global = NativeObject.new(@native.initStandardObjects(nil, options[:sealed] == true))
+      if with = options[:with]
+        @scope = To.javascript(with)
+        @scope.setParentScope(@global.j)
+      else
+        @scope = @global
+      end
       unless options[:java]
         for package in ["Packages", "java", "org", "com"]
-          @scope.j.delete(package)
+          @global.j.delete(package)
         end
       end      
     end
@@ -34,7 +40,9 @@ module Rhino
     def eval(str)
       str = str.to_s
       begin
-        To.ruby @native.evaluateString(@scope.j, str, "<eval>", 1, nil)
+        scope = To.javascript(@scope)
+        result = @native.evaluateString(scope, str, "<eval>", 1, nil)
+        To.ruby result
       rescue J::RhinoException => e
         raise Rhino::RhinoError, e
       end

data/lib/rhino/object.rb

@@ -0,0 +1,8 @@
+
+class Object
+  def eval_js(source, options = {})
+    Rhino::Context.open(options.merge(:with => self)) do |cxt|
+      cxt.eval(source)
+    end
+  end
+end

data/lib/rhino/ruby_object.rb

@@ -20,6 +20,10 @@ module Rhino
       Prototype::Generic
     end
     
+    def getIds()
+      @ruby.public_methods(false).map {|m| m.gsub(/(.)_(.)/) {"#{$1}#{$2.upcase}"}}.to_java
+    end
+        
     def to_s
       "[Native #{@ruby.class.name}]"
     end
@@ -31,6 +35,9 @@ module Rhino
             
       def get(name, start)
         robject = To.ruby(start)
+        if name == "toString" 
+          return RubyFunction.new(lambda { "[Ruby #{robject.class.name}]"})
+        end
         rb_name = name.gsub(/([a-z])([A-Z])/) {"#{$1}_#{$2.downcase}"}
         if (robject.public_methods(false).include?(rb_name)) 
           method = robject.method(rb_name)
@@ -44,8 +51,9 @@ module Rhino
         rb_name = name.gsub(/([a-z])([A-Z])/) {"#{$1}_#{$2.downcase}"}
         To.ruby(start).public_methods(false).respond_to?(rb_name) ? true : super(name,start)
       end
+            
+      Generic = new
       
-      Generic = new                        
     end
   end
 end

data/lib/rhino/wormhole.rb

@@ -27,7 +27,7 @@ module Rhino
     end
     
     def array(native)
-      native.length.times.map {|i| native.get(i,native)}        
+      native.length.times.map {|i| native.get(i,native)}
     end
     
     module_function :ruby, :javascript, :array

data/spec/rhino/context_spec.rb

@@ -71,6 +71,42 @@ describe Rhino::Context do
     end
   end
   
+  it "can eval javascript with a given ruby object as the scope." do
+    # pending
+    scope = Class.new.class_eval do
+      def plus(lhs, rhs)
+        lhs + rhs
+      end
+      
+      def minus(lhs, rhs)
+        lhs - rhs
+      end
+      
+      new
+    end
+    
+    Context.open(:with => scope) do |cxt|
+      cxt.eval("plus(1,2)").should == 3
+      cxt.eval("minus(10, 20)").should == -10
+      cxt.eval("this").should be(scope)
+    end    
+  end
+  
+  it "extends object to allow for the arbitrary execution of javascript with any object as the scope" do
+    Class.new.class_eval do
+      
+      def initialize
+        @lhs = 5
+      end
+      
+      def timesfive(rhs)
+        @lhs * rhs     
+      end
+      
+      new.eval_js("timesfive(6)").should == 30
+    end
+  end
+  
   it "can limit the number of instructions that are executed in the context" do
     lambda {
       Context.open do |cxt|

data/spec/rhino/ruby_object_spec.rb

@@ -37,7 +37,23 @@ describe Rhino::RubyObject do
     eval("o.to_s").should be_nil
   end
   
-  it "translated camel case properties are enumerated by default, but perl case are not"
+  it "translated camel case properties are enumerated by default, but perl case are not" do
+    class_eval do
+      def foo_bar
+      end
+      
+      def baz_bang        
+      end      
+    end
+    pending "why the hell isn't the return value of getIds() being respected?!?"
+    eval(<<-EOJS).should == ["fooBar,bazBang"]
+    var names = [];
+    for (var p in o) {
+      names.push(p);
+    }
+    names;
+    EOJS
+  end
   
   it "will see a method that appears after the wrapper was first created" do
     Rhino::Context.open do |cxt|
@@ -52,11 +68,13 @@ describe Rhino::RubyObject do
     end
   end
   
-  it "allows you to specify which methods should be treated as properties"
+  it "treats ruby methods that have an arity of 0 as javascript properties by default"
   
+  it "will call ruby accesssor function when setting a property from javascript"  
   
   def eval(str)
     Rhino::Context.open do |cxt|
+      cxt['puts'] = lambda {|o| puts o.inspect}
       cxt['o'] = @instance
       cxt.eval(str)
     end

data/therubyrhino.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{therubyrhino}
-  s.version = "1.72.4"
+  s.version = "1.72.5"
   s.platform = %q{jruby}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Charles Lowell"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2009-11-13}
   s.description = %q{Embed the Mozilla Rhino Javascript interpreter into Ruby}
   s.email = ["cowboyd@thefrontside.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: therubyrhino
 version: !ruby/object:Gem::Version 
-  version: 1.72.4
+  version: 1.72.5
 platform: jruby
 authors: 
   - Charles Lowell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -42,6 +42,7 @@ files:
   - lib/rhino/java.rb
   - lib/rhino/native_function.rb
   - lib/rhino/native_object.rb
+  - lib/rhino/object.rb
   - lib/rhino/rhino-1.7R2.jar
   - lib/rhino/ruby_function.rb
   - lib/rhino/ruby_object.rb