Merge pull request #17 from ruby-processing/data_path

Data path

Author: monkstone

CHANGELOG.md

@@ -1,5 +1,6 @@
-**v1.0.8** Exposed Constrain functionality for ArcBall, added literate perspektive method. No longer trying to expose `sketchPath` variable (that was private since recent changes to vanilla processing), but provided an overloaded `sketchPath` method. Re-factor `MathTool` module class (jruby extension) to a simpler more correct form. Recommending the use of latest processing-3.1.1.
+**v1.1.0** Using ruby to implement the `data_path` wrapper (to avoid java permission issues). Any macosx users that have problems with accessing the local data folders should use this wrapper within `load_image`, `load_shader` etc or provide the absolute path to the data file eg `File.absolute_path('data/image.png')`. Using the `data_path` wrapper or providing the absolute data path also may fix the permission issue that required the `--no-jruby` flag (tested on linux). Includes update to jruby-complete-9.1.1.0.
 
+**v1.0.8** Exposed Constrain functionality for ArcBall, added literate perspektive method. No longer trying to expose `sketchPath` variable (that was private since recent changes to vanilla processing), but provided an overloaded `sketchPath` method. Re-factor `MathTool` module class (jruby extension) to a simpler more correct form. Recommending the use of latest processing-3.1.1.
 **v1.0.7** Added tool to efficiently convert an Array of web colour Strings to and Array of color int (should be used by users of hype library, that uses of web strings in most of its examples). Update to use jruby-complete-9.1.0.0.
 
 **v1.0.6** Experimental support for an in sketch slider, examples now featuring Joshua Davis hype library.
@@ -8,7 +9,7 @@
 
 **v1.0.4** Using jruby-complete-9.0.5.0. Adding javadoc, with links to jruby.api and processing.api
 
-**v1.0.3** Build now using processing-3.0.1 core and matching video jars from maven central and pom.rb build file (polyglot maven), furthermore using maven-wrapper so maven version isn't even required see mvnw and mvwm.bat and .mvn/maven-wrapper.properties. The pom.xml is not needed but included for completness.
+**v1.0.3** Build now using processing-3.0.1 core and matching video jars from maven central and pom.rb build file (polyglot maven), furthermore using maven-wrapper so maven version is not even required see mvnw and mvwm.bat and .mvn/maven-wrapper.properties. The pom.xml is not needed but included for completness.
 
 **v1.0.2** Various cleanups, favoring SHA256 over SHA1 to check jruby-complete
 

jruby_art.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email = '[email protected]'
   spec.description = <<-EOS
   JRubyArt is a ruby wrapper for the processing art framework.
-  This version supports processing-3.1.1, and uses jruby-9.1.0.0  as the glue 
+  This version supports processing-3.1.1, and uses jruby-9.1.1.0  as the glue 
   between ruby and java. You can use both processing libraries and ruby gems 
   in your sketches. Features create/run/watch/live modes. The "watch" mode,
   provides a nice REPL-ish way to work on your processing sketches. Includes:-

lib/jruby_art/app.rb

@@ -125,11 +125,17 @@ def sketch_title(title)
       surface.set_title(title)
     end
 
-    def sketchPath(spath = nil)
+    def sketch_path(spath = nil)
       return super() if spath.nil?
       super(spath)
     end
 
+    def data_path(dat)
+      dat_root = File.join(SKETCH_ROOT, 'data')
+      Dir.mkdir(dat_root) unless File.exist?(dat_root)    
+      File.join(dat_root, dat)	    
+    end
+
     def sketch_size(x, y)
       surface.set_size(x, y)
     end

lib/jruby_art/helper_methods.rb

@@ -136,11 +136,6 @@ def java_self
       @java_self ||= to_java(Java::ProcessingCore::PApplet)
     end
 
-    # Get the sketch path
-    def sketch_path
-      @declared_fields['sketchPath'].value(java_self)
-    end
-
     # Fields that should be made accessible as under_scored.
     define_method(:mouse_x) { mouseX }
 

lib/jruby_art/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.0.8'
+  VERSION = '1.1.0'
 end

pom.rb

@@ -5,7 +5,7 @@
 project 'rp5extras', 'https://github.com/ruby-processing/JRubyArt' do
 
   model_version '4.0.0'
-  id 'ruby-processing:rp5extras', '1.0.8'
+  id 'ruby-processing:rp5extras', '1.1.0'
   packaging 'jar'
 
   description 'rp5extras for JRubyArt'
@@ -35,7 +35,7 @@
     'jruby.api' => 'http://jruby.org/apidocs/'
   )
 
-  pom 'org.jruby:jruby:9.1.0.0'
+  pom 'org.jruby:jruby:9.1.1.0'
   jar 'org.processing:core:3.1'
   jar 'org.processing:video:3.0.2'
   plugin_management do

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>rp5extras</artifactId>
-  <version>1.0.8</version>
+  <version>1.0.9</version>
   <name>rp5extras</name>
   <description>rp5extras for JRubyArt</description>
   <url>https://github.com/ruby-processing/JRubyArt</url>

test/k9_run_test.rb

@@ -25,7 +25,7 @@ def test_sketch_path
         end
       end
     end
-    assert_match('/home/tux/JRubyArt/test', out, 'Failed Sketch Path Sketch')
+    assert_match('/home/tux/data_path/test', out, 'Failed Sketch Path Sketch')
   end
 
   def test_on_top

vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '9.1.0.0'
-EXAMPLES           = '1.7'
+JRUBYC_VERSION     = '9.1.1.0'
+EXAMPLES           = '1.0'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "8a4b5f4cbdcfd43272002a543a59abfbf419577ef679273d4893a4f09594267e")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "659a2b120a02e8df55dddf3836e34023c80313a1c08b159ba3882f7d25ff8ef2")
 end
 
 directory "../lib/ruby"
@@ -59,9 +59,9 @@ file_name = (MAC_OR_LINUX.nil?) ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
   begin
     if MAC_OR_LINUX.nil?
-      sh "wget https://github.com/ruby-processing/samples4ruby-processing3/archive/#{EXAMPLES}.zip"
+      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
     else
-      sh "wget https://github.com/ruby-processing/samples4ruby-processing3/archive/#{EXAMPLES}.tar.gz"
+      sh "wget https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
     end
   rescue
     warn(WARNING)
@@ -78,4 +78,4 @@ task :copy_examples => file_name do
   sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/k9_samples"
   sh "cp -r samples4ruby-processing3-#{EXAMPLES} #{HOME_DIR}/k9_samples"  
   sh "rm -r samples4ruby-processing3-#{EXAMPLES}"
-end  
+end