jtor-stdlib 0.1.0-java → 0.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fdfc6074c7499532f2e3dd014930bba384aede
-  data.tar.gz: fdf32a96588e40df135d24c36155d7c673c872f2
+  metadata.gz: 30f6a9eaeea71b4b9ed16ebf62ea7c995ed5b6f0
+  data.tar.gz: 510159c2e64ef1cbc76635a7fba3c204bc143361
 SHA512:
-  metadata.gz: 894a61cbb2d23e7b24d7aa98323fdeee47fe09526951b2fdaa850855bc7f0aa599958599bc6b8cb2791dc45557c9d4a2c6134f66e1ac36256edff093d9ef40d4
-  data.tar.gz: f1e5f839f16d855fbcf19d59aae44305a082247e1f9b047e9950a84d269da78f1bd080b472ffd57d6ccf9fa72be3e04b7c9e85d998c6f704577f3087912241ba
+  metadata.gz: 32fc80c2e1a9cd631845d8104e33d15b8360b60e36cee35ffca6f6b687116dc26f5736d242bf0120e577199465cd31361279de43ec24c2e35234634fdb970292
+  data.tar.gz: d187b0b8837f0e94729d9f2c61fd4495c99c65a504d442c283a4b66b4de9c331e58410dcd60de054ac2e62bc7683ea0f12e75a667612c2d9b6cd456b08f3e329

data/lib/jtor-stdlib/base.rb

@@ -1,44 +1,42 @@
 module Jtor
   module StdLib
-    class Base
+    module Base
       @@_lookup = {}
 
-      class << self
-        # Method overloading is not a ruby thing, so we implement a pseudo-lookup
-        # mechanism for method based on the type/count of their args
-        def add_java_method(name, param_types, &block)
-          add_method_to_lookup(name, param_types, &block)
-          unless method_defined?(name)
-            define_method(name) { |*args| self.class.lookup(name, *args) }
-          end
+      # Method overloading is not a ruby thing, so we implement a pseudo-lookup
+      # mechanism for method based on the type/count of their args
+      def add_java_method(name, param_types, &block)
+        add_method_to_lookup(name, param_types, &block)
+        unless method_defined?(name)
+          define_method(name) { |*args| self.class.lookup(name, *args) }
         end
+      end
 
-        def lookup(name, *args)
-          if @@_lookup[name]
-            @@_lookup[name].each do |param_types, method|
-              # NOTE: This is an oversimplification of the way Java determines
-              # which method to invoke. I may work further into this later (see
-              # http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12)
-              next unless params_match(param_types, args)
-              return method.call(*args)
-            end
+      def lookup(name, *args)
+        if @@_lookup[name]
+          @@_lookup[name].each do |param_types, method|
+            # NOTE: This is an oversimplification of the way Java determines
+            # which method to invoke. I may work further into this later (see
+            # http://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.12)
+            next unless params_match(param_types, args)
+            return method.call(*args)
           end
-          method_missing(name, *args)
         end
+        method_missing(name, *args)
+      end
 
-        def params_match(types, values)
-          # TODO: Handle var args (...)
-          types.each_with_index do |type, index|
-            value = values[index]
-            return false unless value.is_a?(type) || value.to_java.is_a?(type)
-          end
-          true
+      def params_match(types, values)
+        # TODO: Handle var args (...)
+        types.each_with_index do |type, index|
+          value = values[index]
+          return false unless value.is_a?(type) || value.to_java.is_a?(type)
         end
+        true
+      end
 
-        def add_method_to_lookup(name, param_types, &block)
-          @@_lookup[name] ||= {}
-          @@_lookup[name][param_types] = block
-        end
+      def add_method_to_lookup(name, param_types, &block)
+        @@_lookup[name] ||= {}
+        @@_lookup[name][param_types] = block
       end
     end
   end

data/lib/jtor-stdlib/jtor_import.rb

@@ -1,6 +1,13 @@
-def jtor_import(import_string)
-  require import_string.split('.').join('/')
-rescue LoadError
-  # :O `eval` 3spooky5me
-  java_import eval(import_string)
+module Jtor
+  module Imports
+    def jtor_import(import_string)
+      packages = import_string.split('.')
+      path = File.join(packages[0..-2], "#{packages.last}.rb")
+      Dir[path].each { |p| require File.expand_path(p) }
+    rescue LoadError
+      java_import import_string
+    end
+  end
 end
+
+include Jtor::Imports

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jtor-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: java
 authors:
 - Alejandro Rodríguez