jruby_art 0.2.4.pre → 0.2.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c56a4fef1b06b3b0eef19527dd33a9b0d89333
-  data.tar.gz: 300a3b7e12a1883085fac9d467bcacbe46d268bc
+  metadata.gz: 186cf1166260ed477d29a53e4d6af5982ec61320
+  data.tar.gz: 778ff0c076f4fc7a5cae5e297713ee2154eadafd
 SHA512:
-  metadata.gz: 46e27c5d4f77c70155763fc0c0012d53ed6e42eb83dcf89b1657e1be452617181b3e7d618fd4991b8b280946cf711c2f7971b80fbe7e370375d6629e57f309e8
-  data.tar.gz: 040c4eee673e1b5816e0bdb6029e6218413df601a66eda8ef6e1b3a23224517b3e4c29d1aac36d0cb6bbd07b4144857f6908625b2b0823773df9c871a377ad67
+  metadata.gz: 5501b44349aefdbedd0531db69d1e539e85f2da546a0777da584b159540b03909e960ae6b433bbf5639dc3ba2795b9ac173837657a8f25b685af4735dfd0dcf0
+  data.tar.gz: 6a331e4710e2f8185e2cc535959e033b14906e35561d4625040fd43ab01523bdd5f84a0db04cd4f9bc39b1e4980ce65b2e69ac21ac78da1d721e313c9d43acd0

data/CHANGELOG.md

@@ -1,10 +1,19 @@
 ## JRubyArt CHANGELOG
 
 It might seem a little of that this log starts at version 0.1.2, the reason for this is that previous version relate to earlier versions which were essentially a clone of ruby-processing.
+### Version 0.2.6
+
+Enable use of 'videoEvent' and 'captureEvent' java reflection methods by creating a 'VideoInterface' in a java class.
+
+
+### Version 0.2.5
+
+jruby-1.7.20 version
+Revert to Processing::Proxy as a module, but implement :method_missing (after tyfkda processing ruby-mode), and java_import PConstants in that module. Require 'yaml' rather than 'psych' as workaround for builtin 'psych' in jruby.
 
 ### Version 0.2.4
 
-Can't wait forever for jruby-9000, this release is require to promote the new toxiclibs gem.
+Can't wait forever for jruby-9000, this release is required to promote the new [toxiclibs gem][].
 
 ### Version 0.2.3
 
@@ -47,3 +56,5 @@ Move config file from ~/.k9rc to ~/.jruby_art/config.yml, created installer for
 ### Version 0.1.2
 
 First point release, requires user build, supports 2D and opengl sketches, but no library support. Sketches will only run with jruby (jruby-complete is not included). To run sketches with load_image jruby-complete is required, so either provide that or use netbeans as your ide (with jruby plugin).
+
+[toxiclibs gem]:https://github.com/ruby-processing/toxicgem

data/README.md

@@ -2,10 +2,11 @@
 [![Gem Version](https://badge.fury.io/rb/jruby_art.svg)](http://badge.fury.io/rb/jruby_art)
 
 Is an alternative implementation of [ruby-processing][] that provides a ruby-wrapper for the java version of [processing][]. It is currently at the pre-release stage, but is ready for testing, and available from rubygems.org.
+Core processing jars are included, so it does not require a vanilla processing install..., you should perhaps consider making a contribution to the [processing foundation][].
 
 ### Requirements
 
-Java runtime 7+, and ruby (can be MRI ruby), curl (to download jruby-complete and examples, although there is a  workaround). NB: it is not necessary to install vanilla [processing][] with this implementation, core jars are included in the gem.
+Java runtime 7+, and ruby (can be MRI ruby), curl (to download jruby-complete and examples, although there is a  workaround). 
 
 ### Getting Started
 
@@ -51,13 +52,13 @@ However such sketches must be run with `k9 run sketch.rb`, however you can do 'k
 
 ###Ruby Versions
 
-jruby-1.7.19 (when sketches run with jruby command)
+jruby-1.7.20 (when sketches run with jruby command)
 
-jruby-9.0.0.0.pre1 also seems to work (the next pre-release will target jruby-9.0.0.0-pre2)
+jruby-9.0.0.0.pre2 also seems to work (the next pre-release will probably target jruby-9.0.0.0-pre2)
 
 or
 
-ruby-2.1.2+ (when sketches are run using k9 command, ie using jruby-complete)
+ruby-2.1.2+ (when sketches are run using k9 command, ie using jruby-complete with jruby-9.0.0.0)
 
 ### Using netbeans as an ide for JRubyArt
 
@@ -87,3 +88,4 @@ ___
 [netbeans]:http://learning-ruby-processing.blogspot.co.uk/2014/10/alternative-ruby-processing-implentation.html
 [processing-2.2.1]:https://processing.org/download/
 [processing-core]:https://github.com/ruby-processing/processing-core/blob/master/README.md
+[processing foundation]:https://processing.org/download/

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
   s.description = "A ruby wrapper for processing, that doesn't require a separate install of processing"
   s.license = 'MIT'
   s.author = 'Martin Prout'
-  s.email = 'martin_p@lineone.net'
+  s.email = 'mamba2928@yahoo.co.uk'
   s.homepage = 'https://github.com/ruby-processing/JRubyArt'
   s.executables << 'k9'
   s.files = %w(LICENSE.md README.md Rakefile CHANGELOG.md) + Dir.glob('{bin,lib,library,spec,vendors}/**/*')

data/lib/jruby_art.rb

@@ -15,14 +15,9 @@ if RUBY_PLATFORM == 'java'
     # require_relative jar unless jar =~ /native/ (breaks netbeans)
     require jar unless jar =~ /native/
   end
-  #Dir[File.join(working_directory, platform)].each do |jar|
-    # require_relative jar (break netbeans)
-   # require jar
- # end
   Java::ProcessingFastmath::DeglutLibrary.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec2::Vec2Library.new.load(JRuby.runtime, false)
   Java::ProcessingVecmathVec3::Vec3Library.new.load(JRuby.runtime, false)
-  
   AppRender = Java::ProcessingVecmath::AppRender
   ShapeRender = Java::ProcessingVecmath::ShapeRender
   require 'jruby_art/app'

data/lib/jruby_art/app.rb

@@ -26,14 +26,14 @@ module Processing
     def post_initialize(_opts = {})
       nil
     end
-    
+
     # This method configures the sketch title and and presentation mode.
     #
     def configure_sketch
       presentation_mode
       sketch_title
     end
-    
+
     # This method sets the sketch presentation mode.
     #
     def presentation_mode
@@ -41,20 +41,20 @@ module Processing
       args << '--full-screen'
       args << "--bgcolor=#{opts[:bgcolor]}" if opts[:bgcolor]
     end
-    
+
     # This method is the main draw loop of the sketch. This is usually
     # overridden by the user.
     #
     def draw
       nil
     end
-    
+
     # This method runs the processing sketch.
     #
     def run_sketch
       PApplet.run_sketch(args.to_java(:string), self)
     end
-    
+
     # This method sets the sketch title.
     #
     def sketch_title
@@ -73,22 +73,22 @@ module Processing
     key_released: :keyReleased,
     key_typed: :keyTyped
   }
-  
+
   # This class is for default (Java2D) sketches only
   class App < PApplet
     include Math, Common, HelperMethods
     attr_reader :title, :args, :opts
-    
+
     class << self
       # Handy getters and setters on the class go here:
       attr_accessor :sketch_class, :library_loader
-      
+
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_libraries(*args)
       end
       alias_method :load_library, :load_libraries
-      
+
       # When certain special methods get added to the sketch, we need to let
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
@@ -96,11 +96,11 @@ module Processing
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
-    
+
     def sketch_class
       self.class.sketch_class
     end
-    
+
     # App should be instantiated with an optional list of opts
     # and array of args.
     #
@@ -116,7 +116,7 @@ module Processing
       configure_sketch
       run_sketch
     end
-    
+
     # This method provides the default setup for the sketch. It can
     # be overridden by the user for finer grained control.
     #
@@ -124,7 +124,7 @@ module Processing
       size(width, height)
     end
   end
-  
+
   # This class is for opengl sketches (P2D and P3D)
   class AppGL < PApplet
     include Math, Processing, Common
@@ -132,7 +132,7 @@ module Processing
     include HelperMethods
     Java::ProcessingVecmathArcball::ArcballLibrary.new.load(JRuby.runtime, false)
     attr_reader :title, :args, :opts
-    
+
     # App should be instantiated with an optional list of opts
     # and array of args.
     #
@@ -148,7 +148,7 @@ module Processing
       configure_sketch
       run_sketch
     end
-    
+
     # This method provides the default setup for the sketch. It can
     # be overridden by the user for finer grained control.
     #
@@ -156,17 +156,17 @@ module Processing
       size(width, height, mode = P3D)
       fail unless /opengl/ =~ mode
     end
-    
+
     class << self
       # Handy getters and setters on the class go here:
       attr_accessor :sketch_class, :library_loader
-      
+
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_libraries(*args)
       end
       alias_method :load_library, :load_libraries
-      
+
       # When certain special methods get added to the sketch, we need to let
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
@@ -175,5 +175,19 @@ module Processing
       end
     end
   end
-end
 
+  # Importing PConstants to access to processing constants,
+  # to keep namespace clean use PConstants::TRIANGLE (for example)
+  # or to use bare TRIANGLE also 'include PConstants'
+  # Using :method_missing to mimic inner class methods
+  # @HACK you should consider using 'forwardable' to avoid this
+  # egregious hack...
+  module Proxy
+    java_import 'processing.core.PConstants'
+ 
+    def method_missing(name, *args)
+      return $app.send(name, *args) if $app && $app.respond_to?(name)
+      super
+    end
+  end
+end

data/lib/jruby_art/config.rb

@@ -1,13 +1,11 @@
-require 'psych'
+require 'yaml'
 # The Processing module is a wrapper for JRubyArt
 # Author:: Martin Prout (extends / re-implements ruby-processing)
 module Processing
   unless defined? RP_CONFIG
     begin
       CONFIG_FILE_PATH = File.expand_path('~/.jruby_art/config.yml')
-      File.open(CONFIG_FILE_PATH, 'r') do |yaml|
-        RP_CONFIG = Psych.load(yaml)
-      end
+      RP_CONFIG = YAML.load_file(CONFIG_FILE_PATH)
     rescue
       warn('WARNING: you need to set PROCESSING_ROOT in ~/.jruby_art/config.yml')
     end

data/lib/jruby_art/version.rb

@@ -1,4 +1,4 @@
 # The sole purpose of this module is to provide a name-space for version
 module JRubyArt
-  VERSION = '0.2.4.pre'
+  VERSION = '0.2.6.pre'
 end

data/library/library_proxy/library_proxy.rb

@@ -0,0 +1,3 @@
+require 'rpextras'
+
+LibraryProxy = Java::ProcessingCore::AbstractLibrary

data/library/video/lib/export.txt

@@ -0,0 +1 @@
+name = Video

data/library/video/lib/macosx64.txt

@@ -0,0 +1 @@
+Macosx requires binary blobs to use this library, copy the macosx64 folder from the

data/library/video/lib/windows.txt

@@ -0,0 +1,3 @@
+windows requires binary blobs to use this library, copy either the windows32 or windows64 
+folder from https://github.com/processing/processing-video/releases/download/latest/video.zip
+available since processing-3.0a5 video library here (as appropriate for your system).

data/library/video/video.rb

@@ -0,0 +1,12 @@
+require 'rpextras'
+require_relative 'lib/video.jar'
+require_relative 'lib/gstreamer-java.jar'
+require_relative 'lib/jna.jar'
+
+class Processing::App
+  include Java::ProcessingCore::VideoInterface
+end
+
+class Processing::AppGL
+  include Java::ProcessingCore::VideoInterface
+end

data/spec/vecmath_spec.rb

@@ -34,7 +34,38 @@ describe 'Vec2D#==' do
   it 'should return a == b' do
     a = Vec2D.new(3, 5)
     b = Vec2D.new(6, 7)
-    expect(a == b).to eq(false)
+    expect(a == b).to be false
+  end
+end
+
+describe 'Vec2D#eql?' do
+  it 'should return a.eql? b' do
+    a = Vec2D.new(3.0, 5.0)
+    b = Vec2D.new(3.0, 5.0)
+    expect(a.eql?(b)).to be true
+  end
+end
+
+describe 'Vec2D#eql?' do
+  it 'should return a.eql? b' do
+    a = Vec2D.new(3.0, 5.0)
+    b = Vec2D.new(3.0, 5.000001)
+    expect(a.eql?(b)).to be false
+  end
+end
+
+describe 'Vec2D#equal?' do
+  it 'should return a.eql? b' do
+    a = Vec2D.new(3.0, 5.0)
+    expect(a.equal?(a)).to be true
+  end
+end
+
+describe 'Vec2D#equal?' do
+  it 'should return a.eql? b' do
+    a = Vec2D.new(3.0, 5.0)
+    b = Vec2D.new(3.0, 5.0)
+    expect(a.equal?(b)).to be false
   end
 end
 
@@ -42,7 +73,7 @@ describe 'Vec2D#==' do
   it 'should return a == b' do
     a = Vec2D.new(3.0000000, 5.00000)
     b = Vec2D.new(3.0000000, 5.000001)
-    expect(a == b).to eq(true)
+    expect(a == b).to be true
   end
 end
 
@@ -275,3 +306,178 @@ describe 'Vec2D#rotate rot' do
     expect(a).to eq(Vec2D.new(-10.0, 20.0))
   end
 end
+
+describe 'Vec3D#to_a' do
+  it 'should return x, y, z as an array' do
+    x, y, z = 1.0000001, 1.01, 0.999999
+    a = Vec3D.new(x, y, z)
+    expect(a.to_a).to eq([x, y, z])
+  end
+end
+
+describe 'Vec3D#copy' do
+  it 'should return a deep copy' do
+    x, y, z = 1.0000001, 1.01, 0.999999
+    a = Vec3D.new(x, y, z)
+    expect(a.copy.to_a).to eq([x, y, z])
+  end
+end
+
+describe 'Vec3D#copy' do
+  it 'should produce a new object' do
+    x, y, z = 1.0000001, 1.01, 0.999999
+    a = Vec3D.new(x, y, z)
+    b = a.copy
+    b.normalize!
+    expect(a).not_to eq(b)
+  end
+end
+
+describe 'Vec3D#normalize! zero vector' do
+  it 'should do nothing' do
+    a = Vec3D.new
+    b = a.normalize!
+    expect(a).to eq(b)
+  end
+end
+
+describe 'Vec3D#normalize zero vector' do
+  it 'should do nothing' do
+    a = Vec3D.new
+    b = a.normalize
+    expect(a).to eq(b)
+    expect(a).to_not equal(b)
+  end
+end
+
+describe 'Vec3D#dist_squared' do
+  it 'should return Vec3D.dist_squared(a, b)' do
+    a = Vec3D.new(3, 5, 2)
+    b = Vec3D.new(6, 7, 1)
+    expect(a.dist_squared(b)).to eq 3.0**2 + 2**2 + 1
+  end
+end
+
+describe 'Vec3D#dist' do
+  it 'should return Vec3D.dist(a, b)' do
+    a = Vec3D.new(3, 5, 2)
+    b = Vec3D.new(6, 7, 1)
+    expect(a.dist(b)).to eq Math.sqrt(3.0**2 + 2**2 + 1)
+  end
+end
+
+describe 'Vec3D#normalize' do
+  it 'should return Vec3D#normalize a new Vec3D with mag == 1.0' do
+    a = Vec3D.new(3, 5, 2)
+    b = a.normalize
+    expect(b.mag).to be_within(EPSILON).of(1.0)
+  end
+end
+
+describe 'Vec3D#normalize!' do
+  it 'should return Vec3D#normalize! Vec3D#mag == 1.0' do
+    a = Vec3D.new(3, 5, 2)
+    a.normalize!
+    expect(a.mag).to be_within(EPSILON).of(1.0)
+  end
+end
+
+describe 'Vec3D#set_mag zero vector' do
+  it 'should return zero vector' do
+    a = Vec3D.new(0, 0, 0)
+    expect(a.set_mag(Math.sqrt(48))).to eq Vec3D.new(0, 0, 0)
+  end
+end
+
+describe 'Vec3D#set_mag' do
+  it 'should return Vec3D#set_mag' do
+    a = Vec3D.new(1, 1, 1)
+    expect(a.set_mag(Math.sqrt(48))).to eq Vec3D.new(4, 4, 4)
+  end
+end
+
+describe 'Vec3D#cross product' do
+  it 'should return Vec3D.cross(vec)' do
+    a = Vec3D.new(3, 5, 2)
+    b = Vec3D.new(6, 7, 1)
+    expect(a.cross(b)).to eq Vec3D.new(-9.0, 9.0, -9.0)
+  end
+end
+
+describe 'Vec3D#set_mag negative block' do
+  it 'should return Vec3D#set_mag' do
+    a = Vec3D.new(1, 1, 1)
+    expect(a.set_mag(Math.sqrt(48)) { false }).to eq a
+  end
+end
+
+describe 'Vec3D#inspect' do
+  it 'should return a String' do
+    a = Vec3D.new(3, 5, 2.000000000000001)
+    expect(a.inspect).to eq 'Vec3D(x = 3.0000, y = 5.0000, z = 2.0000)'
+  end
+end
+
+describe 'Vec3D#set_mag positive block' do
+  it 'should return Vec3D#set_mag' do
+    a = Vec3D.new(1, 1, 1)
+    expect(a.set_mag(Math.sqrt(48)) { true }).to eq Vec3D.new(4, 4, 4)
+  end
+end
+
+describe 'Vec3D#to_a' do
+  it 'should return x, y as an array' do
+    x, y, z = 1.0000001, 1.01, 1.001
+    a = Vec3D.new(x, y, z)
+    expect(a.to_a).to eq([x, y, z])
+  end
+end
+
+describe 'Vec3D#z=' do
+  it 'should set z value' do
+    x, y, z = 1.0000001, 1.01, 1.001
+    a = Vec3D.new(x, y, z)
+    w = 56.0
+    a.z = w
+    expect(a.z).to eq(w)
+  end
+end
+
+describe 'Vec3D#==' do
+  it 'should return a == b' do
+    a = Vec3D.new(3.0, 5.0, 0)
+    b = Vec3D.new(3.0, 5.000001, 0)
+    expect(a == b).to be true
+  end
+end
+
+describe 'Vec3D#eql?' do
+  it 'should return a.eql? b' do
+    a = Vec3D.new(3.0, 5.0, 0)
+    b = Vec3D.new(3.0, 5.0, 0)
+    expect(a.eql?(b)).to be true
+  end
+end
+
+describe 'Vec3D#eql?' do
+  it 'should return a.eql? b' do
+    a = Vec3D.new(3.0, 5.0, 0)
+    b = Vec3D.new(3.0, 5.000001, 0)
+    expect(a.eql?(b)).to be false
+  end
+end
+
+describe 'Vec3D#equal?' do
+  it 'should return a.eql? b' do
+    a = Vec3D.new(3.0, 5.0)
+    expect(a.equal?(a)).to be true
+  end
+end
+
+describe 'Vec3D#equal?' do
+  it 'should return a.eql? b' do
+    a = Vec3D.new(3.0, 5.0, 0)
+    b = Vec3D.new(3.0, 5.0, 0)
+    expect(a.equal?(b)).to be false
+  end
+end

data/vendors/Rakefile

@@ -10,14 +10,25 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION      = '1.7.19'
-EXAMPLES                    = '0.0.5'
+JRUBYC_VERSION      = '1.7.20'
+EXAMPLES                    = '0.0.6-pre'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
-CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar", "#{EXAMPLES}.tar.gz")
+CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar", "#{EXAMPLES}.tar.gz", "video.zip")
 
 desc "download, and copy to ruby-processing"
-task :default => [:download, :copy_ruby, :download_examples, :copy_examples, :config]
+task :default => [:install_ruby, :install_video, :config, :install_examples]
+
+desc "install jruby"
+task :install_ruby => [:download, :copy_ruby]
+
+desc "install video library"
+task :install_video => [:download_video, :copy_video]
+
+
+desc "install examples"
+task :install_examples => [:download_examples, :copy_examples]
+
 
 desc "download JRuby upstream sources"
 task :download => ["jruby-complete-#{JRUBYC_VERSION}.jar"]
@@ -28,7 +39,18 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "9973923de511c06d979e950801b51a95d19e8be3")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "0f784b3d9d760b80b2f9d78ede80ee1d8d85e786")
+end
+
+desc "download processing video-library"
+task :download_video => ["video.zip"]
+
+file "video.zip" do
+  begin
+    sh "curl -O https://github.com/processing/processing-video/releases/download/latest/video.zip"    
+  rescue
+    warn(WARNING)
+  end
 end
 
 directory "../lib/ruby"
@@ -40,6 +62,9 @@ end
 
 desc "download, and copy to JRubyArt"
 task :unpack_samples => [:download_examples, :copy_examples]
+
+
+
 desc 'download and copy examples to user home'
 task :download_examples
 file_name = (MAC_OR_LINUX.nil?) ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
@@ -55,6 +80,20 @@ file file_name do
   end
 end
 
+
+
+desc "copy video library"
+
+task :copy_video => ["../library/video/lib"] do  
+  sh "unzip video.zip"
+  Dir["video/library/*.jar"].each do |f|
+    sh "cp #{f} ../library/video/lib"
+  end
+  sh "cp -r video/library/windows32 ../library/video/lib" 
+  sh "cp -r video/library/windows64 ../library/video/lib"
+  sh "cp -r video/library/macosx64 ../library/video/lib" 
+end
+
 desc "copy examples"
 task :copy_examples => file_name do
   if MAC_OR_LINUX.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.2.4.pre
+  version: 0.2.6.pre
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 description: A ruby wrapper for processing, that doesn't require a separate install of processing
-email: martin_p@lineone.net
+email: mamba2928@yahoo.co.uk
 executables:
 - k9
 extensions: []
@@ -97,8 +97,13 @@ files:
 - lib/jruby_art/helpers/camel_string.rb
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/range.rb
+- library/video/video.rb
+- library/video/lib/export.txt
+- library/video/lib/macosx64.txt
+- library/video/lib/windows.txt
 - library/grammar/grammar.rb
 - library/control_panel/control_panel.rb
+- library/library_proxy/library_proxy.rb
 - library/boids/boids.rb
 - library/file_chooser/file_chooser.rb
 - spec/library_loader_spec.rb