ruby-processing 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e7df4d8034c02dcfe15463749d38214bbe608f
-  data.tar.gz: e4a17499eeb39eadc078e071eb05b277afd2c03f
+  metadata.gz: c0aaf568197ed0c33de6d5ee76ee799e488dbf7c
+  data.tar.gz: 141086257f20b9b623a7092ba17b857e22e0e694
 SHA512:
-  metadata.gz: 8bfc1d032a6c94051c9a727f4daa0523dc4429cb02744a34c0f6f20c84a220a653d3ba1b6716a9745622a1fd1465d9ce5506b1fe1f238980dfb64181c2f03686
-  data.tar.gz: d555e878a9d35ea17fc64ae4f713413364c943e92be126e2b9683b503ab4db7d03b3ac8c1b68a775770a7c9a636e059614f4a4109b8e9757ec1a10865e5f93ab
+  metadata.gz: 4dcfc3f5a0ae54e209ffd00ce00844287a3c5811ba352b657a42d9e47d526466a6ab97ed535b4a50d4fe6f615fc81f686008b54fe3ecb80cf2a6e95e149fe4e0
+  data.tar.gz: 05c8de38b6678bcbb3ee193306deed6c8f4d9d45a3b9762bd62465ef27b6b1ef0581fdf2e5e035d083b049086b899ea9d4897b2507be605ae41d6f0c9beca0de

data/lib/ruby-processing/app.rb

@@ -7,10 +7,10 @@ require_relative '../ruby-processing/helper_methods'
 require_relative '../ruby-processing/library_loader'
 require_relative '../ruby-processing/config'
 
-Dir["#{Processing::RB_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar| require jar }
+Dir["#{Processing::RP_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each { |jar| require jar }
 
 # Include some core processing classes that we'd like to use:
-%w(PApplet PConstants PFont PImage PShape PShapeOBJ PShapeSVG PStyle 
+%w(PApplet PConstants PFont PImage PShape PShapeOBJ PShapeSVG PStyle
    PGraphicsJava2D PGraphics PFont PVector PMatrix2D PMatrix3D).each do |klass|
   java_import "processing.core.#{klass}"
 end
@@ -54,8 +54,8 @@ module Processing
       if methods_to_alias.key?(method_name)
         alias_method methods_to_alias[method_name], method_name
       end
-    end    
-   
+    end
+
     # Handy getters and setters on the class go here:
     def self.sketch_class;  @sketch_class;        end
     @@full_screen = false
@@ -92,15 +92,15 @@ module Processing
 
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
-    end    
+    end
 
-    # It is 'NOT' usually necessary to directly pass options to a sketch, it 
+    # It is 'NOT' usually necessary to directly pass options to a sketch, it
     # gets done automatically for you. Since processing-2.0 you should prefer
     # setting the sketch width and height and renderer using the size method,
-    # in the sketch (as with vanilla processing), which should be the first 
+    # in the sketch (as with vanilla processing), which should be the first
     # argument in setup. Sensible options to pass are x and y to locate sketch
     # on the screen, or full_screen: true (prefer new hash syntax)
-   
+
     def initialize(options={})
       super()
       $app = self
@@ -161,6 +161,7 @@ module Processing
     # Provide a loggable string to represent this sketch.
     def inspect
       "#<Processing::App:#{self.class}:#{@title}>"
+      #"#<Processing::App:#{self.class}>"
     end
 
     # Cleanly close and shutter a running sketch.
@@ -202,8 +203,8 @@ module Processing
 
     # Proxy methods through to the sketch.
     def self.proxy_methods(inner_class)
-      code = desired_method_names(inner_class).inject('') do |code, method|
-        code << <<-EOS
+      code = desired_method_names(inner_class).inject('') do |rcode, method|
+        rcode << <<-EOS
         def #{method}(*args, &block)                # def rect(*args, &block)
         if block_given?                           #   if block_given?
         $app.send :'#{method}', *args, &block   #     $app.send(:rect, *args, &block)

data/lib/ruby-processing/config.rb

@@ -3,13 +3,13 @@ require 'psych'
 module Processing
 
   if Processing.exported?
-    RB_CONFIG = { 'PROCESSING_ROOT' => RP5_ROOT, 'JRUBY' => 'false' }
+    RP_CONFIG = { 'PROCESSING_ROOT' => RP5_ROOT, 'JRUBY' => 'false' }
   end
 
-  unless defined? RB_CONFIG
+  unless defined? RP_CONFIG
     begin
-      CONFIG_FILE_PATH=File.expand_path('~/.rp5rc')
-      RB_CONFIG = (Psych.load_file(CONFIG_FILE_PATH))
+      CONFIG_FILE_PATH = File.expand_path('~/.rp5rc')
+      RP_CONFIG = (Psych.load_file(CONFIG_FILE_PATH))
     rescue
       warn('WARNING: you need to set PROCESSING_ROOT in ~/.rp5rc')
     end

data/lib/ruby-processing/exporters/application_exporter.rb

@@ -1,7 +1,8 @@
 require 'rbconfig'
+require_relative 'base_exporter'
 
 module Processing
-  require_relative '../../ruby-processing/exporters/base_exporter'
+
   # A utility class to export Ruby-Processing sketches as
   # Mac/Win/Nix Applications.
   class ApplicationExporter < BaseExporter
@@ -43,7 +44,7 @@ module Processing
       @prefix = 'lib'
       cp_r(Dir["#{RP5_ROOT}/lib/templates/application/{*,**}"], @dest)
       @necessary_files = [@main_file_path]
-      @necessary_files += Dir["#{RB_CONFIG['PROCESSING_ROOT']}/core/library/{*,**}"]
+      @necessary_files += Dir["#{RP_CONFIG['PROCESSING_ROOT']}/core/library/{*,**}"]
       @necessary_files += Dir["#{RP5_ROOT}/lib/{*,**}"]
       @necessary_files += @real_requires
       NECESSARY_FOLDERS.each do |folder|
@@ -55,19 +56,19 @@ module Processing
       cp_r(@libraries, File.join(@dest, @prefix, 'library')) unless @libraries.empty?
       # Then move the icon
       potential_icon = Dir.glob(File.join(@dest, @prefix, 'data/*.icns'))[0]
-      move(potential_icon, File.join(@dest, 'Contents/Resources/sketch.icns'), force: true) if potential_icon 
+      move(potential_icon, File.join(@dest, 'Contents/Resources/sketch.icns'), force: true) if potential_icon
     end
 
     def calculate_substitutions
       file_list = ['lib/ruby/jruby-complete.jar']
-      @class_path = file_list.map { |f| '$JAVAROOT/' + f.sub(@prefix+'/', '') }.join(':')
+      @class_path = file_list.map { |f| '$JAVAROOT/' + f.sub(@prefix + "/", '') }.join(":")
       @linux_class_path = '.:../lib/ruby/*:../lib/*:../lib/library/*'
       @windows_class_path = '.;../lib/ruby/*;../lib/*;../lib/library/*'
     end
 
     def create_executables
       render_erb_in_path_with_binding(@dest, binding, delete: true)
-      rm Dir.glob(@dest + '/**/*.java')
+      rm Dir.glob(@dest + "/**/*.java")
       runnable = @dest + '/' + File.basename(@main_file, '.rb')
       move @dest + '/run', runnable
       move @dest + '/run.exe', "#{runnable}.exe"

data/lib/ruby-processing/exporters/base_exporter.rb

@@ -1,6 +1,6 @@
 require 'fileutils'
 require 'erb'
-require_relative '../../ruby-processing/library_loader'
+require_relative '../library_loader'
 
 module Processing
   # This base exporter implements some of the common
@@ -42,8 +42,7 @@ module Processing
 
     # Searches the source for a title.
     def extract_title(source)
-      filter = /#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+?)["']/m
-      match = source.match(filter)
+      match = source.match(/#{@info[:class_name]}\.new.*?:title\s=>\s["'](.+?)["']/m)
       match ? match[1] : File.basename(@file, '.rb').titleize
     end
 
@@ -103,7 +102,6 @@ module Processing
       requirements
     end
 
-
     protected
 
     def read_source_code
@@ -115,7 +113,7 @@ module Processing
     end
 
     def hash_to_ivars(hash)
-      hash.each { |k, v| instance_variable_set('@' + k.to_s, v) }
+      hash.each { |k, v| instance_variable_set("@#{k}", v) }
     end
 
     def wipe_and_recreate_destination
@@ -124,7 +122,7 @@ module Processing
     end
 
     def render_erb_in_path_with_binding(path, some_binding, opts = {})
-      erbs = Dir.glob(path + '/**/*.erb')
+      erbs = Dir.glob(path + "/**/*.erb") # double quotes required
       erbs.each do |erb|
         string = File.open(erb) { |f| f.read }
         rendered = render_erb_from_string_with_binding(string, some_binding)
@@ -138,4 +136,3 @@ module Processing
     end
   end
 end
-

data/lib/ruby-processing/exporters/creator.rb

@@ -1,8 +1,33 @@
 module Processing
-  require_relative '../../ruby-processing/exporters/base_exporter'
-  Param = Struct.new(:name, :file_name, :title, :width, :height, :mode)
+  require 'erb'
+
+  class SketchWriter
+    include ERB::Util
+
+    def initialize(template, param = {})
+      @name = param[:name]
+      @file_name = param[:file_name]
+      @title = param[:title]
+      @width = param[:width]
+      @height = param[:height]
+      @mode = param[:mode].upcase unless param[:mode].nil?
+      @template = template
+      save(@file_name)
+    end
+
+    def render
+      ERB.new(@template).result(binding)
+    end
+
+    def save(file)
+      File.open(file, 'w+') do |f|
+        f.write(render)
+      end
+    end
+  end
+
   # An abstract class providing common methods for real creators
-  class Creator < BaseExporter
+  class Creator
 
     ALL_DIGITS = /\A\d+\Z/
 
@@ -24,90 +49,139 @@ module Processing
       mode can be P2D / P3D.
       Use    --wrap for a sketch wrapped as a class
       Use    --inner to generated a ruby version of 'java' Inner class
-      Examples: rp5 create fancy_drawing/app 800 600
-      rp5 create fancy_drawing/app 800 600 P3D --wrap
+      Examples: rp5 create app 800 600
+      rp5 create app 800 600 p3d --wrap
       rp5 create inner_class --inner
 
       USAGE
     end
 
-    def create_file(path, param, rendered, type)
-      # Make the file
-      dir = File.dirname path
-      mkdir_p dir
-      ful_path = File.join(dir, "#{param.file_name}.rb")
-      File.open(ful_path, 'w') { |f| f.print(rendered) }
-      puts "Created #{type} \"#{param.title}\" in #{ful_path.sub(/\A\.\//, '')}"
-    end
   end
 
   # This class creates bare sketches, with an optional render mode
   class BasicSketch < Creator
     # Create a blank sketch, given a path.
+    def basic_template
+%{
+def setup
+  size <%=@width%>, <%=@height%>
+end
+
+def draw
+
+end
+}
+    end
+
+    def basic_template_mode
+%{
+def setup
+  size <%=@width%>, <%=@height%>, <%=@mode%>
+end
+
+def draw
+
+end
+}
+    end
+
     def create!(path, args)
       return usage if /\?/ =~ path || /--help/ =~ path
       main_file = File.basename(path, '.rb')
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = Param.new(
-        main_file.camelize,
-        main_file.underscore,
-        main_file.titleize,
-        args[0],
-        args[1],
-        args[2]
-        )
-      @with_size = @param.width && @param.width.match(ALL_DIGITS) &&
-        @param.height && @param.height.match(ALL_DIGITS)
-      template_name = @param.mode.nil? ? 'basic.rb.erb' : 'basic_mode.rb.erb'
-      template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
-      rendered = render_erb_from_string_with_binding(template.read, binding)
-      create_file(path, @param, rendered, 'Sketch')
+      @param = {
+        name: main_file.camelize,
+        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
+        title: main_file.titleize,
+        width: args[0],
+        height: args[1],
+        mode: args[2]
+      }
+      @with_size = @param[:width] && @param[:width].match(ALL_DIGITS) &&
+        @param[:height] && @param[:height].match(ALL_DIGITS)
+      template = @param[:mode].nil? ? basic_template : basic_template_mode
+      SketchWriter.new(template, @param)
     end
   end
 
   # This class creates class wrapped sketches, with an optional render mode
   class ClassSketch < Creator
+
+    def class_template
+%{
+class <%=@name%> < Processing::App
+  def setup
+    size <%=@width%>, <%=@height%>
+  end
+
+  def draw
+
+  end
+end
+
+# <%=@name%>.new(x: 20, y: 20)
+}
+    end
+
+    def class_template_mode
+%{
+class <%=@name%> < Processing::App
+  def setup
+    size <%=@width%>, <%=@height%>, <%=@mode%>
+  end
+
+  def draw
+
+  end
+end
+
+# <%=@name%>.new(x: 20, y: 20)
+}
+    end
     # Create a bare blank sketch, given a path.
     def create!(path, args)
       return usage if /\?/ =~ path || /--help/ =~ path
       main_file = File.basename(path, '.rb')
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = Param.new(
-        main_file.camelize,
-        main_file.underscore,
-        main_file.titleize,
-        args[0],
-        args[1],
-        args[2]
-        )
-      @with_size = @param.width && @param.width.match(ALL_DIGITS) &&
-        @param.height && @param.height.match(ALL_DIGITS)
-      t_name = @param.mode.nil? ? 'basic_wrap.rb.erb' : 'mode_wrap.rb.erb'
-      template = File.new("#{RP5_ROOT}/lib/templates/create/#{t_name}")
-      rendered = render_erb_from_string_with_binding(template.read, binding)
-      create_file(path, @param, rendered, 'Sketch')
+      @param = {
+        name: main_file.camelize,
+        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
+        title: main_file.titleize,
+        width: args[0],
+        height: args[1],
+        mode: args[2]
+      }
+      @with_size = @param[:width] && @param[:width].match(ALL_DIGITS) &&
+        @param[:height] && @param[:height].match(ALL_DIGITS)
+      template = @param[:mode].nil? ? class_template : class_template_mode
+      SketchWriter.new(template, @param)
     end
   end
 
   # This class creates a ruby-processing class that mimics java inner class
   class Inner < Creator
+    def inner_class_template
+%{
+class <%=@name%>
+  include_module Processing::Proxy
+
+end
+}
+    end
     # Create a blank sketch, given a path.
     def create!(path, _args_)
       return usage if /\?/ =~ path || /--help/ =~ path
       main_file = File.basename(path, '.rb')
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = Param.new(
-        main_file.camelize,
-        main_file.underscore,
-        main_file.titleize
-        )
-      template_name = 'inner_class.rb.erb'
-      template = File.new("#{RP5_ROOT}/lib/templates/create/#{template_name}")
-      rendered = render_erb_from_string_with_binding(template.read, binding)
-      create_file(path, @param, rendered, "\"Inner Class\"")
+      @param = {
+        name: main_file.camelize,
+        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
+        title: main_file.titleize
+      }
+      SketchWriter.new(inner_class_template, @param)
     end
   end
 end

data/lib/ruby-processing/helper_methods.rb

@@ -56,14 +56,14 @@ module Processing
 
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
-    def thread(*args, &block)
+    def thread(&block)
       if block_given?
-        Thread.new *args, &block
+        Thread.new(&block)
       else
         fail ArgumentError, 'thread must be called with a block' , caller
       end
     end
-    
+
     # Explicitly provides 'processing.org' map instance method, in which
     # value is mapped from range 1, to range 2 (NB: values are not clamped to
     # range 1). It may be better to explicitly write your own interpolate function
@@ -98,7 +98,7 @@ module Processing
     def max(*args)
       args.max { |a, b| a <=> b }
     end
-    
+
     # explicitly provide 'processing.org' abs instance method
     def abs(val)
       warn 'abs(val) is deprecated use val.abs to avoid this warning'
@@ -110,7 +110,7 @@ module Processing
       warn 'ceil(val) is deprecated use val.ceil to avoid this warning'
       val.ceil
     end
-    
+
     # explicitly provide 'processing.org' round instance method
     def round(val)
       warn 'round(val) is deprecated use val.round to avoid this warning'
@@ -144,37 +144,37 @@ module Processing
       warn 'radians(theta) is deprecated use theta.radians to avoid this warning'
       theta.radians
     end
-    
+
         # explicitly provide 'processing.org' degrees instance method
     def degrees(theta)
       warn 'degrees(theta) is deprecated use theta.radians to avoid this warning'
       theta.degrees
     end
-    
+
     # explicitly provide 'processing.org' hex instance method
     def hex(x)
       warn 'hex(x) is deprecated use x.hex to avoid this warning'
       x.hex
     end
-    
+
      # explicitly provide 'processing.org' unhex instance method
     def unhex(str)
       warn 'unhex(str) is deprecated use str.to_i(base=16)'
       str.to_i(base=16)
     end
-    
+
     # explicitly provide 'processing.org' binary instance method
     def binary(x)
       warn 'binary(x) is deprecated use x.to_s(2) to avoid this warning'
       x.to_s(2)
     end
-    
+
     # explicitly provide 'processing.org' unbinary instance method
-    def unhex(str)
+    def unbinary(str)
       warn 'unbinary(str) is deprecated use str.to_i(base=2)'
       str.to_i(base=2)
     end
-    
+
     # explicitly provide 'processing.org' nf instance method
     def nf(*args)
       warn 'nf(num, digits) is deprecated use num.to_s.rjust(digits) '\
@@ -199,37 +199,35 @@ module Processing
         fail ArgumentError, 'takes 2 or 3 parameters'
       end
     end
-    
     # explicitly provide 'processing.org' trim instance method
     def trim(str)
       warn 'deprecated use str.strip'
       str.strip
     end
-    
+
     # explicitly provide 'processing.org' println instance method
     def println(str)
       warn 'deprecated use puts(str)'
       puts str
     end
-    
+
     # explicitly provide 'processing.org' hour instance method
     def hour
       warn 'deprecated use t = Time.now and t.hour'
       PApplet.hour
     end
-    
+
     # explicitly provide 'processing.org' second instance method
     def second
       warn 'deprecated use t = Time.now and t.sec'
       PApplet.second
     end
-    
+
     # explicitly provide 'processing.org' minute instance method
     def minute
-       'deprecated use t = Time.now and t.min'
       PApplet.minute
     end
-    
+
     # Uses PImage class method under hood
     def blend_color(c1, c2, mode)
       PImage.blendColor(c1, c2, mode)
@@ -252,9 +250,9 @@ module Processing
 
     # By default, your sketch path is the folder that your sketch is in.
     # If you'd like to do something fancy, feel free.
-    def set_sketch_path(path = nil)
+    def set_sketch_path(spath = nil)
       field = @declared_fields['sketchPath']
-      field.set_value(java_self, path || SKETCH_ROOT)
+      field.set_value(java_self, spath || SKETCH_ROOT)
     end
 
     # Fix java conversion problems getting the last key

data/lib/ruby-processing/library_loader.rb

@@ -53,14 +53,14 @@ module Processing
     def load_java_library(library_name)
       library_name = library_name.to_sym
       return true if @loaded_libraries[library_name]
-      path = get_library_directory_path(library_name, 'jar')
+      jpath = get_library_directory_path(library_name, 'jar')
       jars = get_library_paths(library_name, 'jar')
       return false if jars.empty?
       jars.each {|jar| require jar }
 
-      platform_specific_library_paths = get_platform_specific_library_paths(path)
-      platform_specific_library_paths = platform_specific_library_paths.select do |path|
-        test(?d, path) && !Dir.glob(File.join(path, '*.{so,dll,jnilib}')).empty?
+      platform_specific_library_paths = get_platform_specific_library_paths(jpath)
+      platform_specific_library_paths = platform_specific_library_paths.select do |ppath|
+        test(?d, ppath) && !Dir.glob(File.join(ppath, '*.{so,dll,jnilib}')).empty?
       end
 
       if !platform_specific_library_paths.empty?
@@ -106,14 +106,14 @@ module Processing
       extensions = extension ? [extension] : %w{jar rb}
       extensions.each do |ext|
         [ "#{SKETCH_ROOT}/library/#{library_name}",
-          "#{Processing::RB_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
+          "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
           "#{RP5_ROOT}/library/#{library_name}/library",
           "#{RP5_ROOT}/library/#{library_name}",
           "#{@sketchbook_library_path}/#{library_name}/library",
           "#{@sketchbook_library_path}/#{library_name}"
-        ].each do |path|
-          if File.exist?(path) && !Dir.glob(path + "/*.#{ext}").empty?
-            return path
+        ].each do |jpath|
+          if File.exist?(jpath) && !Dir.glob(jpath + "/*.#{ext}").empty?
+            return jpath
           end
         end
       end
@@ -123,19 +123,19 @@ module Processing
     def find_sketchbook_path
       preferences_paths = []
       sketchbook_paths = []
-      if sketchbook_path = Processing::RB_CONFIG['sketchbook_path']
+      if sketchbook_path = Processing::RP_CONFIG['sketchbook_path']
         return File.expand_path(sketchbook_path)
       else
         ["'Application Data/Processing'", 'AppData/Roaming/Processing',
          'Library/Processing', 'Documents/Processing',
          '.processing', 'sketchbook'].each do |prefix|
-          path = "#{ENV['HOME']}/#{prefix}"
-          pref_path = path+'/preferences.txt'
+          spath = "#{ENV['HOME']}/#{prefix}"
+          pref_path = spath + '/preferences.txt'
           if test(?f, pref_path)
             preferences_paths << pref_path
           end
-          if test(?d, path)
-            sketchbook_paths << path
+          if test(?d, spath)
+            sketchbook_paths << spath
           end
         end
         if !preferences_paths.empty?

data/lib/ruby-processing/runner.rb

@@ -34,7 +34,7 @@ module Processing
     Examples:
     rp5 setup unpack_samples
     rp5 run samples/contributed/jwishy.rb
-    rp5 create some_new_sketch 640 480 p3d (P3D mode example) 
+    rp5 create some_new_sketch 640 480 p3d (P3D mode example)
     rp5 create some_new_sketch 640 480 --wrap (a class wrapped default sketch)
     rp5 watch some_new_sketch.rb
 
@@ -69,13 +69,13 @@ module Processing
     # Parse the command-line options. Keep it simple.
     def parse_options(args)
       @options = OpenStruct.new
-      @options.wrap   = !args.delete('--wrap').nil?
-      @options.inner   = !args.delete('--inner').nil?
-      @options.jruby  = !args.delete('--jruby').nil?
-      @options.nojruby  = !args.delete('--nojruby').nil?
-      @options.action = args[0]     || nil
-      @options.path   = args[1]     || File.basename(Dir.pwd + '.rb')
-      @options.args   = args[2..-1] || []
+      @options.wrap = !args.delete('--wrap').nil?
+      @options.inner = !args.delete('--inner').nil?
+      @options.jruby = !args.delete('--jruby').nil?
+      @options.nojruby = !args.delete('--nojruby').nil?
+      @options.action = args[0] || nil
+      @options.path = args[1] || File.basename(Dir.pwd + '.rb')
+      @options.args = args[2..-1] || []
     end
 
     # Create a fresh Ruby-Processing sketch, with the necessary
@@ -139,9 +139,9 @@ module Processing
     def check(proc_root, installed)
       show_version
       root = '  PROCESSING_ROOT = Not Set!!!' unless proc_root
-      root ||= "  PROCESSING_ROOT = #{Processing::RB_CONFIG['PROCESSING_ROOT']}"
+      root ||= "  PROCESSING_ROOT = #{Processing::RP_CONFIG['PROCESSING_ROOT']}"
       puts root
-      puts "  JRUBY = #{Processing::RB_CONFIG['JRUBY']}"
+      puts "  JRUBY = #{Processing::RP_CONFIG['JRUBY']}"
       puts "  jruby-complete installed = #{installed}"
     end
 
@@ -167,7 +167,7 @@ module Processing
     def spin_up(starter_script, sketch, args)
       runner = "#{RP5_ROOT}/lib/ruby-processing/runners/#{starter_script}"
       warn('The --jruby flag is no longer required') if @options.jruby
-      @options.nojruby = true if Processing::RB_CONFIG['JRUBY'] == 'false'
+      @options.nojruby = true if Processing::RP_CONFIG['JRUBY'] == 'false'
       java_args = discover_java_args(sketch)
       command = @options.nojruby ?
         ['java', java_args, '-cp', jruby_complete, 'org.jruby.Main', runner, sketch, args].flatten :
@@ -185,8 +185,8 @@ module Processing
       args += dock_icon
       if File.exist?(arg_file)
         args += File.read(arg_file).split(/\s+/)
-      elsif Processing::RB_CONFIG['java_args']
-        args += Processing::RB_CONFIG['java_args'].split(/\s+/)
+      elsif Processing::RP_CONFIG['java_args']
+        args += Processing::RP_CONFIG['java_args'].split(/\s+/)
       end
       args.map! { |arg| "-J#{arg}" } unless @options.nojruby
       args
@@ -231,7 +231,7 @@ module Processing
       data = {}
       path = File.expand_path("#{ENV['HOME']}/.rp5rc")
       if @os == :macosx
-        data['PROCESSING_ROOT'] = %q(/Applications/Processing.app/Contents/Java')
+        data['PROCESSING_ROOT'] = %q(/Applications/Processing.app/Contents/Java)
       else
         root = "#{ENV['HOME']}/processing-2.2.1"
         data['PROCESSING_ROOT'] = root

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/lib/templates/create/blank_sketch.rb.erb

@@ -0,0 +1,7 @@
+def setup
+  <%= "size #{@width}, #{@height}" if @with_size %>
+end
+
+def draw
+  
+end

data/lib/templates/create/p3d_sketch.rb.erb

@@ -0,0 +1,7 @@
+def setup
+  <%= "size #{@width}, #{@height}, P3D" if @with_size %>
+end
+
+def draw
+  
+end

data/samples/contributed/fibonacci_sphere.rb

@@ -34,7 +34,7 @@ end
 def draw    
   if add_points 
     @nbr_points += 1
-    @nbr_points = min(nbr_points, KMAX_POINTS)
+    @nbr_points = [nbr_points, KMAX_POINTS].min
     init_sphere(nbr_points)
   end
   
@@ -52,7 +52,7 @@ end
 
 def render_globe
   push_matrix
-  (0 .. min(nbr_points, pts.length)).each do |i|    
+  (0 .. [nbr_points, pts.length].min).each do |i|    
     lat = pts[i].lat 
     lon = pts[i].lon    
     push_matrix

data/samples/processing_app/basics/form/pie_chart.rb

@@ -13,7 +13,7 @@ def setup
   smooth(4)
   no_stroke
   
-  diameter = min(width, height) * 0.75
+  diameter = [width, height].min * 0.75
   angles = [30, 10, 45, 35 ,60, 38, 75, 67]
   last_angle = 0.0
   

data/samples/processing_app/basics/form/triangle_strip.rb

@@ -13,7 +13,7 @@ def setup
   size 640, 360  
   @x = width/2
   @y = height/2
-  @outer_radius = min(width, height) * 0.4
+  @outer_radius = [width, height].min * 0.4
   @inner_radius = outer_radius * 0.6
 end
 

data/samples/processing_app/library/vecmath/vec3d/library/hilbert/hilbert.rb

@@ -45,8 +45,8 @@ class Hilbert
     @grammar = Grammar.new(axiom, rule) 
     @production = grammar.generate gen
     @distance = size / (gen**2 - 1)
-    @theta = radians 90
-    @phi = radians 90  
+    @theta = 90.radians
+    @phi = 90.radians  
     @adj_array = [0, 0.5, 1.5, 3.5, 7.5, 15].map { |x| Vec3D.new(x * -1, x, x * -1) }
   end
 

data/samples/processing_app/topics/gui/handles.rb

@@ -102,7 +102,7 @@ class Handle
     (mouse_x >= x && mouse_x <= x + width && mouse_y >= y && mouse_y <= y + height)
   end
   
-  def lock(val, minv, maxv) 
-    min(max(val, minv), maxv) 
-  end 
+  def lock(val, first, last)
+    constrain(val, first, last)
+  end
 end

data/samples/processing_app/topics/gui/scrollbar.rb

@@ -42,12 +42,11 @@ def draw
 end
 
 
-class HScrollbar
-
+class HScrollbar 
+  include Processing::Proxy
   attr_reader :swidth, :sheight, :xpos, :ypos, :spos, :newspos
   attr_reader :spos_max, :spos_min, :loose, :over, :locked, :ratio 
   def initialize(xp, yp, sw, sh, l)
-    super
     @swidth = sw
     @sheight = sh
     widthtoheight = sw - sh
@@ -68,10 +67,6 @@ class HScrollbar
     @spos = spos + (newspos - spos) / loose if (newspos - spos).abs > 1
   end
 
-  def constrain(val, minv, maxv)
-    min(max(val, minv), maxv)
-  end
-
   def over_event?
     (mouse_x > xpos && mouse_x < xpos + swidth && mouse_y > ypos && mouse_y < ypos + sheight)
   end

data/samples/processing_app/topics/image_processing/histogram.rb

@@ -14,30 +14,30 @@ def setup
   
   # Load an image from the data directory
   # Load a different image by modifying the comments
-  img = loadImage('frontier.jpg')
+  img = load_image('frontier.jpg')
   image(img, 0, 0)
+  img.load_pixels
   @hist = Array.new(256, 0)
   
   # Calculate the histogram
   (0 ... img.width).each do |i|
     (0 ... img.height).each do |j|
-      bright = (brightness(get(i, j))).to_i
+      bright = (brightness(img.pixels[j * img.width + i]))
       hist[bright] += 1  
     end
   end
   
-  # Find the largest value in the histogram using processings max function
-  # that's why we use to java cinversion
-  histMax = max(hist.to_java Java::int)
+  # Find the largest value in the histogram using ruby array max function
+  hist_max = hist.max
   
   stroke(255)
   # Draw half of the histogram (skip every second value)
   (0 ... img.width).step(2) do |i|
     # Map i (from 0..img.width) to a location in the histogram (0..255)
-    which = (map(i, 0, img.width, 0, 255)).to_i
+    which = map(i, 0, img.width, 0, 255)
     # Convert the histogram value to a location between 
     # the bottom and the top of the picture
-    y = (map(hist[which], 0, histMax, img.height, 0)).to_i
+    y = map(hist[which], 0, hist_max, img.height, 0)
     line(i, img.height, i, y)
   end
 end

data/samples/processing_app/topics/simulate/spring.rb

@@ -66,8 +66,7 @@ def update_spring
   # Set and constrain the position of top bar
   if (@move) 
     @ps = mouseY - @s_height/2
-    @ps = @min if (@ps < @min)
-    @ps = @max if (@ps > @max)
+    @ps = constrain(@ps, @min, @max)
   end
 end
 

data/vendors/Rakefile

@@ -8,7 +8,7 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBY_VERSION      = "1.7.13"
+JRUBY_VERSION      = "1.7.14"
 
 CLOBBER.include("jruby-complete-#{JRUBY_VERSION}.jar")
 
@@ -21,7 +21,7 @@ task :download => ["jruby-complete-#{JRUBY_VERSION}.jar"]
 file "jruby-complete-#{JRUBY_VERSION}.jar" do
   begin
     sh "wget http://jruby.org.s3.amazonaws.com/downloads/#{JRUBY_VERSION}/jruby-complete-#{JRUBY_VERSION}.jar"
-    check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "0dfca68810a5eed7f12ae2007dc2cc47554b4cc6")
+    check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "ad70c18834a143afa6686ebcda27351ebfef7385")
   rescue
     warn(WARNING)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,11 +130,8 @@ files:
 - lib/templates/application/lib/library/library.txt
 - lib/templates/application/run.erb
 - lib/templates/application/run.exe
-- lib/templates/create/basic.rb.erb
-- lib/templates/create/basic_mode.rb.erb
-- lib/templates/create/basic_wrap.rb.erb
-- lib/templates/create/inner_class.rb.erb
-- lib/templates/create/mode_wrap.rb.erb
+- lib/templates/create/blank_sketch.rb.erb
+- lib/templates/create/p3d_sketch.rb.erb
 - library/boids/boids.rb
 - library/control_panel/control_panel.rb
 - library/fastmath/fastmath.rb

data/lib/templates/create/basic.rb.erb

@@ -1,10 +0,0 @@
-# <%= @param.file_name %>.rb
-
-def setup
-  <%= "size #{@param.width}, #{@param.height}" if @with_size %>
-  
-end
-
-def draw
-  
-end

data/lib/templates/create/basic_mode.rb.erb

@@ -1,10 +0,0 @@
-# <%= @param.file_name %>.rb
-
-def setup
-  <%= "size #{@param.width}, #{@param.height}, #{@param.mode.upcase}" if @with_size %>
-  
-end
-
-def draw
-  
-end

data/lib/templates/create/basic_wrap.rb.erb

@@ -1,15 +0,0 @@
-# <%= @param.file_name %>.rb
-
-class <%= @param.name %> < Processing::App
-
-  def setup
-    <%= "size #{@param.width}, #{@param.height}" if @with_size %>
-
-  end
-  
-  def draw
-  
-  end  
-end
-
-<%= @param.name %>.new(x: 20, y: 30)

data/lib/templates/create/inner_class.rb.erb

@@ -1,9 +0,0 @@
-# <%= @param.file_name %>.rb
-
-class <%= @param.name %>
-  include Processing::Proxy
- 
-  def initialize
-  
-  end  
-end

data/lib/templates/create/mode_wrap.rb.erb

@@ -1,15 +0,0 @@
-# <%= @param.file_name %>.rb
-
-class <%= @param.name %> < Processing::App
-
-  def setup
-    <%= "size #{@param.width}, #{@param.height}, #{@param.mode.upcase}" if @with_size %>
-    
-  end
-  
-  def draw
-  
-  end  
-end
-
-<%= @param.name %>.new(x: 20, y: 30)