therubyrhino 1.72.7 → 1.72.8

data/.gitignore

@@ -3,3 +3,4 @@ doc
 *.gem
 .rvmrc
 .bundle
+Gemfile.lock

data/History.txt

@@ -1,6 +1,5 @@
-=== 1.72.7
-* N major enhancements:
-* N minor enhancements:
+=== 1.72.8 2011-06-26
+* fix passing of options hash to ruby.
 
 === 1.72.6 2009-11-30
 * 2 major enhancements:
@@ -17,7 +16,7 @@
   * automatically wrap/unwrap ruby and javascript arrays
   * automatically convert ruby method objects and Proc objects into javascript functions
   * Make functions defined in javascript callable from ruby
-  
+
 === 1.72.3 2009-11-11
 * 4 major enhancements:
   * greatly simplified interface to context by unifying context and scope

data/lib/rhino/context.rb

@@ -31,7 +31,7 @@ module Rhino
 #   end
 #
 # == Notes
-# While there are many similarities between Rhino::Context and Java::OrgMozillaJavascript::Context, they are not
+# While there are many similarities between Rhino::Context and Java::org.mozilla.javascript.Context, they are not
 # the same thing and should not be confused.
 
   class Context
@@ -150,7 +150,7 @@ module Rhino
 
   end
 
-  class IOReader < Java::JavaIo::Reader #:nodoc:
+  class IOReader < java.io.Reader #:nodoc:
 
     def initialize(io)
       @io = io
@@ -162,14 +162,14 @@ module Rhino
         if str.nil?
           return -1
         else
-          jstring = Java::JavaLang::String.new(str)
+          jstring = java.lang.String.new(str)
           for i in 0 .. jstring.length - 1
             charbuffer[i + offset] = jstring.charAt(i)
           end
           return jstring.length
         end
       rescue StandardError => e
-        raise Java::JavaIo::IOException.new, "Failed reading from ruby IO object"
+        raise java.io.IOException.new, "Failed reading from ruby IO object"
       end
     end
   end

data/lib/rhino/ruby_object.rb

@@ -21,9 +21,7 @@ module Rhino
     end
     
     def getIds()
-      puts "getIds()"
-      require 'java'
-      @ruby.public_methods(false).map {|m| m.gsub(/(.)_(.)/) {::JavaLang::String.new("#{$1}#{$2.upcase}")}}.tap {|ids| puts "ids: #{ids.inspect}"}.to_java
+      @ruby.public_methods(false).map {|m| m.gsub(/(.)_(.)/) {java.lang.String.new("#{$1}#{$2.upcase}")}}.to_java
     end
         
     def to_s
@@ -62,4 +60,4 @@ module Rhino
       
     end
   end
-end
+end

data/lib/rhino/version.rb

@@ -1,4 +1,4 @@
 
 module Rhino
-  VERSION = "1.72.7"
+  VERSION = "1.72.8"
 end

data/lib/rhino/wormhole.rb

@@ -20,6 +20,7 @@ module Rhino
       when String,Numeric       then object
       when TrueClass,FalseClass then object
       when Array                then J::NativeArray.new(object.to_java)
+      when Hash                 then ruby_hash_to_native(object)
       when Proc,Method          then RubyFunction.new(object)
       when NativeObject         then object.j      
       when J::Scriptable        then object
@@ -30,7 +31,17 @@ module Rhino
     def array(native)
       native.length.times.map {|i| ruby(native.get(i,native))}
     end
+
+    def ruby_hash_to_native(ruby_object)
+      native_object = NativeObject.new
+
+      ruby_object.each_pair do |k, v|
+        native_object[k] = v
+      end
+
+      native_object.j
+		end
     
-    module_function :ruby, :javascript, :array
+    module_function :ruby, :javascript, :array, :ruby_hash_to_native
   end
 end

data/spec/rhino/wormhole_spec.rb

@@ -53,7 +53,7 @@ describe Rhino::To do
     it "it unwraps wrapped java objects" do
       Context.open do |cx|
         scope = cx.scope
-        Java::JavaLang::String.new("Hello World").tap do |str|
+        java.lang.String.new("Hello World").tap do |str|
           J::NativeJavaObject.new(scope.j, str, str.getClass()).tap do |o|
             To.ruby(o).should == "Hello World"
           end
@@ -97,6 +97,13 @@ describe Rhino::To do
         a.get(3,a).should be(4)
       end
     end
+
+    it "converts ruby hashes into native objects" do
+      To.javascript({ :bare => true }).tap do |h|
+        h.should be_kind_of(J::NativeObject)
+        h.get("bare", h).should be(true)
+      end
+    end
     
     it "converts procs and methods into native functions" do
       to(lambda {|lhs,rhs| lhs * rhs}).tap do |f|
@@ -132,4 +139,4 @@ describe Rhino::To do
   def to(object)
     To.javascript(object)
   end
-end
+end

data/therubyrhino.gemspec

@@ -16,4 +16,5 @@ Gem::Specification.new do |s|
   s.summary = %q{Embed the Rhino JavaScript interpreter into JRuby}
 
   s.add_development_dependency "rspec"
+  s.add_development_dependency "jruby-openssl"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: therubyrhino
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 1
-    - 72
-    - 7
-  version: 1.72.7
+  prerelease: 
+  version: 1.72.8
 platform: ruby
 authors: 
   - Charles Lowell
@@ -14,21 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -06:00
+date: 2011-06-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
     version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
     requirement: *id001
     prerelease: false
     type: :development
+  - !ruby/object:Gem::Dependency 
+    name: jruby-openssl
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    requirement: *id002
+    prerelease: false
+    type: :development
 description: Call javascript code and manipulate javascript objects from ruby. Call ruby code and manipulate ruby objects from javascript.
 email: cowboyd@thefrontside.net
 executables: []
@@ -41,7 +47,6 @@ files:
   - .gitignore
   - .gitmodules
   - Gemfile
-  - Gemfile.lock
   - History.txt
   - README.rdoc
   - Rakefile
@@ -74,23 +79,27 @@ rdoc_options: []
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 requirements: []
 
 rubyforge_project: therubyrhino
-rubygems_version: 1.3.6
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Embed the Rhino JavaScript interpreter into JRuby

data/Gemfile.lock

@@ -1,16 +0,0 @@
-PATH
-  remote: .
-  specs:
-    therubyrhino (1.72.7)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rspec (1.3.0)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  rspec
-  therubyrhino!