ruby-processing 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c47bf5ca5b3ccfac13e28bc08b675ca3ebed4a4
-  data.tar.gz: 9f852f28cebf20c5f4f040da1f18b59c46520e49
+  metadata.gz: 591fe4a424a740865ae79dbf1060221b692ea81a
+  data.tar.gz: 5adb639c8832800b21f0877b33ddd366bfe73f44
 SHA512:
-  metadata.gz: 06009cf60df0dfd4d03655e8672d8dd6fcce75cc66892bc5ed7a5941b6ad81f3b36449bee4930b54ac2ef474e2834bc997436a354615a4dc71d5dfe7ab125523
-  data.tar.gz: e637f0ded0113ed8b710cf1b9107b7e17c4cee235b0caab5968d78eb1449710dab2639be81084790c30934ac6d4164a84f44e549667859bd39b61a8d6c0adebd
+  metadata.gz: ed7651d8224f586ba6fc194cee99bdbef01248485cbabc3b92cb31514e746d1fa74a65d72fb8b8c8f189df56484728b2afa1984a5711359bd29761e9acadd688
+  data.tar.gz: 050764df809b66e1b7434368d7135309d2e61d6d842c6f976dacac90be50affd027d10031c634903d1057e77fe7593d7cf54739a00c4985838d0d9211230d101

data/lib/ruby-processing.rb

@@ -1,10 +1,9 @@
 # Ruby-Processing is for Code Art.
 # Send suggestions, ideas, and hate-mail to jashkenas [at] gmail.com
 # Also, send samples and libraries.
-
 unless defined? RP5_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  RP5_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+  RP5_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 
 SKETCH_ROOT ||= Dir.pwd
@@ -12,21 +11,19 @@ SKETCH_ROOT ||= Dir.pwd
 require 'ruby-processing/version'
 require 'ruby-processing/helpers/string'
 require 'ruby-processing/helpers/numeric'
+require 'ruby-processing/helpers/range'
 
 # The top-level namespace, a home for all Ruby-Processing classes.
 module Processing
-
   def self.exported?
     @exported ||= ENV['EXPORTED'].eql?('true')
   end
 
   # Autoload a number of path/constants that we may end up using.
-  # mri ruby does not understand ** require 'java' ** and we may otherwise call it
-  # from mri ruby without lazy path loading of autoload
+  # mri ruby does not understand ** require 'java' ** and we may otherwise call
+  # it from mri ruby without lazy path loading of autoload
   # NB: autoload is slated for possible removal by ruby-2.2
-
   autoload :App,                  'ruby-processing/app'
   autoload :Runner,               'ruby-processing/runner'
   autoload :Watcher,              'ruby-processing/runners/watch'
-
-end
+end

data/lib/ruby-processing/app.rb

@@ -7,7 +7,7 @@ require_relative '../ruby-processing/helper_methods'
 require_relative '../ruby-processing/library_loader'
 require_relative '../ruby-processing/config'
 
-Dir["#{Processing::RP_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
@@ -29,7 +29,7 @@ module Processing
     include HelperMethods
 
     # Alias some methods for familiarity for Shoes coders.
-    #attr_accessor :frame, :title
+    # attr_accessor :frame, :title
     alias_method :oval, :ellipse
     alias_method :stroke_width, :stroke_weight
     alias_method :rgb, :color
@@ -57,11 +57,13 @@ module Processing
     end
 
     # Handy getters and setters on the class go here:
-    def self.sketch_class;  @sketch_class;        end
-    @@full_screen = false
-    def self.full_screen;   @@full_screen = true; end
-    def full_screen?;       @@full_screen;        end
-
+    class << self
+      attr_accessor :sketch_class
+    end
+    
+    def sketch_class
+      self.class.sketch_class
+    end
 
     # Keep track of what inherits from the Processing::App, because we're going
     # to want to instantiate one.
@@ -75,7 +77,7 @@ module Processing
       def load_libraries(*args)
         @@library_loader.load_library(*args)
       end
-      alias :load_library :load_libraries
+      alias_method :load_library, :load_libraries
 
       def library_loaded?(library_name)
         @@library_loader.library_loaded?(library_name)
@@ -101,19 +103,19 @@ module Processing
     # 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={})
+    def initialize(options = {})
       super()
       post_initialize(options)
       $app = self
       proxy_java_fields
-      set_sketch_path #unless Processing.online?
+      set_sketch_path # unless Processing.online?
       mix_proxy_into_inner_classes
-      #@started = false
+      # @started = false
 
       java.lang.Thread.default_uncaught_exception_handler = proc do |_thread_, exception|
         puts(exception.class.to_s)
         puts(exception.message)
-        puts(exception.backtrace.collect { |trace| "\t" + trace })
+        puts(exception.backtrace.map { |trace| '\t' + trace })
         close
       end
 
@@ -125,20 +127,19 @@ module Processing
 
       args = []
       @width, @height = options[:width], options[:height]
-      if @@full_screen || options[:full_screen]
-        @@full_screen = true
-        args << "--present"
+      if @full_screen || options[:full_screen]
+        @full_screen = true
+        args << '--present'
       end
       @render_mode  ||= JAVA2D
-      xc = Processing::RP_CONFIG["X_OFF"] ||= 0
-      yc = Processing::RP_CONFIG["Y_OFF"] ||= 0
+      xc = Processing::RP_CONFIG['X_OFF'] ||= 0
+      yc = Processing::RP_CONFIG['Y_OFF'] ||= 0
       x = options[:x] || xc
       y = options[:y] || yc
       args << "--location=#{x},#{y}"  # important no spaces here
       title = options[:title] || File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
       args << title
       PApplet.run_sketch(args, self)
-      #end
     end
 
     def size(*args)
@@ -155,27 +156,26 @@ module Processing
       super(*args)
     end
 
-    def post_initialize(args)
+    def post_initialize(_args)
       nil
     end
 
     # Make sure we set the size if we set it before we start the animation thread.
     def start
-      self.size(@width, @height) if @width && @height
+      size(@width, @height) if @width && @height
       super()
     end
 
     # 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.
     def close
       control_panel.remove if respond_to?(:control_panel)
-      self.dispose
-      self.frame.dispose
+      dispose
+      frame.dispose
     end
 
     private
@@ -183,7 +183,6 @@ module Processing
     # Mix the Processing::Proxy into any inner classes defined for the
     # sketch, attempting to mimic the behavior of Java's inner classes.
     def mix_proxy_into_inner_classes
-
       klass = Processing::App.sketch_class
       klass.constants.each do |name|
         const = klass.const_get name
@@ -203,14 +202,14 @@ module Processing
     def self.desired_method_names(inner_class)
       bad_method = /__/    # Internal JRuby methods.
       unwanted = PApplet.superclass.instance_methods + Object.instance_methods
-      unwanted -= ['width', 'height', 'cursor', 'create_image', 'background', 'size', 'resize']
+      unwanted -= %w(width height cursor create_image background size resize)
       methods = Processing::App.public_instance_methods
-      methods.reject {|m| unwanted.include?(m) || bad_method.match(m) || inner_class.method_defined?(m) }
+      methods.reject { |m| unwanted.include?(m) || bad_method.match(m) || inner_class.method_defined?(m) }
     end
 
     # Proxy methods through to the sketch.
     def self.proxy_methods(inner_class)
-      code = desired_method_names(inner_class).inject('') do |rcode, method|
+      code = desired_method_names(inner_class).reduce('') do |rcode, method|
         rcode << <<-EOS
         def #{method}(*args, &block)                # def rect(*args, &block)
         if block_given?                           #   if block_given?

data/lib/ruby-processing/config.rb

@@ -1,11 +1,9 @@
 require 'psych'
 
 module Processing
-
   if Processing.exported?
     RP_CONFIG = { 'PROCESSING_ROOT' => RP5_ROOT, 'JRUBY' => 'false' }
   end
-
   unless defined? RP_CONFIG
     begin
       CONFIG_FILE_PATH = File.expand_path('~/.rp5rc')

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

@@ -61,7 +61,7 @@ module Processing
 
     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

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

@@ -83,7 +83,7 @@ module Processing
       code = source.dup
       requirements = []
       partial_paths = []
-      loop do
+      Kernel.loop do
         matchdata = code.match(
           /^.*[^::\.\w](require_relative|require|load)\b.*$/
         )

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

@@ -62,7 +62,7 @@ module Processing
   class BasicSketch < Creator
     # Create a blank sketch, given a path.
     def basic_template
-%{
+%(
 def setup
   size <%=@width%>, <%=@height%>
 end
@@ -70,11 +70,11 @@ end
 def draw
 
 end
-}
+)
     end
 
     def basic_template_mode
-%{
+%(
 def setup
   size <%=@width%>, <%=@height%>, <%=@mode%>
 end
@@ -82,7 +82,7 @@ end
 def draw
 
 end
-}
+)
     end
 
     def create!(path, args)
@@ -109,7 +109,7 @@ end
   class ClassSketch < Creator
 
     def class_template
-%{
+%(
 class <%=@name%> < Processing::App
   def setup
     size <%=@width%>, <%=@height%>
@@ -121,11 +121,11 @@ class <%=@name%> < Processing::App
 end
 
 # <%=@name%>.new(x: 20, y: 20)
-}
+)
     end
 
     def class_template_mode
-%{
+%(
 class <%=@name%> < Processing::App
   def setup
     size <%=@width%>, <%=@height%>, <%=@mode%>
@@ -137,7 +137,7 @@ class <%=@name%> < Processing::App
 end
 
 # <%=@name%>.new(x: 20, y: 20)
-}
+)
     end
     # Create a bare blank sketch, given a path.
     def create!(path, args)
@@ -163,12 +163,12 @@ 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
+  include Processing::Proxy
 
 end
-}
+)
     end
     # Create a blank sketch, given a path.
     def create!(path, _args_)

data/lib/ruby-processing/helper_methods.rb

@@ -1,6 +1,7 @@
 module Processing
   module HelperMethods
-
+    # processings epsilon may not be defined yet
+    EPSILON ||= 1.0e-04
     # Nice block method to draw to a buffer.
     # You can optionally pass it a width, a height, and a renderer.
     # Takes care of starting and ending the draw for you.
@@ -42,31 +43,20 @@ module Processing
       super(*args)
     end
 
-    # Overrides convenience function loop, to add ability to loop over a block
-    # if supplied, otherwise perform as the PApplet class would
-    def loop(&block)
-      if block_given?
-        while true do
-          yield
-        end
-      else
-        super
-      end
-    end
-
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
       if block_given?
         Thread.new(&block)
       else
-        fail ArgumentError, 'thread must be called with a block' , caller
+        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
+    # range 1). It may be better to explicitly write your own interpolate
+    # function
     # @param [float] value input
     # @param [range] start1, stop1
     # @param [range] start1, stop2
@@ -74,11 +64,12 @@ module Processing
     def map(value, start1, stop1, start2, stop2)
       start2 + (stop2 - start2) * ((value - start1).to_f / (stop1 - start1))
     end
-    
+
     # ruby alternative implementation of map using range parameters
-    # NB: (begin .. end) and excluded end (begin ... end) versions produce the same result
+    # (begin..end) and excluded end (begin...end) produce the same result
     def map1d(val, r_in, r_out)
-      r_out.begin + (r_out.end - r_out.begin) * ((val - r_in.begin).to_f / (r_in.end - r_in.begin))
+      r_out.begin + (r_out.end - r_out.begin) *
+        ((val - r_in.begin).to_f / (r_in.end - r_in.begin))
     end
 
     # explicitly provide 'processing.org' norm instance method
@@ -95,34 +86,40 @@ module Processing
     # to return a float:- a, b and c need to be floats
 
     def min(*args)
-      args.min { |a,b| a <=> b }
+      args.min  #  { |a,b| a <=> b } optional block not reqd
     end
 
     # explicitly provide 'processing.org' max instance method
     # to return a float:- a, b and c need to be floats
 
     def max(*args)
-      args.max { |a, b| a <=> b }
+      args.max  #  { |a, b| a <=> b } optional block not reqd
     end
-    
 
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
-      alen = args.length
-      return Math.hypot(args[0] - args[2], args[1] - args[3]) if alen == 4
-      return Math.sqrt((args[0] - args[3]) * (args[0] - args[3]) +
-          (args[1] - args[4]) * (args[1] - args[4]) +
-          (args[2] - args[5]) * (args[2] - args[5])) if alen == 6
+      len = args.length
+      if len == 4
+        dx = args[0] - args[2]
+        dy = args[1] - args[3]
+        return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+        return Math.hypot(dx, dy)
+      elsif len == 6
+        dx = args[0] - args[3]
+        dy = args[1] - args[4]
+        dz = args[2] - args[5]
+        return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+        return Math.sqrt(dx * dx + dy * dy + dz * dz)
+      end
       fail ArgumentError, 'takes 4 or 6 parameters'
     end
 
     # explicitly provide 'processing.org' constrain instance method
     # to return a float:- amt, low and high need to be floats
     def constrain(amt, low, high)
-      (amt < low) ? low : ((amt > high) ? high : amt)
+      (low..high).clip(amt)
     end
 
-
     # Uses PImage class method under hood
     def blend_color(c1, c2, mode)
       PImage.blendColor(c1, c2, mode)
@@ -132,7 +129,7 @@ module Processing
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new("#{method_name}", true)
-      self.methods.sort.select { |meth| reg.match(meth) }
+      methods.sort.select { |meth| reg.match(meth) }
     end
 
     # Proxy over a list of Java declared fields that have the same name as
@@ -159,7 +156,7 @@ module Processing
 
     # Provide a convenient handle for the Java-space version of self.
     def java_self
-      @java_self ||= self.to_java(Java::ProcessingCore::PApplet)
+      @java_self ||= to_java(Java::ProcessingCore::PApplet)
     end
 
 
@@ -170,13 +167,18 @@ module Processing
 
     # Fields that should be made accessible as under_scored.
     def mouse_x;      mouseX;       end
+
     def mouse_y;      mouseY;       end
+
     def pmouse_x;     pmouseX;      end
+
     def pmouse_y;     pmouseY;      end
+
     def frame_count;  frameCount;   end
+
     def mouse_button; mouseButton;  end
-    def key_code;     keyCode;      end
 
+    def key_code;     keyCode;      end
 
     # Ensure that load_strings returns a real Ruby array
     def load_strings(file_or_url)