jtor-stdlib 0.1.4-java → 0.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788765015218496bf8ce81d2ed3838276ac4d3ae
-  data.tar.gz: 9fdc417d377720e73b8e422b738b55a8ae7aa8ee
+  metadata.gz: 71f904b093af11de537085c6b58792914df1adcc
+  data.tar.gz: 1d0c3b4522f450b4bbd91d5e3e4119e3e9be7af2
 SHA512:
-  metadata.gz: 5fb439909e96c479f34295bd0cd9aa8809ed0ed668387ac7359c31016297ddc4887a3ba132b151300ecd33ed25fae9abdd0a29a12cf3cd001665e12fff086281
-  data.tar.gz: 3fd35e1e3689304d0bb4c6f371a3541c81da6f34a4559ae6e2c05398d635e3896e0ce53d7de1da341fd55a11b8757224beac7844b5dbea2a76d8524185b7f09a
+  metadata.gz: 8baf987a374bc4600e2ef34fecd9e3b2f2f3be8f58659ef56b4e4aff3b728336d7882842c9836f87ca9a3856df74cd30aafa4d1d1743eefc333431f31af60256
+  data.tar.gz: f6a4436cd522220c6a6108bd6186d271bd9379a2b9aea06887d50f9c9c74e57b44342cac94aeaf0527b47cb0fa7b7075e5f9c1be460ae1b2de935b42e9ea38a3

data/lib/jtor-stdlib/base.rb

@@ -5,6 +5,23 @@ module Jtor
         base.extend(ClassMethods)
       end
 
+      def initialize(*args)
+        method, constructor_call = self.class.lookup(:initialize, *args)
+        # I really tried to avoid using eval fellows, but JRuby is very fixed
+        # on `super` being called here first than anything, and it wouldn't
+        # accept a `proc` calling `initialize` on `sup`, so this will have
+        # to do for now.
+        if method
+          eval(constructor_call)
+          instance_exec(*args, &method)
+        else
+          super
+        end
+        self.class._initializers.each do |initializer|
+          instance_exec(*args, &initializer)
+        end
+      end
+
       def sup
         @_sup ||= SuperObject.new(self)
       end
@@ -22,6 +39,15 @@ module Jtor
           @_constructor_calls ||= {}
         end
 
+        def _initializers
+          @initializers ||= []
+        end
+
+        # For field initializers
+        def add_java_initializer(&block)
+          _initializers << block
+        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)
@@ -44,18 +70,7 @@ module Jtor
 
         def add_java_constructor(param_types, constructor_call = nil, &block)
           add_method_to_lookup(_lookup_table, :initialize, param_types, &block)
-          previously_defined = _constructor_calls.any?
           _constructor_calls[param_types] = constructor_call
-          return if previously_defined
-          define_method(:initialize) do |*args|
-            method, constructor_call = self.class.lookup(:initialize, *args)
-            # I really tried to avoid using eval fellows, but JRuby is very fixed
-            # on `super` being called here first than anything, and it wouldn't
-            # accept a `proc` calling `initialize` on `sup`, so this will have
-            # to do for now.
-            eval(constructor_call) #if constructor_call
-            instance_exec(*args, &method)
-          end
         end
 
         def lookup(name, *args)

data/lib/jtor-stdlib/jtor_import.rb

@@ -5,7 +5,10 @@ module Jtor
       path = File.join(packages[0..-2], "#{packages.last}.rb")
       paths = Dir[path]
       if paths.any?
-        paths.each { |p| require File.expand_path(p) }
+        # Our loading model exposes ourselves to loading child classes when
+        # loading their parents, so we rescue those errors and ignore them
+        # (when the child gets loaded everything will be fine).
+        paths.each { |p| require File.expand_path(p) rescue (NameError; nil) }
       else
         java_import import_string
       end

metadata

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