ruby-processing 2.6.14 → 2.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44805ffa73fa01bdd4064925c53ef8c6f1a70503
-  data.tar.gz: 3bb2dfbdaf8452b5134124a9076354bdc81f3fe2
+  metadata.gz: 384f354fac78ee142f0d968856d620c4834d5a55
+  data.tar.gz: f1ea31f4103503196219832efd8a07334fe20033
 SHA512:
-  metadata.gz: 4e86989139b8a0ce2cac4f3aed69da1a63de183e78abb596fffb22ebfa79647a78205aa60cb3ecc8e4ebd1f3bd511a8f9430ec2ecf937d50b6e92b19a38f3cf8
-  data.tar.gz: 1bbc0c5067c4d3f645dea500d5b4c0ce35a78c0ced86e1f0029153e96ccfdd15bd9f2b5e0d997bac4f0c063b6b1bb3684c88b5d8aa0d226aafaf25376198f95f
+  metadata.gz: 853c17b72cd1fdcbef31abd6f88d59d389c1b41eca0867f5e02d4c1c19269e841294551d5a440666b3b84aab36be1db6496608b10a458830083036a4e9e24c39
+  data.tar.gz: b15074265d45eb34e6e9b98c269b6632bc83a9f4f364196dd6948db117a84d13364cc9424bbc5759676967fcd38fe907acc6f5c213283f28ff998ff7b1fced57

data/lib/ruby-processing/app.rb

@@ -21,6 +21,7 @@ module Processing
   Dir["#{RP_CONFIG["PROCESSING_ROOT"]}/core/library/\*.jar"].each do |jar| 
     require jar unless jar =~ /native/
   end
+  Java::Monkstone::MathToolLibrary.new.load(JRuby.runtime, false)
   # Include some core processing classes that we'd like to use:
   include_package 'processing.core'
 
@@ -40,6 +41,7 @@ module Processing
   class App < PApplet
     include Math
     include HelperMethods
+    include MathTool
     # Alias some methods for familiarity for Shoes coders.
     # attr_accessor :frame, :title
     alias_method :oval, :ellipse
@@ -194,6 +196,7 @@ module Processing
   # unfettered access to the methods defined in the surrounding class.
   module Proxy
     include Math
+    include MathTool
     # Generate a list of method names to proxy for inner classes.
     # Nothing camelCased, nothing __internal__, just the Processing API.
     def self.desired_method_names(inner_class)

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

@@ -70,7 +70,7 @@ module Processing
     def extract_libraries(source)
       lines = source.split("\n")
       libs = lines.grep(/^[^#]*load_(?:java_|ruby_)?librar(?:y|ies)\s+(.+)/) do
-        $1.split(/\s*,\s*/).map do |raw_library_name|
+        Regexp.last_match(1).split(/\s*,\s*/).map do |raw_library_name|
           raw_library_name.tr("\"':\r\n", '')
         end
       end.flatten

data/lib/ruby-processing/helper_methods.rb

@@ -1,5 +1,10 @@
+# processing module wrapper
+require_relative '../rpextras'
+
+
 module Processing
   # Provides some convenience methods available in vanilla processing
+  Java::Monkstone::MathToolLibrary.new.load(JRuby.runtime, false)
   module HelperMethods
     # processings epsilon may not be defined yet
     EPSILON ||= 1.0e-04
@@ -13,7 +18,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,27 +28,18 @@ 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
-      if args.length == 1
-        if a.is_a?(Fixnum) && a >= 2**31
-          args = [a - 2**32]
-        elsif a.is_a?(String) && a[0].eql?('#')
-          h = a[1..-1].rjust(6, '0').prepend('ff')
-          return color(h.hex)
-        end
-      end
-      super(*args)
+      return super(*args) unless args.length == 1
+      super(hex_color(args[0]))
     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,7 +49,7 @@ 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
@@ -64,56 +60,24 @@ module Processing
     # @return [float] mapped value
     def map(value, start1, stop1, start2, stop2)
       start2 + (stop2 - start2) * ((value - start1).to_f / (stop1 - start1))
+      warn('map is deprecated use p5map or map1d instead')
     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
-    
+    # deprecate :map, :p5map, 2015, 12
+
     # 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
@@ -124,25 +88,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)
+      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
@@ -151,87 +115,105 @@ module Processing
       @declared_fields = Hash[fields.zip(methods)]
     end
     
+    class VersionError < StandardError
+    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)
+      begin
+        field.set_value(java_self, spath || SKETCH_ROOT)
+      rescue TypeError
+        fail VersionError, 'Use JRubyArt for processing-3.0'
+      end
     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
-    
+
+    # parse single argument color int/double/String
+    def hex_color(a)
+      if a.is_a?(Fixnum)
+        return Java::Monkstone::ColorUtil.colorLong(a)
+      elsif a.is_a?(String)
+        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
+        fail StandardError, 'Dodgy Hexstring'
+      end
+      Java::Monkstone::ColorUtil.colorDouble(a)
+    end
+
     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/runners/watch.rb

@@ -5,6 +5,15 @@ module Processing
   # the feedback between code and effect.
   class Watcher
     # Sic a new Processing::Watcher on the sketch
+    WATCH_MESSAGE ||= <<-EOS
+    Warning:
+    To protect you from running watch mode in a top level
+    directory with lots of nested ruby or GLSL files we
+    limit the number of files to watch to %d.
+    If you really want to watch %d files you should
+    increase MAX_WATCH in ~/.rp5rc
+
+    EOS
     SLEEP_TIME = 0.2
     def initialize
       reload_files_to_watch
@@ -50,7 +59,12 @@ module Processing
     end
 
     def reload_files_to_watch
-      @files = Dir.glob(File.join(SKETCH_ROOT, "**/*.{rb,glsl}"))
+      @files = Dir.glob(File.join(SKETCH_ROOT, '**/*.{rb,glsl}'))
+      count = @files.length
+      max_watch = RP_CONFIG.fetch('MAX_WATCH', 20)
+      return unless count > max_watch
+      warn format(WATCH_MESSAGE, max_watch, count)
+      abort
     end
   end
 end

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.14'
+  VERSION = '2.6.15'
 end

data/vendors/Rakefile

@@ -8,7 +8,7 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '1.7.21'
+JRUBYC_VERSION     = '1.7.22'
 EXAMPLES           = '1.7'
 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_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "e061b9f399a5e8d5cfcca84d4a6baf879111e83c")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "42dc9be2f706774c24ef61ec2981d05e2c79a9e2")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.14
+  version: 2.6.15
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -16,14 +16,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   name: bundler
   prerelease: false
   type: :development
@@ -31,13 +31,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   name: rake
   prerelease: false
   type: :development
@@ -45,7 +45,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.8'
   name: minitest
   prerelease: false
   type: :development
@@ -73,8 +73,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-description: "  Ruby-Processing is a ruby wrapper for the processing art framework.\n\
+        version: '5.8'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  name: rspec
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description: "  Ruby-Processing is a ruby wrapper for the processing-2.0 art framework.\n\
   \  This version supports processing-2.2.1, and uses jruby-complete-1.7.22 or an\
   \ \n  installed jruby as the glue between ruby and java. Use both processing \n\
   \  libraries and ruby gems in your sketches. The \"watch\" mode, provides a \n \
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.7+
-- processing = 2.2.1+
+- processing = 2.2.1
 rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: