jrubyfx-fxmlloader 0.3-java → 0.4-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6dba6126b3ed56424fa13ae880b4f8dda4aed7a5
+  data.tar.gz: 21a8be844a4f3d22b1c22462542d01330a856431
+SHA512:
+  metadata.gz: c1d0ed616f268fb7727a8bc29d21113d4dd003d86e321f10bda791506baee80d0f0568714418ccc876525866674fc08bfa8562ce96ff215356f1133cd0c10ea1
+  data.tar.gz: fa25ff79a1f5311cfa094d900ba057ca3607f7aaa62f03d4c68cadb29662e3e6a261b3ce96a3fbaa1efd627b5147c4a57b9071e26b3478afe14985ddc7091266

data/Rakefile

@@ -45,7 +45,7 @@ task :gem => :jar
 
 spec = Gem::Specification.new do |s|
   s.name = 'jrubyfx-fxmlloader'
-  s.version = '0.3'
+  s.version = '0.4'
   s.platform    = 'java'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README', 'LICENSE']
@@ -59,6 +59,7 @@ spec = Gem::Specification.new do |s|
   s.files = %w(LICENSE README Rakefile lib/FXMLLoader-j8.jar) + Dir.glob("{bin,lib,spec}/**/*")
   s.require_path = "lib"
   s.bindir = "bin"
+  s.license = "GPL-2.0-with-classpath-exception"
 end
 
 Gem::PackageTask.new(spec) do |p|
@@ -68,4 +69,4 @@ Gem::PackageTask.new(spec) do |p|
 end
 
 
-task :default => :gem
+task :default => :gem

data/lib/jrubyfx-fxmlloader.rb

@@ -79,10 +79,6 @@ javax.xml.stream.XMLStreamReader
 javax.xml.stream.util.StreamReaderDelegate
 
 com.sun.javafx.beans.IDProperty
-com.sun.javafx.fxml.LoadListener
-com.sun.javafx.fxml.ObservableListChangeEvent
-com.sun.javafx.fxml.ObservableMapChangeEvent
-com.sun.javafx.fxml.PropertyChangeEvent
 java.net.MalformedURLException
 java.security.AccessController
 java.security.PrivilegedAction
@@ -309,12 +305,15 @@ class FxmlLoader
 
     @script_engine = nil
 
-    $DEBUG_IT_FXML_RB = jit_info.should_jit?
+		difx = $DEBUG_IT_FXML_RB # TODO: hack to make this somewhat better at recursion
     # if we have it cached, use the jitted method
     if jit_info.compiled?
       begin
         return :dont_load if @jruby_ext[:dont_load]
-        return jit_info.__build_via_jit(@controller, @namespace, @jruby_ext)
+				$DEBUG_IT_FXML_RB = jit_info.should_jit?
+        res = jit_info.__build_via_jit(@controller, @namespace, @jruby_ext)
+				$DEBUG_IT_FXML_RB = difx # restore
+				return res
       rescue Exception, java.lang.Throwable
         puts "JIT compiled method for #{@location.to_s} FAILED with error:"
         puts $!
@@ -324,6 +323,8 @@ class FxmlLoader
         jit_info.decompile
       end
     end
+		
+    $DEBUG_IT_FXML_RB = jit_info.should_jit?
 
     begin
       xmlInputFactory = XMLInputFactory.newFactory
@@ -376,6 +377,7 @@ class FxmlLoader
     $RB_SCRIPT_ENGINE_MAPPINGS = {}
 
     @xmlStreamReader = nil
+		$DEBUG_IT_FXML_RB = difx # restore
     return @root
   end
 
@@ -663,8 +665,16 @@ class FxmlLoader
 
 	def loadTypeForPackage(packageName, className=nil)
 		packageName = (packageName + "." + className.gsub('.', '$')) if className
-    #TODO: fix for ruby stuff
-		return Java.java.lang.Class::forName(packageName, true, FXL::default_class_loader);
+    begin
+      return Java.java.lang.Class::forName(packageName, true, FXL::default_class_loader);
+    rescue ClassNotFoundException => ex
+      # probably ruby class
+      begin
+        return packageName.constantize_by(".")
+      rescue
+        raise ex # nope, not our issue anymore
+      end
+    end
   end
   def compareJFXVersions(rtVer, nsVer)
 
@@ -741,56 +751,6 @@ class FxmlLoader
   end
 end
 
-class String
-
-  # steal handy methods from activesupport
-  # Tries to find a constant with the name specified in the argument string.
-  #
-  # 'Module'.constantize # => Module
-  # 'Test::Unit'.constantize # => Test::Unit
-  #
-  # The name is assumed to be the one of a top-level constant, no matter
-  # whether it starts with "::" or not. No lexical context is taken into
-  # account:
-  #
-  # C = 'outside'
-  # module M
-  # C = 'inside'
-  # C # => 'inside'
-  # 'C'.constantize # => 'outside', same as ::C
-  # end
-  #
-  # NameError is raised when the name is not in CamelCase or the constant is
-  # unknown.
-  def constantize_by(splitter="::")
-    camel_cased_word = self
-    names = camel_cased_word.split(splitter)
-    names.shift if names.empty? || names.first.empty?
-
-    names.inject(Object) do |constant, name|
-      if constant == Object
-        constant.const_get(name)
-      else
-        candidate = constant.const_get(name)
-        next candidate if constant.const_defined?(name, false)
-        next candidate unless Object.const_defined?(name)
-
-        # Go down the ancestors to check it it's owned
-        # directly before we reach Object or the end of ancestors.
-        constant = constant.ancestors.inject do |const, ancestor|
-          break const if ancestor == Object
-          break ancestor if ancestor.const_defined?(name, false)
-          const
-        end
-
-        # owner is in Object, so raise
-        constant.const_get(name, false)
-      end
-    end
-  end
-end
-
-
 class SRDelegateClass < StreamReaderDelegate
   def getPrefix()
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx-fxmlloader
 version: !ruby/object:Gem::Version
-  version: '0.3'
-  prerelease:
+  version: '0.4'
 platform: java
 authors:
 - Patrick Plenefisch & JRubyFX team & Oracle
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies: []
 description: JRubyFX FxmlLoader gem bits
 email: simonpatp@gmail.com
@@ -24,15 +23,17 @@ files:
 - Rakefile
 - lib/FXMLLoader-j8.jar
 - lib/jrubyfx-fxmlloader.rb
-- lib/fxmlloader/j8_expression_value.rb
-- lib/fxmlloader/rrba.rb
-- lib/fxmlloader/value_elts.rb
-- lib/fxmlloader/fxml_jit_info.rb
 - lib/fxmlloader/elts.rb
+- lib/fxmlloader/fxml_jit_info.rb
+- lib/fxmlloader/j8_expression_value.rb
 - lib/fxmlloader/real_elts.rb
 - lib/fxmlloader/rorba.rb
+- lib/fxmlloader/rrba.rb
+- lib/fxmlloader/value_elts.rb
 homepage: https://github.com/byteit101/JRubyFX-FXMLLoader
-licenses: []
+licenses:
+- GPL-2.0-with-classpath-exception
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -42,17 +43,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: GPL'd JavaFX FXMLLoder class in Ruby for JRubyFX
 test_files: []