jruby-coercion 0.0.1-java → 0.0.2-java

data/lib/jruby-coercion.rb

@@ -5,13 +5,29 @@ require "java"
 module Jruby
   module Coercion
 
+    def self.native_type?(java_type)
+      java_type.class == Java::JavaClass
+    end
+
+    def self.ruby_type?(java_type)
+      java_type.class == Class
+    end
+
+    def self.alternative_class(java_type)
+      if native_type?(java_type)
+        return java_type.ruby_class
+      else
+        return java_type.java_class
+      end
+    end
+
     module Coercable
       def to_java(java_type = nil)
         return super if java_type.nil?
         converter = ::Jruby::Coercion::Registry.registry_converts_class_and_to?(self.class, java_type)
 
         if converter
-          return converter.call(self, java_type)
+          return converter.call(self)
         else
           super
         end
@@ -32,6 +48,9 @@ module Jruby
                                  ::Java::JavaUtilConcurrent::ConcurrentHashMap.new)
 
           ruby_type_converter[java_type] = callable
+          # Register alternative type java_class/ruby_class
+          ruby_type_converter[::Jruby::Coercion.alternative_class(java_type)] = callable 
+
           @converter_registry[ruby_type] = ruby_type_converter
         end
       end

data/lib/jruby-coercion/numeric.rb

@@ -5,27 +5,27 @@ class Numeric
 end
 
 # java.math.BigDecimal
-::Jruby::Coercion::Registry.register_converter(Numeric, java.math.BigDecimal) do |numeric, java_type|
-  java_type.new(numeric)
+::Jruby::Coercion::Registry.register_converter(Numeric, java.math.BigDecimal) do |numeric|
+  java.math.BigDecimal.new(numeric)
 end
 
-::Jruby::Coercion::Registry.register_converter(Integer, java.math.BigDecimal) do |integer, java_type|
-  java_type.new(integer)
+::Jruby::Coercion::Registry.register_converter(Integer, java.math.BigDecimal) do |integer|
+  java.math.BigDecimal.new(integer)
 end
 
-::Jruby::Coercion::Registry.register_converter(Fixnum, java.math.BigDecimal) do |fixnum, java_type|
-  java_type.new(fixnum)
+::Jruby::Coercion::Registry.register_converter(Fixnum, java.math.BigDecimal) do |fixnum|
+  java.math.BigDecimal.new(fixnum)
 end
 
 # java.math.BigInteger
-::Jruby::Coercion::Registry.register_converter(Numeric, java.math.BigInteger) do |numeric, java_type|
-  java_type.new("#{numeric}")
+::Jruby::Coercion::Registry.register_converter(Numeric, java.math.BigInteger) do |numeric|
+  java.math.BigInteger.new("#{numeric}")
 end
 
-::Jruby::Coercion::Registry.register_converter(Integer, java.math.BigInteger) do |integer, java_type|
-  java_type.new("#{integer}")
+::Jruby::Coercion::Registry.register_converter(Integer, java.math.BigInteger) do |integer|
+  java.math.BigInteger.new("#{integer}")
 end
 
-::Jruby::Coercion::Registry.register_converter(Fixnum, java.math.BigInteger) do |fixnum, java_type|
-  java_type.new("#{fixnum}")
+::Jruby::Coercion::Registry.register_converter(Fixnum, java.math.BigInteger) do |fixnum|
+  java.math.BigInteger.new("#{fixnum}")
 end

data/lib/jruby-coercion/version.rb

@@ -1,5 +1,5 @@
 module Jruby
   module Coercion
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-coercion
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease:
 platform: java
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake