infraruby-java 3.7.1 → 4.0.0

data/infraruby-java.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 	s.platform = "ruby"
 	s.name = "infraruby-java"
-	s.version = "3.7.1"
+	s.version = "4.0.0"
 	s.licenses = ["MIT"]
 	s.author = "InfraRuby Vision"
 	s.email = "rubygems@infraruby.com"
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 	s.description = "InfraRuby Java integration for Ruby interpreters"
 	s.extensions = ["ext/primitive/extconf.rb"]
 	s.files = Dir["**/*"]
-	s.add_runtime_dependency "infraruby-base", "~> 3.7"
-	s.add_development_dependency "infraruby-task", "~> 3.7"
+	s.add_runtime_dependency "infraruby-base", "~> 4.0"
+	s.add_development_dependency "infraruby-task", "~> 4.0"
 	s.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/infraruby-java.rb

@@ -2,4 +2,125 @@ require "infraruby-base"
 
 require "primitive/primitive"
 
+InfraRuby.if(RUBY_ENGINE == "ruby") {
+
+	module InfraRuby
+		module WithPackage
+			def __package(symbol, &block)
+				name = symbol.to_s
+				o = __get(name)
+				if o.nil?
+					o = JavaPackage.new
+					o.name = __join(name)
+					__set(name, o)
+				end
+				o.instance_eval(&block)
+				return
+			end
+		end
+
+		module WithClass
+			def __class(name, superclass, &block)
+				o = __get(name)
+				if o.nil?
+					o = Class.new(superclass)
+					o.extend(JavaClass)
+					o.name = __join(name)
+					__set(name, o)
+				end
+				o.module_eval(&block)
+				return
+			end
+
+			def __interface(name, &block)
+				o = __get(name)
+				if o.nil?
+					o = Module.new
+					o.extend(JavaClass)
+					o.name = __join(name)
+					__set(name, o)
+				end
+				o.module_eval(&block)
+				return
+			end
+		end
+
+		module JavaBase
+			include WithPackage
+
+			def __get(name)
+				return __send__(name)
+			rescue
+				return nil
+			end
+
+			def __set(name, o)
+				c = class << self ; self ; end
+				c.send(:define_method, name) { o }
+				return
+			end
+
+			def __join(name)
+				return name
+			end
+		end
+
+		class JavaPackage < BasicObject
+			include WithPackage
+			include WithClass
+
+			attr_accessor :name
+
+			def inspect
+				return @name
+			end
+
+			def nil?
+				return false
+			end
+
+			def __get(name)
+				return __send__(name)
+			rescue
+				return nil
+			end
+
+			def __set(name, o)
+				c = class << self ; self ; end
+				c.send(:define_method, name) { o }
+				return
+			end
+
+			def __join(name)
+				return "#{self.name}.#{name}"
+			end
+		end
+
+		module JavaClass
+			include WithClass
+			include JAVA::ClassMixin
+
+			def __get(name)
+				return const_get(name)
+			rescue
+				return nil
+			end
+
+			def __set(name, o)
+				const_set(name, o)
+				return
+			end
+
+			def __join(name)
+				return "#{self.name}::#{name}"
+			end
+		end
+	end
+
+	module JAVA
+		extend InfraRuby::JavaBase
+	end
+
+}
+
 InfraRuby.load_parent_library(__dir__)

data/ruby/Exception.rb

@@ -0,0 +1,45 @@
+class Exception
+	def is_a?(c)
+		if c == JAVA::java.lang.Throwable
+			return true
+		end
+		return super(c)
+	end
+
+	def getMessage
+		return message.to_j
+	end
+end
+
+InfraRuby.if(RUBY_ENGINE == "ruby") {
+
+	class << Exception
+		def ===(o)
+			if self == Exception
+				if o.class == JAVA::Exception
+					return false
+				end
+			end
+			return super(o)
+		end
+	end
+
+}
+
+InfraRuby.if(RUBY_ENGINE == "jruby") {
+
+	class << Exception
+		def ===(o)
+			if self == Exception
+				if o.class <= Java::java.lang.Throwable
+					path = Kernel.caller_locations.first.path
+					unless path.end_with?(".ir")
+						return true
+					end
+				end
+			end
+			return super(o)
+		end
+	end
+
+}

data/ruby/Float.rb

@@ -1,5 +1,5 @@
 class Float
-	def as_f
+	def as_ruby
 		return self
 	end
 

data/ruby/Integer.rb

@@ -1,5 +1,5 @@
 class Integer
-	def as_i
+	def as_ruby
 		return self
 	end
 

data/ruby/JAVA.rb

@@ -0,0 +1,115 @@
+InfraRuby.if(RUBY_ENGINE == "ruby") {
+
+	JAVA.module_eval do
+		__package(:java) {
+			__package(:lang) {
+				__class "Object", JAVA::BasicObject do
+					def equals(o)
+						return equal?(o)
+					end
+
+					def hashCode
+						return __id__.to_int32
+					end
+
+					def toString
+						return inspect.to_j
+					end
+				end
+
+				__class "Throwable", JAVA::java.lang.Object do
+					def initialize(message = nix)
+						super()
+						if message.nix?
+							@message = nil
+						else
+							@message = message
+						end
+						return
+					end
+
+					def toString
+						if @message.nil?
+							return self.class.toString
+						else
+							return "#{self.class}: #{@message}".j
+						end
+					end
+
+					def getMessage
+						return @message
+					end
+				end
+			}
+		}
+	end
+
+}
+
+JAVA::Value.class_eval do
+	def pretty_print(pp)
+		return
+	end
+end
+
+JAVA::java.lang.Object.class_eval do
+	def ===(o)
+		return equals(o)
+	end
+
+	def eql?(o)
+		return equals(o)
+	end
+
+	def hash
+		return hashCode.to_i
+	end
+
+	def to_s
+		return String.from_j(toString)
+	end
+end
+
+class << JAVA::java.lang.Object
+	def ===(o)
+		if self == JAVA::java.lang.Object
+			return true
+		end
+		return super(o)
+	end
+end
+
+InfraRuby.if(RUBY_ENGINE == "ruby") {
+
+	JAVA::java.lang.Throwable.class_eval do
+		def exception
+			return JAVA::Exception.new(self)
+		end
+	end
+
+}
+
+InfraRuby.if(RUBY_ENGINE == "jruby") {
+
+	JAVA::java.lang.Throwable.class_eval do
+		def exception
+			return self
+		end
+	end
+
+}
+
+class << JAVA::java.lang.Throwable
+	def ===(o)
+		if self == JAVA::java.lang.Throwable
+			if o.class <= Exception
+				return true
+			end
+		end
+		return super(o)
+	end
+
+	def exception(*args)
+		return new(*args).exception
+	end
+end

data/ruby/Kernel.rb

@@ -0,0 +1,6 @@
+module Kernel
+	def j_import(c)
+		Object.j_import(c)
+		return
+	end
+end

data/ruby/Module.rb

@@ -0,0 +1,6 @@
+class Module
+	def j_import(c)
+		const_set(c.name[/\w+$/], c)
+		return
+	end
+end

data/ruby/Object.rb

@@ -1,13 +1,20 @@
 class Object
+	def is_a?(c)
+		if c == JAVA::java.lang.Object
+			return true
+		end
+		return super(c)
+	end
+
 	def equals(o)
 		return eql?(o)
 	end
 
 	def hashCode
-		return hash
+		return hash.to_int32
 	end
 
 	def toString
-		return to_s
+		return to_s.to_j
 	end
 end

data/ruby/String.rb

@@ -1,22 +1,12 @@
 class String
 	class << self
-		alias_method :__from_java_bytes, :from_java_bytes
-
-		def from_java_bytes(m, encoding = nix)
-			s = __from_java_bytes(m)
-			unless encoding.nix?
-				s.force_encoding(encoding)
-			end
-			return s
-		end
-
-		alias_method :from_java_bytes_unsafe, :from_java_bytes
+		alias_method :from_j_bytes_unsafe, :from_j_bytes
 	end
 
-	alias_method :to_java_bytes_unsafe, :to_java_bytes
+	alias_method :to_j_bytes_unsafe, :to_j_bytes
 
-	def java
-		return to_java
+	def j
+		return to_j
 	end
 
 	def to_byte

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infraruby-java
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 4.0.0
 platform: ruby
 authors:
 - InfraRuby Vision
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infraruby-base
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: infraruby-task
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +68,13 @@ files:
 - lib/infraruby-java.rb
 - lib/primitive/primitive.jar
 - ruby/Boolean.rb
+- ruby/Exception.rb
 - ruby/FalseClass.rb
 - ruby/Float.rb
 - ruby/Integer.rb
-- ruby/Java.rb
-- ruby/Java/java.lang.String.rb
-- ruby/NilClass.rb
+- ruby/JAVA.rb
+- ruby/Kernel.rb
+- ruby/Module.rb
 - ruby/Object.rb
 - ruby/String.rb
 - ruby/TrueClass.rb
@@ -102,3 +103,4 @@ signing_key:
 specification_version: 4
 summary: InfraRuby Java integration for Ruby interpreters
 test_files: []
+has_rdoc: