ruby-processing 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f86e1e9a4937a12e054537a3a11d87bd4d80ca8d
-  data.tar.gz: d9504d46543bf9467603fd6f0b3b8b25ddcfc366
+  metadata.gz: dcf4cc5227072fee5745bcb0c8bac9b58d337b88
+  data.tar.gz: 7ea02eb4fbd00855ec8c0b8dab79e407cfb3dfb6
 SHA512:
-  metadata.gz: 7618164b1440aa65fb4d8361392fcfde54588741e1f48fcd983c079bfcd936c6a8d1dd32f3a38e56cf63428022df0733641b4ccf0ce462d6377360d7ccbaf734
-  data.tar.gz: a00bd119873be49f403a5b606e82f98a84a7e10c52a4ab2a5fd741fbbce4d324616e8d3658a2d71743e09b065c245421f3b45779ee915ccb041d0ef18d72503a
+  metadata.gz: e04d303df785d8809cc221da6572e2e3bbf71240d94b7c70ebf77d61714d38024f14c4f7575816f342a320ee9ded4d099caf80c605c8a544f30e69a4de100ade
+  data.tar.gz: d9afb5ed70c0116bf80593fd716cf784721052f073acf5102fc3a63af664d31b5a9a89e344d28781e0c2ab5fc329b31f13bf7e01bdb33af6815b88d95d7522e2

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

@@ -19,7 +19,7 @@ end
 CODE
 
 CLASS_BASIC = <<-CODE
-class %s
+class %s < Processing::App
   def setup
     size %s, %s
   end
@@ -31,7 +31,7 @@ end
 CODE
 
 CLASS_MODE = <<-CODE
-class %s
+class %s < Processing::App
   def setup
     size %s, %s, %s
   end

data/lib/ruby-processing/helper_methods.rb

@@ -13,7 +13,7 @@ module Processing
       buf.end_draw
       buf
     end
-
+    
     # A nice method to run a given block for a grid.
     # Lifted from action_coding/Nodebox.
     def grid(cols, rows, col_size = 1, row_size = 1)
@@ -23,13 +23,13 @@ module Processing
         yield x, y
       end
     end
-
+    
     # lerp_color takes three or four arguments, in Java that's two
     # different methods, one regular and one static, so:
     def lerp_color(*args)
       args.length > 3 ? self.class.lerp_color(*args) : super(*args)
     end
-
+    
     def color(*args)
       a = args[0]
       # convert to signed int
@@ -43,7 +43,7 @@ module Processing
       end
       super(*args)
     end
-
+    
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
@@ -53,50 +53,67 @@ module Processing
         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
     # @param [float] value input
     # @param [range] start1, stop1
-    # @param [range] start1, stop2
+    # @param [range] start2, stop2
     # @return [float] mapped value
     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
     # (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))
     end
-
+    
+    # Explicitly provides 'processing.org' map instance method, where
+    # value is mapped from range 1 to range 2 where values are clamped to
+    # range 2.
+    # @param val input
+    # @param [r_in] start1, stop1
+    # @param [r_out] start2, stop2
+    # @return mapped value
+    def constrained_map(val, r_in, r_out)
+      unless r_in.include? val
+        return r_out.begin if (val < r_in.begin && r_in.begin < r_in.end) ||
+        (val > r_in.begin && r_in.begin > r_in.end)
+        return r_out.end
+      end
+      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
     def norm(value, start, stop)
       (value - start).to_f / (stop - start)
     end
-
+    
     # explicitly provide 'processing.org' lerp instance method
     def lerp(start, stop, amt)
       start + (stop - start) * amt
     end
-
+    
     # explicitly provide 'processing.org' min instance method
     # to return a float:- a, b and c need to be floats
-
+    
     def min(*args)
       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 } optional block not reqd
     end
-
+    
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
       len = args.length
@@ -107,25 +124,25 @@ module Processing
       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)
       (low..high).clip(amt)
     end
-
+    
     # Uses PImage class method under hood
     def blend_color(c1, c2, mode)
       Java::ProcessingCore::PImage::blendColor(c1, c2, mode)
     end
-
+    
     # There's just so many functions in Processing,
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new("#{method_name}", true)
       methods.sort.select { |meth| reg.match(meth) }
     end
-
+    
     # Proxy over a list of Java declared fields that have the same name as
     # some methods. Add to this list as needed.
     def proxy_java_fields
@@ -133,88 +150,88 @@ module Processing
       methods  = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
-
+    
     # 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(spath = nil)
       field = @declared_fields['sketchPath']
       field.set_value(java_self, spath || SKETCH_ROOT)
     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 < 256 ? int.chr : int
     end
-
+    
     # Provide a convenient handle for the Java-space version of self.
     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 }
-
+    
     define_method(:mouse_y) { mouseY }
-
+    
     define_method(:pmouse_x) { pmouseX }
-
+    
     define_method(:pmouse_y) { pmouseY }
-
+    
     define_method(:frame_count) { frameCount }
-
+    
     define_method(:mouse_button) { mouseButton }
-
+    
     define_method(:key_code) { keyCode }
-
+    
     # Ensure that load_strings returns a real Ruby array
     def load_strings(file_or_url)
       loadStrings(file_or_url).to_a
     end
-
+    
     # Writes an array of strings to a file, one line per string.
     # This file is saved to the sketch's data folder
     def save_strings(filename, strings)
       saveStrings(filename, [strings].flatten.to_java(:String))
     end
-
+    
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
       return @declared_fields['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)
     end
-
+    
     # Is a key pressed for this frame?
     def key_pressed?
       @declared_fields['keyPressed'].value(java_self)
-    end
-
+    end    
+    
     private
-
+    
     def dist2d(*args)
       dx = args[0] - args[2]
       dy = args[1] - args[3]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON
       Math.hypot(dx, dy)
     end
-
+    
     def dist3d(*args)
       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
       Math.sqrt(dx * dx + dy * dy + dz * dz)
-    end
+    end    
   end
 end

data/lib/ruby-processing/helpers/range.rb

@@ -1,11 +1,7 @@
+# Extend Range class to include clip (used to implement processing constrain)
 class Range #:nodoc:
   def clip(n)
-    if cover?(n)
-      n
-    elsif n < min
-      min
-    else
-      max
-    end
+    return n if cover?(n)
+    (n < min) ? min : max
   end
 end

data/lib/ruby-processing/runners/base.rb

@@ -6,15 +6,16 @@ SKETCH_ROOT ||= File.dirname(SKETCH_PATH)
 require_relative '../../ruby-processing'
 require_relative '../../ruby-processing/app'
 
+# More processing module
 module Processing
   # For use with "bare" sketches that don't want to define a class or methods
-  BARE_TEMPLATE = <<-EOS
+  BARE_WRAP = <<-EOS
   class Sketch < Processing::App
     %s
   end
   EOS
 
-  NAKED_TEMPLATE = <<-EOS
+  NAKED_WRAP = <<-EOS
   class Sketch < Processing::App
     def setup
       size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
@@ -27,15 +28,14 @@ module Processing
   # This method is the common entry point to run a sketch, bare or complete.
   def self.load_and_run_sketch
     source = read_sketch_source
-    has_sketch = !source.match(/^[^#]*< Processing::App/).nil?
-    has_methods = !source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
-
-    return load File.join(SKETCH_ROOT, SKETCH_PATH) if has_sketch
-    if has_methods
-      code = format(BARE_TEMPLATE, source)
-    else
-      code = format(NAKED_TEMPLATE, source)
+    wrapped = !source.match(/^[^#]*< Processing::App/).nil?
+    no_methods = source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
+    if wrapped
+      load SKETCH_PATH
+      Processing::App.sketch_class.new unless $app
+      return
     end
+    code = no_methods ? format(NAKED_WRAP, source) : format(BARE_WRAP, source)
     Object.class_eval code, SKETCH_PATH, -1
     Processing::App.sketch_class.new
   end

data/lib/ruby-processing/runners/watch.rb

@@ -34,8 +34,10 @@ module Processing
     def report_errors
       yield
     rescue Exception => e
-      warn "Exception occured while running sketch #{File.basename SKETCH_PATH}..."
-      puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+      wformat = 'Exception occured while running sketch %s...'
+      tformat = "Backtrace:\n\t%s"
+      warn format(wformat, File.basename(SKETCH_PATH))
+      puts format(tformat, e.backtrace.join("\n\t"))
     end
 
     def start_runner
@@ -48,7 +50,7 @@ module Processing
     end
 
     def reload_files_to_watch
-      @files = ([SKETCH_PATH] + Dir.glob(File.dirname(SKETCH_PATH) + '/*.rb')).uniq
+      @files = Dir.glob(File.join(SKETCH_ROOT, '**/*.rb'))
     end
   end
 end

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.8'
+  VERSION = '2.6.9'
 end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS
 EOS
 
 JRUBYC_VERSION     = '1.7.19'
-EXAMPLES           = '1.4'
+EXAMPLES           = '1.5'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement