propane 2.0.4-java → 2.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8a56b1bfc4c73b83741bc7e847298d4b3d0e35c
-  data.tar.gz: fa2f47690147a25f9f23b229924969011e618d3c
+  metadata.gz: 5794ce5b552d6e659f1f8be32ddf767a6a1dc62b
+  data.tar.gz: 2df804a15ad3310758a389505f7dd662e94c95f6
 SHA512:
-  metadata.gz: ff02e67b5b2eb154820b51f2271e12a3f8af13c18e2f82fd8ee4f09b5dfd379c3884e8f5ac4c561e5f2068334ec4fb3497471f0bf6e5682aeade7fc6dc874662
-  data.tar.gz: 43e964fe32d9870740fef91680cc9e785f364aa227ec1916ce699f453955cb465a7662476f198979f9a3689d454af17120424072deb643dfdb9410b036fdfa02
+  metadata.gz: 57cd3ed713c358931fb654e1d15408db641962bfcddc3a617c064a1bfe67263d4e691757ec85525a146a46a8d7bef373092effac79346290e54f79c9d6fd5f2c
+  data.tar.gz: 3719b85da86446105118d3e1e688264d2fa26c40c083d3e25b1b63716c16e4258005a8eb91918fa6a525b1557f404852a95317fc1ea5f251faddceb541aac1c3

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.18</version>
+    <version>0.1.19</version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+**v2.0.5** Update to processing-3.2.2, fix local library load, add proxy_library expand samples
+
 **v2.0.4** Correct `norm_strict`, add `math_tool_test` add `simplex_noise` expand samples
+
 **v2.0.3** Suggest use of jruby-9.1.4.0, more about loading vanilla libraries
+
 **v2.0.2** Refactor install to either install `samples\sound\video` or warn (update to use a local processing-3.2.1 core, this is why travis fails), fix some examples, hence `0.3`
 
 **v2.0.1** Support processing-3.2.0

data/Rakefile

@@ -7,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: core-3.2.1.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: core-3.2.2.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 

data/lib/propane/library_loader.rb

@@ -98,6 +98,7 @@ module Propane
       extensions = extension ? [extension] : %w(jar rb)
       extensions.each do |ext|
         [
+          "#{SKETCH_ROOT}/library/#{library_name}",
           "#{PROPANE_ROOT}/library/#{library_name}",
           "#{PROPANE_ROOT}/library/#{library_name}/library",
           "#{PROPANE_ROOT}/library/#{library_name}",

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.0.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/library/library_proxy/README.md

@@ -0,0 +1,99 @@
+### Using the LibraryProxy in your sketches
+LibraryProxy is a [abstract java class](https://github.com/ruby-processing/JRubyArt/blob/master/src/monkstone/core/LibraryProxy.java) so that you can acccess vanilla processing library reflection methods in your sketches using ruby.
+
+In the sketch you should `load_library :library_proxy` and your library class should inherit 
+from LibraryProxy and implement pre(), draw() and post() methods (can be empty method if not 
+required). For simplicity initialize your `processing library` in the sketch `setup`.
+
+### Example library
+
+```ruby
+require 'forwardable'
+
+# A custom Array created using forwardable (that can also access the PApplet pre,
+# post and draw loops by extending our new LibraryProxy class. Also has access
+# to custom background(int), fill(int) and stroke(int) methods.
+class CustomArray < LibraryProxy
+  extend Forwardable
+  def_delegators(:@objs, :each, :<<)
+  include Enumerable
+
+  attr_reader :app
+
+  # We must initialize class with the PApplet instance
+  def initialize(app)
+    @app = app
+    @objs = []
+  end
+
+  def add_object(mx, my, x, y, speed)
+    self << Particle.new(x.to_i, y.to_i, mx, my, Sketch::UNIT, speed, 1, 1)
+  end
+
+  # Access the processing post loop (gets called after draw)
+  def post
+    each do |obj|
+      update_x obj
+      next unless obj.y >= Sketch::UNIT || obj.x <= 0
+      obj.ydir *= -1
+      obj.y += obj.ydir
+    end
+  end
+
+  def update_x(obj)
+    obj.x += obj.speed * obj.xdir
+    return if (0..Sketch::UNIT).cover? obj.x
+    obj.xdir *= -1
+    obj.x += obj.xdir
+    obj.y += obj.ydir
+  end
+
+  # We need this to fulfill the contract of implementing abstract methods of
+  # LibraryProxy which is an alias for Java::ProcessingCore::AbstractLibrary
+  def pre
+  end
+
+  # Access the processing draw loop here, using our custom background and fill
+  # note: use of 'app' to access ellipse functionality as would otherwise be
+  # required for background and fill
+  def draw
+    background(0)
+    fill(255)
+    each do |obj|
+      app.ellipse(obj.mx + obj.x, obj.my + obj.y, 6, 6)
+    end
+  end
+end
+
+# The Particle object
+
+Particle = Struct.new(:x, :y, :mx, :my, :size, :speed, :xdir, :ydir)
+```
+### Example sketch
+
+```ruby
+# A minimalist sketch that demonstrates a possible approach to creating a custom
+# array of objects using forwardable. Also demonstrates how to use LibraryProxy.
+
+load_library :library_proxy     # loads the JRubyArt LibraryProxy abstract class
+require_relative 'custom_array' # loads our custom 'library' class
+
+UNIT = 40
+
+def setup
+  size 640, 360
+  wide_count = width / UNIT
+  height_count = height / UNIT
+  custom_array = CustomArray.new(self)
+  height_count.times do |i|
+    wide_count.times do |j|
+      custom_array.add_object(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
+    end
+  end
+  no_stroke
+end
+
+# does nothing here see custom_array.rb
+def draw
+end
+```

data/library/library_proxy/library_proxy.rb

@@ -0,0 +1,12 @@
+java_import Java::MonkstoneCore::LibraryProxy
+
+
+# classes that inherit from Library are expected to implement
+# the abstract methods of monkstone.core.LibraryProxy
+# def pre...
+# def draw...
+# def post...
+# def keyPressed...
+# def mousePressed...
+# NOOP is fine...
+# `app` can be called to get PApplet instance

data/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.0.4'
+  id 'propane:propane', '2.0.5'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -11,15 +11,15 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       roles 'developer'
     end
   end
-  license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'  
+  license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
   issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
-  
+
   source_control(
     url: 'https://github.com/ruby-processing/propane',
     connection: 'scm:git:git://github.com/ruby-processing/propane.git',
     developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git'
     )
-  
+
   properties('source.directory' => 'src',
     'propane.basedir' => '${project.basedir}',
     'polyglot.dump.pom' => 'pom.xml',
@@ -31,20 +31,20 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jruby.api' => 'http://jruby.org/apidocs/',
     'jogl.version' => '2.3.2'
     )
-  
+
   pom 'org.jruby:jruby:9.1.5.0'
-  jar 'org.processing:core:3.2.1'
+  jar 'org.processing:core:3.2.2'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
-  
+
   overrides do
     plugin :resources, '2.6'
     plugin :dependency, '2.10' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '3.2.1',         
+          version:  '3.2.2',
           type:  'jar',
           outputDirectory: '${propane.basedir}/lib'
         },
@@ -91,8 +91,8 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
         ]
       )
     end
-      
-    plugin( :compiler, '3.5.1',
+
+    plugin( :compiler, '3.6.0',
       source: '${maven.compiler.source}',
       target: '${maven.compiler.target}'
     )

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -64,7 +64,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.2</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.2.2</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>
@@ -160,7 +160,7 @@ DO NOT MODIFIY - GENERATED CODE
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.6.0</version>
           <configuration>
             <source>${maven.compiler.source}</source>
             <target>${maven.compiler.target}</target>

data/propane.gemspec

@@ -9,12 +9,12 @@ Gem::Specification.new do |gem|
   gem.authors       = ['monkstone']
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w(GPL-3.0 LGPL-2.0)
-  gem.description   = %q{A batteries included version of processing in ruby} 
-  gem.summary       = %q{A jruby wrapper for processing-3.2.1}
+  gem.description   = %q{A batteries included version of processing in ruby, macOS and linux} 
+  gem.summary       = %q{A jruby wrapper for processing-3.2.2}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.2.1.jar'
+  gem.files << 'lib/core-3.2.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'

data/src/monkstone/core/{AbstractLibrary.java → LibraryProxy.java}

@@ -1,5 +1,6 @@
 package monkstone.core;
 
+import processing.core.PApplet;
 import static processing.core.PConstants.*;
 
 /**
@@ -10,9 +11,9 @@ import static processing.core.PConstants.*;
  * PConstants should also be available from static import
  * @author Martin Prout
  */
-public abstract class AbstractLibrary {
+public abstract class LibraryProxy {
 
-    private final processing.core.PApplet app;
+    private final PApplet app;
 
     /**
      * Useful accessors
@@ -23,7 +24,7 @@ public abstract class AbstractLibrary {
      *
      * @param app PApplet
      */
-    public AbstractLibrary(processing.core.PApplet app) {
+    public LibraryProxy(PApplet app) {
         this.app = app;
         this.width = app.width;
         this.height = app.height;
@@ -48,7 +49,11 @@ public abstract class AbstractLibrary {
      */
     public abstract void post();
 
-    private void setActive(boolean active) {
+    /**
+     * Register or unregister reflection methods
+     * @param active
+     */
+    final void setActive(boolean active) {
         if (active) {
             this.app.registerMethod("pre", this);
             this.app.registerMethod("draw", this);
@@ -63,7 +68,7 @@ public abstract class AbstractLibrary {
 
     /**
      * Simple signature for background hides need to call app
-     * @param col
+     * @param col int
      */
     public void background(int col) {
         this.app.background(col);
@@ -71,7 +76,7 @@ public abstract class AbstractLibrary {
 
     /**
      * Simple signature for fill hides need to call app
-     * @param col
+     * @param col int
      */
     public void fill(int col) {
         this.app.fill(col);
@@ -79,7 +84,7 @@ public abstract class AbstractLibrary {
 
     /**
      * Simple signature for stroke hides need to call app
-     * @param col
+     * @param col int
      */
     public void stroke(int col) {
         this.app.stroke(col);
@@ -87,9 +92,9 @@ public abstract class AbstractLibrary {
 
     /**
      * Access applet if we must
-     * @return app PApplet
+     * @return applet PApplet
      */
-    public processing.core.PApplet app() {
+    public PApplet app() {
         return this.app;
     }
 

data/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 = '0.4'.freeze
+EXAMPLES = '0.5'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arcball
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-description: A batteries included version of processing in ruby
+description: A batteries included version of processing in ruby, macOS and linux
 email:
 - mamba2928@yahoo.co.uk
 executables:
@@ -45,7 +45,7 @@ files:
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-3.2.1.jar
+- lib/core-3.2.2.jar
 - lib/export.txt
 - lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
 - lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
@@ -67,6 +67,8 @@ files:
 - library/control_panel/control_panel.rb
 - library/file_chooser/chooser.rb
 - library/file_chooser/file_chooser.rb
+- library/library_proxy/README.md
+- library/library_proxy/library_proxy.rb
 - library/simplex_noise/simplex_noise.rb
 - library/slider/slider.rb
 - library/video_event/video_event.rb
@@ -76,7 +78,7 @@ files:
 - src/monkstone/ColorUtil.java
 - src/monkstone/MathToolModule.java
 - src/monkstone/PropaneLibrary.java
-- src/monkstone/core/AbstractLibrary.java
+- src/monkstone/core/LibraryProxy.java
 - src/monkstone/fastmath/Deglut.java
 - src/monkstone/fastmath/package-info.java
 - src/monkstone/filechooser/Chooser.java
@@ -129,7 +131,7 @@ rubyforge_project:
 rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
-summary: A jruby wrapper for processing-3.2.1
+summary: A jruby wrapper for processing-3.2.2
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb