jrubyfx 1.0.0-java → 1.1.0-java

data/lib/jrubyfx/part_imports.rb

@@ -73,6 +73,7 @@ module JRubyFX
           :value => ['ChangeListener']
         },
         :collections => ['FXCollections'],
+        :concurrent => %w[Worker Task Service],
         :event => %w[Event ActionEvent EventHandler],
         :fxml => ['Initializable', 'LoadException'],
         :geometry => %w[HorizontalDirection HPos Insets Orientation Pos Rectangle2D Side VerticalDirection VPos],
@@ -105,13 +106,24 @@ module JRubyFX
       }
     }
 
+    $WRITE_OUT << <<HERE
+    def const_missing(c)
+      if LOCAL_NAME_MAP.has_key? c
+        java_import(LOCAL_NAME_MAP[c])[0]
+      else
+        super
+      end
+    end
+
+HERE
+
     # Imports all the listed JavaFX classes
-    $WRITE_OUT << "java_import "
+    $WRITE_OUT << "LOCAL_NAME_MAP = { \n  "
     $WRITE_OUT << (JFX_CLASS_HIERARCHY.flat_tree_inject do |res, name, values|
         name = "#{name.to_s}."
         name = "" if name == "."
         res.concat(values.map{|i| "#{name}#{i}"})
-      end).map{|x| "'#{x}'"}.join(",")
-    $WRITE_OUT << "\njava_import 'java.lang.Void'"
+      end).map{|x| "#{x.split(".").last.to_sym.inspect} => #{x.inspect}"}.join(",\n  ")
+    $WRITE_OUT << "\n}\njava_import 'java.lang.Void'"
   end
 end

data/lib/jrubyfx/utils/common_converters.rb

@@ -169,11 +169,11 @@ module JRubyFX
       ENUM_CACHE = {}
 
       # Store enum mapping overrides
-      ENUM_OVERRIDES = {Java::javafxAnimation::PathTransition::OrientationType => {:orthogonal_to_tangent => :orthogonal},
-        Java::javafxSceneEffect::BlendMode => {:src_over => :over, :src_atop => :atop, :color_dodge => :dodge, :color_burn => :burn},
-        Java::javafxSceneControl::ContentDisplay => {:graphic_only => :graphic, :text_only => :text},
-        Java::javafxSceneEffect::BlurType => {:one_pass_box => [:one, :one_pass], :two_pass_box => [:two, :two_pass], :three_pass_box => [:three, :three_pass]},
-        Java::javafxStage::Modality => {:window_modal => :window, :application_modal => [:application, :app]}}
+      ENUM_OVERRIDES = {Java::JavafxAnimation::PathTransition::OrientationType => {:orthogonal_to_tangent => :orthogonal},
+        Java::JavafxSceneEffect::BlendMode => {:src_over => :over, :src_atop => :atop, :color_dodge => :dodge, :color_burn => :burn},
+        Java::JavafxSceneControl::ContentDisplay => {:graphic_only => :graphic, :text_only => :text},
+        Java::JavafxSceneEffect::BlurType => {:one_pass_box => [:one, :one_pass], :two_pass_box => [:two, :two_pass], :three_pass_box => [:three, :three_pass]},
+        Java::JavafxStage::Modality => {:window_modal => :window, :application_modal => [:application, :app]}}
 
       # sets the given overrides for the given class/enum
       def self.set_overrides_for(enum_class,ovr)

data/lib/jrubyfx/version.rb

@@ -1,4 +1,4 @@
 module JRubyFX
   # Current gem version. Used in rake task.
-  VERSION='1.0.0'
+  VERSION='1.1.0'
 end

data/lib/jrubyfx_tasks.rb

@@ -34,7 +34,7 @@ module JRubyFX
     # corrupt or an older version, set force to true to delete and re-download
     def download_jruby(jruby_version, force=false)
       dist = "#{ENV['HOME']}/.jruby-jar"
-      unless force || (File.exists?("#{dist}/jruby-complete.jar") && File.size("#{dist}/jruby-complete.jar") > 0)
+      unless force || (File.exists?("#{dist}/jruby-complete-#{jruby_version}.jar") && File.size("#{dist}/jruby-complete-#{jruby_version}.jar") > 0)
         mkdir_p dist
         base_dir = Dir.pwd
         cd dist
@@ -63,11 +63,11 @@ module JRubyFX
       mkdir_p target
 
       #copy jruby jar file in, along with script and our rb files
-      cp "#{ENV['HOME']}/.jruby-jar/jruby-complete.jar", "#{target}/#{output_jar}"
+      cp "#{ENV['HOME']}/.jruby-jar/jruby-complete-#{opts[:version] || JRUBY_VERSION}.jar", "#{target}/#{output_jar}"
 
       #copy source in
       FileList[src].each do |iv_srv|
-        cp iv_srv, "#{target}/#{File.basename(iv_srv)}" if (main_script == nil || main_script != iv_srv) && opts[:file_filter].call(iv_srv)
+        cp_r iv_srv, "#{target}/#{File.basename(iv_srv)}" if (main_script == nil || main_script != iv_srv) && opts[:file_filter].call(iv_srv)
       end
       cp main_script, "#{target}/jar-bootstrap.rb" unless main_script == nil
 
@@ -83,10 +83,22 @@ module JRubyFX
       FileList["#{File.dirname(__FILE__)}/*"].each do |librb|
         cp_r librb, target
       end
-      
+
+      fxml_loader_path = nil
+      # this will find it if we are calling ruby -I whatever
+      $LOAD_PATH.each do |pth|
+        if File.exist? File.join(pth, "jrubyfx-fxmlloader.rb")
+          fxml_loader_path = pth
+          break
+        end
+      end
+
+      # default to gems
+      unless fxml_loader_path
+        fxml_loader_path = File.join(Gem::Specification.find_by_path('jrubyfx-fxmlloader').full_gem_path, "lib")
+      end
       #copy fxmlloader in
-      require 'jrubyfx-fxmlloader'
-      FileList["#{File.dirname(MAGIC_FXML_JAVAFX_JRUBYFX_FXMLLOADER__FILE__LOCATION_SUPER_SECRET)}/*"].each do |librb|
+      FileList["#{fxml_loader_path}/*"].each do |librb|
         cp_r librb, target
       end
 
@@ -116,7 +128,7 @@ module JRubyFX
 
       # the native bundling uses ant
       require "ant"
-      
+
       output_jar = Pathname.new(output_jar)
       dist_dir = output_jar.parent
       jar_name = File.basename(output_jar)
@@ -146,10 +158,16 @@ module JRubyFX
       rm FileList["#{full_build_dir}*.html","#{full_build_dir}*.jnlp"]
     end
 
+    def compile(cmdline)
+      require 'jrubyfx/compiler_app'
+      $JRUBYFX_AOT_COMPILING = true
+      CompilerApp.launch(*cmdline) # must use this to provide a full javafx environ so controls will build properly
+    end
+
 
     private
     def download(version_string) #:nodoc:
-      File.open("jruby-complete.jar","wb") do |f|
+      File.open("jruby-complete-#{version_string}.jar","wb") do |f|
         f.write(open("#{BASE_URL}/#{version_string}/jruby-complete-#{version_string}.jar").read)
       end
     end
@@ -158,5 +176,6 @@ module JRubyFX
     module_function :download_jruby
     module_function :native_bundles
     module_function :download
+    module_function :compile
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jrubyfx
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors:
 - Patrick Plenefisch
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,13 +52,13 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     none: false
   prerelease: false
   type: :runtime
@@ -71,51 +71,56 @@ email:
 executables:
 - jrubyfx-generator
 - jrubyfx-jarify
+- jrubyfx-compile
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/jrubyfx.rb
 - lib/jrubyfx_tasks.rb
-- lib/jrubyfx/controller.rb
-- lib/jrubyfx/application.rb
-- lib/jrubyfx/utils.rb
-- lib/jrubyfx/dsl.rb
 - lib/jrubyfx/part_imports.rb
+- lib/jrubyfx/dsl.rb
+- lib/jrubyfx/version.rb
+- lib/jrubyfx/controller.rb
+- lib/jrubyfx/compiler_app.rb
 - lib/jrubyfx/dsl_map.rb
 - lib/jrubyfx/imports.rb
 - lib/jrubyfx/module.rb
+- lib/jrubyfx/application.rb
 - lib/jrubyfx/java_fx_impl.rb
-- lib/jrubyfx/version.rb
-- lib/jrubyfx/utils/common_utils.rb
-- lib/jrubyfx/utils/common_converters.rb
-- lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
-- lib/jrubyfx/core_ext/observable_value.rb
-- lib/jrubyfx/core_ext/drag_event.rb
-- lib/jrubyfx/core_ext/exts.yml
-- lib/jrubyfx/core_ext/progress_indicator.rb
-- lib/jrubyfx/core_ext/effects.rb
-- lib/jrubyfx/core_ext/stage.rb
+- lib/jrubyfx/utils.rb
+- lib/jrubyfx/core_ext/grid_pane.rb
 - lib/jrubyfx/core_ext/media_player.rb
-- lib/jrubyfx/core_ext/pagination.rb
-- lib/jrubyfx/core_ext/xy_chart.rb
+- lib/jrubyfx/core_ext/duration.rb
+- lib/jrubyfx/core_ext/effects.rb
 - lib/jrubyfx/core_ext/transition.rb
-- lib/jrubyfx/core_ext/border_pane.rb
+- lib/jrubyfx/core_ext/pagination.rb
+- lib/jrubyfx/core_ext/drag_event.rb
+- lib/jrubyfx/core_ext/region.rb
 - lib/jrubyfx/core_ext/image_view.rb
 - lib/jrubyfx/core_ext/tree_view.rb
 - lib/jrubyfx/core_ext/table_view.rb
-- lib/jrubyfx/core_ext/region.rb
-- lib/jrubyfx/core_ext/timeline.rb
-- lib/jrubyfx/core_ext/duration.rb
+- lib/jrubyfx/core_ext/file_chooser.rb
+- lib/jrubyfx/core_ext/geometry.rb
+- lib/jrubyfx/core_ext/xy_chart.rb
 - lib/jrubyfx/core_ext/rotate.rb
+- lib/jrubyfx/core_ext/exts.yml
 - lib/jrubyfx/core_ext/column_constraints.rb
+- lib/jrubyfx/core_ext/observable_value.rb
 - lib/jrubyfx/core_ext/precompiled.rb
+- lib/jrubyfx/core_ext/stage.rb
+- lib/jrubyfx/core_ext/border_pane.rb
+- lib/jrubyfx/core_ext/timeline.rb
 - lib/jrubyfx/core_ext/radial_gradient.rb
+- lib/jrubyfx/core_ext/progress_indicator.rb
 - lib/jrubyfx/core_ext/path.rb
-- lib/jrubyfx/core_ext/file_chooser.rb
+- lib/jrubyfx/utils/common_utils.rb
+- lib/jrubyfx/utils/common_converters.rb
+- lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
 - LICENSE
 - README.md
 - bin/jrubyfx-generator
 - bin/jrubyfx-jarify
+- bin/jrubyfx-compile
 homepage: https://github.com/jruby/jrubyfx
 licenses: []
 post_install_message:
@@ -127,12 +132,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2
   none: false
 requirements: []
 rubyforge_project: jrubyfx