Merge pull request #13 from ruby-processing/post_initialize

Post initialize

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,7 @@
+**v2.5.0** No need for `$app` we can replace with `Propane.app`
+
+**v2.4.1** Add post_initialize hoop to app.rb.
+
 **v2.4.0** Extend LibraryProxy to include mouseEvent and keyEvent.
 
 **v2.3.4** Simplify control_panel library (replacing `c.title = 'PaneTitle'` with `c.title('PaneTitle')`) also enable use of `block` with `button's`.

README.md

@@ -3,7 +3,7 @@
 
 A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.5, where we include processing core (from a local maven repository and opengl etc from maven central). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building].
 
-NB: The main reason for build failing is when the `core.jar` is not available from maven central, to install a local jar:-
+NB: The main reason for build failing is when the `core.jar` is not available from maven central, to install a local jar (_example for linux mint_):-
 ```bash
 
 mvn install:install-file /home/tux/processing-3.3.5/core/library/core.jar -DgroupId=org.processing -DartifactId=core -Dversion=3.3.5
@@ -28,7 +28,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.3.4-java.gem # for local install
+jgem install propane-2.5.0-java.gem # for local install
 ```
 
 ## Usage

lib/propane/app.rb

@@ -43,6 +43,10 @@ module Render
     key_typed: :keyTyped
   }.freeze
 
+  class << self
+    attr_accessor :app
+  end
+
   # All sketches extend this class
   class App < PApplet
     include Math, MathTool, HelperMethods, Render
@@ -110,7 +114,8 @@ def initialize(options = {}, arguments = [])
       raise TypeError unless arguments.is_a? Array
       # Set up the sketch.
       super()
-      $app = self
+      post_initialize(options)
+      Propane.app = self
       @arguments = arguments
       @options   = options
       run_sketch
@@ -125,6 +130,9 @@ def size(*args)
       super(*args)
     end
 
+    def post_initialize(_args)
+    end
+
     def sketch_title(title)
       surface.set_title(title)
     end
@@ -168,11 +176,11 @@ module Proxy
     include Java::ProcessingCore::PConstants
 
     def respond_to_missing?(symbol, include_priv = false)
-      $app.respond_to?(symbol, include_priv) || super
+      Propane.app.respond_to?(symbol, include_priv) || super
     end
 
     def method_missing(name, *args, &block)
-      return $app.send(name, *args) if $app.respond_to? name
+      return Propane.app.send(name, *args) if Propane.app.respond_to? name
       super
     end
   end # Processing::Proxy

lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.5.0'.freeze
 end

library/control_panel/control_panel.rb

@@ -21,7 +21,7 @@ def initialize(control_panel, name, range, initial_value, proc = nil)
       label = control_panel.add_element(self, name)
       add_change_listener do
         update_label(label, name, value)
-        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        Propane.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
       set_value(initial_value ? initial_value * 100 : min)
@@ -46,7 +46,7 @@ def initialize(control_panel, name, elements, initial_value, proc = nil)
       set_preferred_size(java.awt.Dimension.new(190, 30))
       control_panel.add_element(self, name)
       add_action_listener do
-        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        Propane.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
@@ -66,7 +66,7 @@ def initialize(control_panel, name, proc = nil)
       set_horizontal_alignment javax.swing.SwingConstants::CENTER
       control_panel.add_element(self, name, false)
       add_action_listener do
-        $app.instance_variable_set("@#{name}", value)
+        Propane.app.instance_variable_set("@#{name}", value)
         proc.call(value) if proc
       end
     end
@@ -83,7 +83,7 @@ def initialize(control_panel, name, proc = nil)
       set_preferred_size(java.awt.Dimension.new(170, 64))
       control_panel.add_element(self, name, false, true)
       add_action_listener do
-        $app.send(name)
+        Propane.app.send(name)
         proc.call(value) if proc
       end
     end
@@ -107,7 +107,7 @@ def display
       set_size 200, 30 + (64 * elements.size)
       set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      set_location($app.width + 10, 0) unless $app.width + 10 > $app.displayWidth
+      set_location(Propane.app.width + 10, 0) unless Propane.app.width + 10 > Propane.app.displayWidth
       panel.visible = true
     end
 

pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.4.0'
+  id 'propane:propane', '2.5.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'

vendors/Rakefile

@@ -9,7 +9,7 @@ SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '1.4'.freeze
+EXAMPLES = '1.5'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']