jruby_art 2.4.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb6f04593bba0f4ffdb178a135045104a25f698b79648139963bbc229c38762e
-  data.tar.gz: 7f388994b97720459e7879663c865b05b19663255cfd7ccee92d6955dabb33eb
+  metadata.gz: e77733e02a373be40994e44cb0af58deb34d6e8fc56db41e7fdfdf92c66e07ee
+  data.tar.gz: 80ff321df3e3e6769cde781b5be89994739d9013578982a05de4b4be8ce6e62c
 SHA512:
-  metadata.gz: df1734a114f9bf80ed7a9694260a3a0e32bbbd7e75801f8547322e080b6bc00d7c68f6cccdeaee7c35391e496e09224eeeaf59124b401bfc47e5552b95391834
-  data.tar.gz: 0c284aa5547a2da7cf7990eaded6f857bd64c551cc9455dea59247f77225baff2bfef81af9701c456a047f37d6e637c20295c941802c9f095def2816ea82786e
+  metadata.gz: e60c5eb4e6ff43b06dffbb6bb9a7e83b04e5900c373e1fc3603e17554a6f351f60d066bd99d90aa68e2803970285c53b695c145dbc6025770afa3b01f3a67bc2
+  data.tar.gz: 3cb5cbdaabb21d8fc2160c998cd1f01290ce8b865b576f4baa984a439a767b4fae408951fc3e4ba2e08fc866dba8b7d823446f44dcf69eb4cfe3311bbd93af87

data/lib/jruby_art/app.rb

@@ -43,6 +43,7 @@ module Processing
     include Math
     include MathTool
     include Render
+    include FastNoise
     # Alias some methods for familiarity for Shoes coders.
     # surface replaces :frame
     alias oval ellipse

data/lib/jruby_art/helper_methods.rb

@@ -123,14 +123,14 @@ module Processing
     # some methods. Add to this list as needed.
     def proxy_java_fields
       fields = %w[key frameRate mousePressed keyPressed]
-      methods = fields.map { |field| java_class.declared_field(field) }
-      @declared_fields = Hash[fields.zip(methods)]
+      methods = fields.map { |field| java_class.field(field) }
+      @jfields = Hash[fields.zip(methods)]
     end
 
     # Fix java conversion problems getting the last key
     # If it's ASCII, return the character, otherwise the integer
     def key
-      int = @declared_fields['key'].value(java_self)
+      int = @jfields['key'].value(java_self)
       int < 256 ? int.chr : int
     end
 
@@ -167,19 +167,19 @@ module Processing
 
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
-      return @declared_fields['frameRate'].value(java_self) unless fps
+      return @jfields['frameRate'].value(java_self) unless fps
 
       super(fps)
     end
 
     # Is the mouse pressed for this frame?
     def mouse_pressed?
-      @declared_fields['mousePressed'].value(java_self)
+      @jfields['mousePressed'].value(java_self)
     end
 
     # Is a key pressed for this frame?
     def key_pressed?
-      @declared_fields['keyPressed'].value(java_self)
+      @jfields['keyPressed'].value(java_self)
     end
 
     private

data/lib/jruby_art/native_folder.rb

@@ -25,7 +25,7 @@ class NativeFolder
   end
 
   def name
-    return 'macosx' if /darwin|mac/.match?(os)
+    return macos if /darwin|mac/.match?(os)
 
     return format(LINUX_FORMAT, bit: bit) if /linux/.match?(os)
 

data/lib/jruby_art/processing_ide.rb

@@ -2,6 +2,8 @@
 
 # detects processing preferences.txt, extracts sketchbook_path
 class ProcessingIde
+  THREE='sketchbook.path.three='.freeze
+  FOUR='sketchbook.path.four='.freeze
   attr_reader :preferences
   def initialize
     @preferences = File.join(ENV['HOME'], '.processing', 'preferences.txt')
@@ -14,9 +16,9 @@ class ProcessingIde
   def sketchbook_path
     File.open(preferences, 'r') do |file|
       file.each_line do |line|
-        if /sketchbook/.match?(line)
-          return line.tap { |sli| sli.slice!('sketchbook.path.three=') }.chomp
-        end
+        return line.tap { |sli| sli.slice!(FOUR) }.chomp if /sketchbook.path.four/.match?(line)
+
+        return line.tap { |sli| sli.slice!(THREE) }.chomp if /sketchbook.path.three/.match?(line)
       end
     end
   end

data/lib/jruby_art/runner.rb

@@ -141,9 +141,10 @@ module Processing
     def install(library = nil)
       require_relative 'installer'
       library ||= 'new'
-      case library.downcase
+      choice = library.downcase
+      case choice
       when /sound|video/
-        system "cd #{K9_ROOT}/vendors && rake download_and_copy_#{choice}"
+        system "cd #{K9_ROOT}/vendors && rake install_#{choice}"
       when /samples/
         system "cd #{K9_ROOT}/vendors && rake install_samples"
       when /jruby/

data/lib/jruby_art/version.rb

@@ -2,5 +2,5 @@
 
 # A wrapper for version
 module JRubyArt
-  VERSION = '2.4.2'
+  VERSION = '2.6.0'
 end

data/lib/jruby_art.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # JRubyArt is for Code Art.
 # Send suggestions, ideas, and hate-mail to mamba2928 [at] gmail.com
 # Also, send samples and libraries.

data/library/pdf/pdf.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'itextpdf-5.5.13.2.jar'
+  java_import Java::ProcessingPdf::PGraphicsPDF
+end

data/library/svg/svg.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Processing::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end

data/vendors/Rakefile

@@ -11,15 +11,15 @@ WARNING = <<~WARN
 
 WARN
 # https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
-JRUBYC_VERSION = '9.2.13.0'
+JRUBYC_VERSION = '9.3.1.0'
 SOUND = 'sound.zip'
-SOUND_VERSION = 'v2.2.2'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '3.8'
+SOUND_VERSION = 'v2.2.3'
+VIDEO = 'video.zip'
+VIDEO_VERSION = 'v2.0'
+EXAMPLES = '4.1'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])
-
+DOWNLOAD = 'releases/download/latest'
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar"
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
 
@@ -82,15 +82,15 @@ task :init_dir do
 end
 
 desc 'download and copy sound library to ~/.jruby_art'
-task download_and_copy_sound: %i[wget_check init_dir download_sound copy_sound clobber]
+task install_sound: %i[wget_check init_dir download_sound copy_sound clobber]
 
 desc 'download and copy video library to ~/.jruby_art'
-task download_and_copy_video: %i[wget_check init_dir download_video copy_video clobber]
+task install_video: %i[wget_check init_dir download_video copy_video clobber]
 
 desc 'download sound library'
 task :download_sound do
   wget_base = 'wget https://github.com/processing/processing-sound'
-  wget_string = [wget_base, 'releases/download/latest', SOUND].join('/')
+  wget_string = [wget_base, DOWNLOAD, SOUND].join('/')
   puts wget_string
   system wget_string
 end
@@ -98,12 +98,12 @@ end
 desc 'download video library'
 task :download_video do
   wget_base = 'wget https://github.com/processing/processing-video'
-  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
+  wget_string = [wget_base, DOWNLOAD, VIDEO].join('/')
   system wget_string
 end
 
 desc 'copy sound library'
-task copy_sound: SOUND do
+task :copy_sound do
   system "unzip #{SOUND}"
   if File.exist? "#{HOME_DIR}/.jruby_art/libraries/sound"
     FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound"
@@ -113,7 +113,7 @@ task copy_sound: SOUND do
 end
 
 desc 'copy video library'
-task copy_video: VIDEO do
+task :copy_video do
   system "unzip #{VIDEO}"
   if File.exist? "#{HOME_DIR}/.jruby_art/libraries/video"
     FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.10'
   name: minitest
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,15 +31,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.3'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
 description: |2
-    JRubyArt-2.4.0+ is a ruby implementation of the processing art framework, with enhanced
+    JRubyArt-2.5.0+ is a ruby implementation of the processing art framework, with enhanced
     functionality. Processing libraries and ruby gems can be used in your sketches.
     Features create/run/watch/live modes.
 email: mamba2928@yahoo.co.uk
@@ -57,7 +57,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/jruby_art-2.4.2.jar
+- lib/jruby_art-2.6.0.jar
 - lib/jruby_art.rb
 - lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
@@ -89,7 +89,11 @@ files:
 - library/library_proxy/README.md
 - library/library_proxy/library_proxy.rb
 - library/net/net.rb
+- library/pdf/itextpdf-5.5.13.2.jar
+- library/pdf/pdf.rb
 - library/slider/slider.rb
+- library/svg/batik-all-1.14.jar
+- library/svg/svg.rb
 - library/vector_utils/vector_utils.rb
 - library/video_event/video_event.rb
 - vendors/Rakefile
@@ -116,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 11.0.3+
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.