bind-it 0.2.0 → 0.2.1

data/README.md

@@ -1,6 +1,6 @@
 **About**
   
-BindIt is a very simple tool to facilitate the creation of Java bindings in Ruby. It provides a simplified interface to load JARs and Java classes, and allows logging of JVM output to a text file. It also enhances the Rjb Java proxy with useful functions, such as internal iterators.
+BindIt is a very simple tool that allows to make Ruby bindings to Java packages that work both on JRuby and MRI platforms. It provides a simplified interface to load JARs and Java classes, and allows logging of JVM output to a text file.
 
 BindIt uses the Ruby-Java-Bridge (Rjb) to access Java objects. It runs on Ruby 1.9.2 and 1.9.3.
 

data/lib/bind-it.rb

@@ -1,7 +1,7 @@
 # BindIt is a tool to facilitate the creation of Java bindings in Ruby.
 module BindIt
 
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   require 'bind-it/binding'
 
 end

data/lib/bind-it/binding.rb

@@ -5,11 +5,18 @@ module BindIt
 
     VERSION = '0.0.1'
 
-    require 'rjb'
-    require 'bind-it/jar_loader'
-    require 'bind-it/proxy_decorator'
+    if RUBY_PLATFORM =~ /java/
+      require 'java'
+      # require 'bind-it/jruby_proxy'
+    else
+      require 'rjb'
+      require 'bind-it/rjb_proxy'
+    end
 
-    def self.extended(base)
+    require 'bind-it/jar_loader'
+    
+    
+   def self.extended(base)
       super(base)
       # Create configuration options.
       base.module_eval do
@@ -40,6 +47,8 @@ module BindIt
       end
     end
 
+    ######
+    
     # Load the default JARs and classes.
     def bind
       unless self.bound
@@ -83,13 +92,23 @@ module BindIt
       end
     end
     
+    protected
+    
     # Private function to load classes.
     # Doesn't check if initialized.
-    def load_klass(klass, base, name = nil)
+    def load_klass(klass, base, name=nil)
       base += '.' unless base == ''
+      fqcn = "#{base}#{klass}"
       name ||= klass
-      const_set(name.intern,
-      Rjb::import("#{base}#{klass}"))
+      if RUBY_PLATFORM =~ /java/
+        rb_class = java_import(fqcn)
+        if name != klass
+          const_set(name.intern, rb_class)
+        end
+      else
+        rb_class = Rjb::import(fqcn)
+        const_set(name.intern, rb_class)
+      end
     end
     
     # Utility function to CamelCase names.
@@ -101,4 +120,4 @@ module BindIt
     
   end
   
-end
+end

data/lib/bind-it/jar_loader.rb

@@ -13,34 +13,56 @@ module BindIt
     # Default configuration options.
     self.jvm_args = []
     self.log_file = nil
-      
-    # Load Rjb and create Java VM.
-    def self.init
-      ::Rjb::load(nil, self.jvm_args)
-      set_java_logging if self.log_file
+  
+    # Load a JAR through Jruby/Rjb.
+    def self.load(jar, path)
+      if !::File.readable?(path + jar)
+        raise "Could not find JAR file (looking in #{jar})."
+      end
+      if RUBY_PLATFORM =~ /java/
+        set_java_logging if self.log_file
+        load_jar_jruby(jar,path)
+      else
+        load_jar_rjb(jar,path)
+      end
     end
     
-    # Redirect the output of the JVM to log.
-    def self.set_java_logging
-      const_set(:System, Rjb::import('java.lang.System'))
-      const_set(:PrintStream, Rjb::import('java.io.PrintStream'))
-      const_set(:File2, Rjb::import('java.io.File'))
-      ps = PrintStream.new(File2.new(self.log_file))
-      ps.write(::Time.now.strftime("[%m/%d/%Y at %I:%M%p]\n\n"))
-      System.setOut(ps)
-      System.setErr(ps)
+    # Load a Jruby jar.
+    def self.load_jar_jruby(jar, path)
+      require path + jar
     end
     
-    # Load a JAR through Rjb.
-    def self.load(jar, path)
-      self.init unless ::Rjb::loaded?
+    # Laad an Rjb jar.
+    def self.load_jar_rjb(jar,path)
+      self.init_rjb unless ::Rjb::loaded?
       jar = path + jar
-      if !::File.readable?(jar)
-        raise "Could not find JAR file (looking in #{jar})."
-      end
       ::Rjb::add_jar(jar)
     end
     
+    # Load Rjb and create Java VM.
+    def self.init_rjb
+      ::Rjb::load(nil, self.jvm_args)
+      set_java_logging if self.log_file
+    end
+
+    # Redirect the output of the JVM to log.
+    def self.set_java_logging
+      system, print_stream, file = nil, nil, nil
+      if RUBY_PLATFORM =~ /java/
+        system = java.lang.System
+        print_stream = java.io.PrintStream
+        file = java.io.File
+      else
+        system = Rjb::import('java.lang.System')
+        print_stream = Rjb::import('java.io.PrintStream')
+        file = Rjb::import('java.io.File')
+      end
+      ps = print_stream.new(file.new(self.log_file))
+      ps.write(::Time.now.strftime("[%m/%d/%Y at %I:%M%p]\n\n"))
+      system.setOut(ps)
+      system.setErr(ps)
+    end
+
   end
   
-end
+end

data/lib/bind-it/{proxy_decorator.rb → rjb_proxy.rb}

@@ -1,13 +1,17 @@
-module BindIt
+module BindIt::RjbProxy
 
   # Modify the Rjb JavaProxy class to add our own 
   # methods to every proxied Java object.
   Rjb::Rjb_JavaProxy.class_eval do
 
     # Dynamically defined on all proxied Java objects.
-    # Shorthand for to_string defined by Java classes.
+    # Shorthand for toString() defined by Java classes.
     def to_s; to_string; end
-
+    
+    # Dynamically defined on all proxied Java objects.
+    # Shorthand for toArray() defined by Java classes.
+    def to_a; to_array; end
+    
     # Dynamically defined on all proxied Java iterators.
     # Provide Ruby-style iterators to wrap Java iterators.
     def each

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bind-it
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rjb
@@ -37,7 +37,7 @@ extra_rdoc_files: []
 files:
 - lib/bind-it/binding.rb
 - lib/bind-it/jar_loader.rb
-- lib/bind-it/proxy_decorator.rb
+- lib/bind-it/rjb_proxy.rb
 - lib/bind-it.rb
 - README.md
 - LICENSE
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BindIt is a tool to facilitate the creation of Java bindings in Ruby.