jrubyfx 0.9.2-java → 1.0.0-java

data/lib/jrubyfx/{jfx_imports.rb → part_imports.rb}

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 =end
 
-require 'jrubyfx/utils'
+require_relative 'utils'
 
 # Update load path to include the JavaFX runtime and fail nicely if we can't find it
 begin
@@ -31,9 +31,15 @@ begin
       jfx_path.gsub(/[\/\\][amdix345678_]+$/, "") # strip i386 or amd64 (including variants). TODO: ARM
     end
   end
-	# Java 8 and above has JavaFX as part of the normal distib, only require it if we are 7 or below
-  require 'jfxrt.jar' if ENV['JFX_DIR'] or ENV_JAVA["java.runtime.version"].match(/^1\.[0-7]{1}\..*/)
-  testit = Java.javafx.application.Application
+
+  # Java 8 (after ea-b75) and above has JavaFX as part of the normal distib, only require it if we are 7 or below
+  jre = ENV_JAVA["java.runtime.version"].match %r{^(?<version>(?<major>\d+)\.(?<minor>\d+))\.(?<patch>\d+)(_\d+)?-?(?<release>ea|u\d)?(-?b(?<build>\d+))?}
+  require 'jfxrt.jar' if ENV['JFX_DIR'] or
+    jre[:version].to_f < 1.8 or
+    (jre[:version].to_f == 1.8 and jre[:release] == 'ea' and jre[:build].to_i < 75)
+
+  # Attempt to load a javafx class
+  Java.javafx.application.Application
 rescue  LoadError, NameError
   puts "JavaFX runtime not found.  Please install Java 7u6 or newer or set environment variable JFX_DIR to the folder that contains jfxrt.jar "
   puts "If you have Java 7u6 or later, this is a bug. Please report to the issue tracker on github. Include your OS version, 32/64bit, and architecture (x86, ARM, PPC, etc)"
@@ -47,6 +53,7 @@ module JRubyFX
 
     # If something is missing, just java_import it in your code.
     # And then ask us to put it in this list
+    ###### IMPORTANT LINE ##### (see rakefile, this is a magic line, don't delete)
 
     ##
     # This is the list of all classes in JavaFX that most apps should care about.
@@ -61,7 +68,7 @@ module JRubyFX
         PauseTransition RotateTransition ScaleTransition SequentialTransition StrokeTransition Timeline Transition TranslateTransition],
         :application => ['Platform'],
         :beans => {
-          :property => ['SimpleDoubleProperty'],
+          :property => %w[SimpleBooleanProperty SimpleDoubleProperty SimpleFloatProperty SimpleIntegerProperty SimpleListProperty SimpleLongProperty SimpleMapProperty SimpleObjectProperty SimpleSetProperty SimpleStringProperty],
           #TODO: import more
           :value => ['ChangeListener']
         },
@@ -76,7 +83,7 @@ module JRubyFX
           PieChart ScatterChart StackedAreaChart StackedBarChart ValueAxis XYChart],
           :control => %w[Accordion Button Cell CheckBox CheckBoxTreeItem CheckMenuItem ChoiceBox ColorPicker ComboBox ContextMenu Hyperlink
           Label ListCell ListView Menu MenuBar MenuButton MenuItem Pagination PasswordField PopupControl ProgressBar ProgressIndicator RadioButton
-          RadioMenuItem ScrollBar ScrollPane Separator SeparatorMenuItem Slider SplitMenuButton SplitPane Tab TableView TableColumn TabPane TextArea
+          RadioMenuItem ScrollBar ScrollPane Separator SeparatorMenuItem Slider SplitMenuButton SplitPane Tab TableView TableCell TableColumn TabPane TextArea
           TextField TitledPane ToggleButton ToggleGroup ToolBar Tooltip TreeCell TreeItem TreeView ContentDisplay OverrunStyle SelectionMode],
           :effect => %w[Blend BlendMode Bloom BlurType BoxBlur ColorAdjust ColorInput DisplacementMap DropShadow GaussianBlur Glow ImageInput
           InnerShadow Lighting MotionBlur PerspectiveTransform Reflection SepiaTone Shadow],
@@ -99,11 +106,12 @@ module JRubyFX
     }
 
     # Imports all the listed JavaFX classes
-    java_import *(JFX_CLASS_HIERARCHY.flat_tree_inject do |res, name, values|
+    $WRITE_OUT << "java_import "
+    $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)
-    java_import 'java.lang.Void'
+      end).map{|x| "'#{x}'"}.join(",")
+    $WRITE_OUT << "\njava_import 'java.lang.Void'"
   end
 end

data/lib/jrubyfx/utils.rb

@@ -23,7 +23,7 @@ class Hash
   # call-seq:
   #   flat_tree_inject() {|results, key, value| block} => array
   #   flat_tree_inject(Hash) {|results, key, value| block} => hash
-  #   
+  #
   # Execute given block against all nodes in the hash tree, returning `results`.
   # Similar to Hash#each except goes into all sub-Hashes
   #
@@ -41,9 +41,9 @@ end
 class String
   # call-seq:
   #   snake_case() => string
-  #   
+  #
   # Converts a CamelCaseString to a snake_case_string
-  # 
+  #
   #   "JavaFX".snake_case #=> "java_fx"
   #
   def snake_case
@@ -53,4 +53,13 @@ class String
     tr("-", "_").
     downcase
   end
-end
+end
+
+module Enumerable
+  def map_find(&block)
+    m = {}
+    m[self.find do |i|
+      m[i] = block.call(i)
+    end]
+  end
+end

data/lib/jrubyfx/utils/common_converters.rb

@@ -26,7 +26,7 @@ module JRubyFX
 
       # argument converter method name suffix
       ARG_CONVERTER_SUFFIX = '_arg_converter'
-      
+
       # map of snake_cased colors to JavaFX Colors
       NAME_TO_COLORS = {
         'darkyellow' => Color.web('0xc0c000'),
@@ -44,7 +44,7 @@ module JRubyFX
           map.key?(value) ? map[value] : value
         end
       end
-      
+
       ##
       # Generate a converter for an enum of the given class
       def enum_converter(enum_class)
@@ -56,14 +56,14 @@ module JRubyFX
       ##
       # call-seq:
       #   animation_converter_for :property_name, ...
-      #   
+      #
       # Generates an animation adapter for the given properties so you can specify
       # transformations, etc with a hashmap of from, to values
       # === Examples
       #   animation_converter_for :value
-      #   
+      #
       #   ...
-      #   
+      #
       #   _my_type_(value: {0 => 360})
       #
       def animation_converter_for(*prop_names)
@@ -98,6 +98,7 @@ module JRubyFX
       # is useful for single var_args signatures.
       #
       def converter_for(method_name, *converters, &default)
+       # puts "[converter for #{self}, #{method_name}]"
         sheep = lambda do |direct, this, *values|
           converter = converters.find { |e| e.length == values.length }
           converter = Array.new(values.length, default) unless converter
@@ -157,32 +158,63 @@ module JRubyFX
             Insets.new(value)
           elsif value.is_a? Array
             # top/bottom, left/right
-            value = [value[0], value[1], value[0], value[1]] if value.size == 2 
+            value = [value[0], value[1], value[0], value[1]] if value.size == 2
             Insets.new(*value)
           else
             value
           end
         },
       }
-      
+
+      ENUM_CACHE = {}
+
       # Store enum mapping overrides
-      @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]}}
+
       # sets the given overrides for the given class/enum
       def self.set_overrides_for(enum_class,ovr)
-        @overrides[enum_class] = ovr
+        ENUM_OVERRIDES[enum_class] = ovr
       end
-      
+
       # Given a class, returns a hash of lowercase strings mapped to Java Enums
       def self.map_enums(enum_class)
-        res = enum_class.java_class.enum_constants.inject({}) {|res, i| res[i.to_s.downcase] = i; res }
-        (@overrides[enum_class]||[]).each do |oldk, newks|
+        res = Hash[enum_class.java_class.enum_constants.map {|i| [i.to_s.downcase, i] }]
+        (ENUM_OVERRIDES[enum_class]||[]).each do |oldk, newks|
           [newks].flatten.each do |newk|
             res[newk.to_s] = res[oldk.to_s]
           end
         end
         res
       end
+
+      def self.parse_ruby_symbols(const, enum)
+        ENUM_CACHE[enum] = JRubyFX::Utils::CommonConverters.map_enums(enum) if  ENUM_CACHE[enum] == nil
+        ENUM_CACHE[enum][const.to_s] || const
+      end
+
+      def self.convert_args(values, converters)
+        converter = converters.find { |e| e.length == values.length }
+        converter = Array.new(values.length) unless converter
+
+        # FIXME: Better error reporting on many things which can fail
+        i = 0
+        values = values.inject([]) do |s, value|
+          conv = converter[i]
+          if conv.kind_of? Proc
+            s << conv.call(value)
+          else
+            s << CONVERTERS[converter[i]].call(value)
+          end
+          i += 1
+          s
+        end
+        return values
+      end
     end
+
   end
 end

data/lib/jrubyfx/utils/common_utils.rb

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 =end
-require 'jrubyfx/utils/common_converters'
+require_relative 'common_converters'
 
 module JRubyFX
   # Several utilities that have no better place to go

data/lib/jrubyfx/version.rb

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

data/lib/jrubyfx_tasks.rb

@@ -19,7 +19,6 @@ limitations under the License.
 require 'open-uri'
 require 'rake'
 require 'tmpdir'
-require "ant"
 require "pathname"
 
 module JRubyFX
@@ -84,6 +83,12 @@ module JRubyFX
       FileList["#{File.dirname(__FILE__)}/*"].each do |librb|
         cp_r librb, target
       end
+      
+      #copy fxmlloader in
+      require 'jrubyfx-fxmlloader'
+      FileList["#{File.dirname(MAGIC_FXML_JAVAFX_JRUBYFX_FXMLLOADER__FILE__LOCATION_SUPER_SECRET)}/*"].each do |librb|
+        cp_r librb, target
+      end
 
       # edit the jar
       base_dir = Dir.pwd
@@ -108,6 +113,9 @@ module JRubyFX
       if ENV_JAVA["java.runtime.version"].match(/^1\.[0-7]{1}\..*/)
         raise "You must install JDK 8 to use the native-bundle packaging tools. You can still create an executable jar, though."
       end
+
+      # the native bundling uses ant
+      require "ant"
       
       output_jar = Pathname.new(output_jar)
       dist_dir = output_jar.parent

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: jrubyfx
 version: !ruby/object:Gem::Version
-  version: 0.9.2
   prerelease:
+  version: 1.0.0
 platform: java
 authors:
 - Patrick Plenefisch
@@ -12,26 +12,56 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
+        version: '0'
     none: false
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jrubyfx-fxmlloader
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    none: false
+  prerelease: false
+  type: :runtime
 description: Enables JavaFX with FXML controllers and application in pure ruby
 email:
 - simonpatp@gmail.com
@@ -46,56 +76,42 @@ 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/fxml_application.rb
-- lib/jrubyfx/fxml_controller.rb
-- lib/jrubyfx/fxml_module.rb
+- lib/jrubyfx/part_imports.rb
+- lib/jrubyfx/dsl_map.rb
+- lib/jrubyfx/imports.rb
+- lib/jrubyfx/module.rb
 - lib/jrubyfx/java_fx_impl.rb
-- lib/jrubyfx/jfx_imports.rb
-- lib/jrubyfx/utils.rb
 - lib/jrubyfx/version.rb
-- lib/jrubyfx/core_ext/border_pane.rb
-- lib/jrubyfx/core_ext/circle.rb
-- lib/jrubyfx/core_ext/column_constraints.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/drag_event.rb~
-- lib/jrubyfx/core_ext/duration.rb
+- lib/jrubyfx/core_ext/exts.yml
+- lib/jrubyfx/core_ext/progress_indicator.rb
 - lib/jrubyfx/core_ext/effects.rb
-- lib/jrubyfx/core_ext/file_chooser.rb
-- lib/jrubyfx/core_ext/image_view.rb
-- lib/jrubyfx/core_ext/image_view.rb~
-- lib/jrubyfx/core_ext/labeled.rb
+- lib/jrubyfx/core_ext/stage.rb
 - lib/jrubyfx/core_ext/media_player.rb
-- lib/jrubyfx/core_ext/menu.rb
-- lib/jrubyfx/core_ext/menu.rb~
-- lib/jrubyfx/core_ext/menu_bar.rb
-- lib/jrubyfx/core_ext/menu_bar.rb~
-- lib/jrubyfx/core_ext/menu_item.rb
-- lib/jrubyfx/core_ext/node.rb
-- lib/jrubyfx/core_ext/observable_value.rb
 - lib/jrubyfx/core_ext/pagination.rb
-- lib/jrubyfx/core_ext/parallel_transition.rb
-- lib/jrubyfx/core_ext/parent.rb
-- lib/jrubyfx/core_ext/path.rb
-- lib/jrubyfx/core_ext/progress_indicator.rb
-- lib/jrubyfx/core_ext/radial_gradient.rb
-- lib/jrubyfx/core_ext/region.rb
-- lib/jrubyfx/core_ext/rotate.rb
-- lib/jrubyfx/core_ext/scene.rb
-- lib/jrubyfx/core_ext/shape.rb
-- lib/jrubyfx/core_ext/stage.rb
-- lib/jrubyfx/core_ext/stop.rb
-- lib/jrubyfx/core_ext/table_view.rb
-- lib/jrubyfx/core_ext/timeline.rb
+- lib/jrubyfx/core_ext/xy_chart.rb
 - lib/jrubyfx/core_ext/transition.rb
-- lib/jrubyfx/core_ext/tree_item.rb
-- lib/jrubyfx/core_ext/tree_item.rb~
+- lib/jrubyfx/core_ext/border_pane.rb
+- lib/jrubyfx/core_ext/image_view.rb
 - lib/jrubyfx/core_ext/tree_view.rb
-- lib/jrubyfx/core_ext/tree_view.rb~
-- lib/jrubyfx/core_ext/xy_chart.rb
-- lib/jrubyfx/utils/__ignore_java_stupid_rdoc.rb
-- lib/jrubyfx/utils/common_converters.rb
-- lib/jrubyfx/utils/common_utils.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/rotate.rb
+- lib/jrubyfx/core_ext/column_constraints.rb
+- lib/jrubyfx/core_ext/precompiled.rb
+- lib/jrubyfx/core_ext/radial_gradient.rb
+- lib/jrubyfx/core_ext/path.rb
+- lib/jrubyfx/core_ext/file_chooser.rb
 - LICENSE
 - README.md
 - bin/jrubyfx-generator
@@ -108,17 +124,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project: jrubyfx

data/lib/jrubyfx/core_ext/circle.rb

@@ -1,26 +0,0 @@
-=begin
-JRubyFX - Write JavaFX and FXML in Ruby
-Copyright (C) 2013 The JRubyFX Team
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-=end
-require 'jrubyfx/utils/common_converters'
-
-# JRubyFX DSL extensions for JavaFX Circles
-class Java::javafx::scene::shape::Circle
-  class << self
-    extend JRubyFX::Utils::CommonConverters
-
-    converter_for :new, [], [:none], [:none, :color], [:none, :none, :none], [:none, :none, :none, :color]
-  end
-end