ruby-processing 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0aaf568197ed0c33de6d5ee76ee799e488dbf7c
-  data.tar.gz: 141086257f20b9b623a7092ba17b857e22e0e694
+  metadata.gz: 3c47bf5ca5b3ccfac13e28bc08b675ca3ebed4a4
+  data.tar.gz: 9f852f28cebf20c5f4f040da1f18b59c46520e49
 SHA512:
-  metadata.gz: 4dcfc3f5a0ae54e209ffd00ce00844287a3c5811ba352b657a42d9e47d526466a6ab97ed535b4a50d4fe6f615fc81f686008b54fe3ecb80cf2a6e95e149fe4e0
-  data.tar.gz: 05c8de38b6678bcbb3ee193306deed6c8f4d9d45a3b9762bd62465ef27b6b1ef0581fdf2e5e035d083b049086b899ea9d4897b2507be605ae41d6f0c9beca0de
+  metadata.gz: 06009cf60df0dfd4d03655e8672d8dd6fcce75cc66892bc5ed7a5941b6ad81f3b36449bee4930b54ac2ef474e2834bc997436a354615a4dc71d5dfe7ab125523
+  data.tar.gz: e637f0ded0113ed8b710cf1b9107b7e17c4cee235b0caab5968d78eb1449710dab2639be81084790c30934ac6d4164a84f44e549667859bd39b61a8d6c0adebd

data/lib/ruby-processing/app.rb

@@ -103,6 +103,7 @@ module Processing
 
     def initialize(options={})
       super()
+      post_initialize(options)
       $app = self
       proxy_java_fields
       set_sketch_path #unless Processing.online?
@@ -129,8 +130,10 @@ module Processing
         args << "--present"
       end
       @render_mode  ||= JAVA2D
-      x = options[:x] || 0
-      y = options[:y] || 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
@@ -152,6 +155,10 @@ module Processing
       super(*args)
     end
 
+    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

data/lib/ruby-processing/helper_methods.rb

@@ -74,6 +74,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
+    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 provide 'processing.org' norm instance method
     def norm(value, start, stop)
@@ -98,24 +104,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'
-      val.abs
-    end
-
-    # explicitly provide 'processing.org' ceil instance method
-    def ceil(val)
-      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'
-      val.round
-    end
+    
 
     # explicitly provide 'processing.org' dist instance method
     def dist(*args)
@@ -133,100 +122,6 @@ module Processing
       (amt < low) ? low : ((amt > high) ? high : amt)
     end
 
-    # explicitly provide 'processing.org' pow instance method
-    def pow(x, exp)
-      warn 'pow(x, exp) is deprecated use x**exp to avoid this warning'
-      x**exp
-    end
-
-    # explicitly provide 'processing.org' radians instance method
-    def radians(theta)
-      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 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) '\
-        'to avoid this warning'
-      if args.length == 2
-        return args[0].to_s.rjust(args[1], '0')
-      elsif args.length == 3
-        return args[0].to_s.rjust(args[1], '0').ljust(args[1] + args[2], '0')
-      else
-        fail ArgumentError, 'takes 2 or 3 parameters'
-      end
-    end
-
-     # explicitly provide 'processing.org' mag instance method
-    def mag(*vec)
-      warn 'mag(x, y) is deprecated use hypot(x, y)'
-      if vec.length == 2
-        return hypot(vec[0], vec[1])
-      elsif vec.length == 3
-        return Math.sqrt(vec[0] * vec[0] + vec[1] * vec[1] + vec[2] * vec[2])
-      else
-        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
-      PApplet.minute
-    end
 
     # Uses PImage class method under hood
     def blend_color(c1, c2, mode)

data/lib/ruby-processing/runner.rb

@@ -140,8 +140,13 @@ module Processing
       show_version
       root = '  PROCESSING_ROOT = Not Set!!!' unless proc_root
       root ||= "  PROCESSING_ROOT = #{Processing::RP_CONFIG['PROCESSING_ROOT']}"
+      jruby = Processing::RP_CONFIG['JRUBY']
+      x_off = Processing::RP_CONFIG['X_OFF']
+      y_off = Processing::RP_CONFIG['Y_OFF']
       puts root
-      puts "  JRUBY = #{Processing::RP_CONFIG['JRUBY']}"
+      puts "  JRUBY = #{jruby}" unless jruby.nil?
+      puts "  X_OFF = #{x_off}" unless x_off.nil?
+      puts "  Y_OFF = #{y_off}" unless y_off.nil?
       puts "  jruby-complete installed = #{installed}"
     end
 
@@ -159,11 +164,12 @@ module Processing
 
     private
 
-    # Trade in this Ruby instance for a JRuby instance, loading in a
-    # starter script and passing it some arguments.
-    # Unless --nojruby is passed, use the installed version of jruby, instead of
-    # our vendored jarred one (vendored version is required for some sketches eg shaders).
-    # For people with system jruby they can use ~.rp5rc config to use option without flag
+    # Trade in this Ruby instance for a JRuby instance, loading in a starter
+    # script and passing it some arguments.Unless '--nojruby' is passed, the
+    # installed version of jruby is used instead of our vendored jarred one
+    # (which is required for some sketches eg shaders and for export). To use
+    # jruby-complete by default set JRUBY: false in ~/.rp5rc config
+    # (but that will make using other gems in your sketches hard....)
     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

data/lib/ruby-processing/version.rb

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

data/samples/configRP5/configRP5.pde

@@ -1,10 +1,11 @@
+import java.io.File;
+
 Button enter, nojruby;
 String processingRoot = "enter your processing root here"; // edit this line in the sketch
 String done = "Done";
 String OS = System.getProperty("os.name").toLowerCase();
 String home, suggestion, separator, root;
 PFont font;
-StringBuilder header = new StringBuilder(200);
 float rectX, rectX2, rectY;      // Position of buttons
 float rectHeight = 30;           // height of rect
 float rectWidth = 90;            // width of rect
@@ -16,17 +17,16 @@ boolean acceptOver = false;
 boolean noJruby = false;
 boolean selected = false;
 boolean no_jruby = false;
-
+// The JSON object
+JSONObject json;
 
 void setup() {
   size(600, 200);
   home = System.getProperty("user.home");
   File f = new File(home);
+  json = new JSONObject();
   root = f.getParent();
   separator = System.getProperty("file.separator");
-  header.append("# YAML configuration file for ruby-processing\n");
-  header.append("# RP5HOME: \"").append(root).append(separator).append("ruby193 ... ").append(separator);
-  header.append("ruby-processing\" #windows users may need to set this\n");
   font = createFont("Helvetica", 18);
   if (OS.contains("mac")) {
     suggestion = "/Applications/Processing.app/Contents/Resources/Java";
@@ -40,7 +40,7 @@ void setup() {
   selectedColor = color(0);
   rectX = rectWidth + 20;
   rectX2 = rectWidth + 150;
-  rectY = height * 0.8f - rectHeight / 4;
+  rectY = height * 0.8 - rectHeight / 4;
   enter = new Button(rectX2, rectY, rectWidth, rectHeight, "enter");
   nojruby = new Button(rectX, rectY, rectWidth, rectHeight, "nojruby");
 }
@@ -71,19 +71,16 @@ void draw() {
 void writeRoot() {
   rectColor = selectedColor;
   rectHighlight = selectedColor;
-  header.append("PROCESSING_ROOT: \"").append(processingRoot).append("\"\n");
-  if (no_jruby) {
-    header.append("JRUBY: \'false\'\n");
-  } else {
-    header.append("JRUBY: \'true\'\n");
-  }
-  PrintWriter pw = createWriter(home + separator + ".rp5rc");
-  pw.append(header);
-  pw.flush();
-  pw.close();
+  json.setString("PROCESSING_ROOT", processingRoot);
+  json.setBoolean("JRUBY", no_jruby);
+  json.setInt("X_OFF", floor(displayWidth * 0.1));
+  json.setInt("Y_OFF", floor(displayHeight * 0.1));
+
+  saveJSONObject(json, home + separator + ".rp5rc");
   processingRoot = done;
 }
 
+
 void keyReleased() {
   if (key != CODED) {
     switch (key) {
@@ -108,6 +105,7 @@ void update(float x, float y) {
   noJruby = nojruby.overRect();
 }
 
+
 void mouseClicked() {
   update(mouseX, mouseY);
   if (acceptOver) {
@@ -147,4 +145,3 @@ class Button {
       && mouseY >= y && mouseY <= y + h);
   }
 }
-

data/samples/processing_app/topics/ruby_hook/hooky.rb

@@ -0,0 +1,26 @@
+# Hooky class demonstrates how to use the post_initialize hook,
+# available since ruby-processing-2.6.2, to additional attribute
+# in this case :background as an array of int (splat to color)
+# Not sure how clever it is to have multiple sketch instances.
+
+class Hooky < Processing::App
+  attr_reader :back
+
+  def setup
+    size 200, 200
+    background(*back)
+  end
+
+  def post_initialize(args)
+    @back = (args[:background])
+  end
+end
+
+red = [200, 0, 0]
+green = [0, 200, 0]
+blue = [0, 0, 200]
+colors = [red, green, blue]
+
+colors.each_with_index do |col, i|
+  Hooky.new(x: i * 90, y: i * 90, title: "Hooky #{i}", background: col)
+end

data/samples/processing_app/topics/ruby_hook/subclass.rb

@@ -0,0 +1,75 @@
+# An example demonstrating the use of a hook to decouple subclasses in
+# ruby-processing. The base class here is Spin, and we have included
+# post_initialize as the hook (it does nothing in the base class). SpinArm
+# and SpinSpots both subclass Spin, but only SpinSpots requires the hook to
+# change the initialization. Note the use the hook means the subclass does
+# not need to call super
+
+def setup
+  size 640, 360
+  @arm = SpinArm.new(x: width / 2, y: height / 2, s: 0.01)
+  @spots = SpinSpots.new(x: width / 2, y: height / 2, s: -0.02, d: 90.0)
+end
+
+def draw
+  background 204
+  @arm.display
+  @spots.display
+end
+
+class Spin
+
+  attr_accessor :x, :y, :speed
+  attr_accessor :angle
+
+  def initialize(args = {})
+    @x, @y = args[:x], args[:y]
+    @speed = args[:s]
+    @angle = args[:angle] || 0.0
+    post_initialize(args)  # this is the hook
+  end
+
+  def update
+    @angle += speed
+  end
+
+  def post_initialize(_args)
+    nil
+  end
+
+end
+
+class SpinArm < Spin # inherit from (or "extend") class Spin
+  # NB: initialize inherited from Spin class
+
+  def display
+    stroke_weight 1
+    stroke 0
+    push_matrix
+    translate x, y
+    update
+    rotate angle
+    line 0, 0, 165, 0
+    pop_matrix
+  end
+end
+
+
+class SpinSpots < Spin
+  attr_accessor :dim
+
+  def post_initialize(args)
+    @dim = args[:d]
+  end
+
+  def display
+    no_stroke
+    push_matrix
+    translate x, y
+    update
+    rotate angle
+    ellipse(-dim / 2, 0, dim, dim)
+    ellipse(dim / 2, 0, dim, dim)
+    pop_matrix
+  end
+end

data/vendors/Rakefile

@@ -3,12 +3,12 @@ require 'rake/clean'
 WARNING = <<-EOS 
    WARNING: you may not have wget installed, you could just download
    the correct version of jruby-complete to the vendors folder, and 
-   re-run k9 setup install instead of installing wget. Some systems
+   re-run rp5 setup install instead of installing wget. Some systems
    may also require 'sudo' access to install, NB: this is untested....
       
 EOS
 
-JRUBY_VERSION      = "1.7.14"
+JRUBY_VERSION      = "1.7.15"
 
 CLOBBER.include("jruby-complete-#{JRUBY_VERSION}.jar")
 
@@ -20,11 +20,11 @@ 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", "ad70c18834a143afa6686ebcda27351ebfef7385")
+    sh "wget http://jruby.org.s3.amazonaws.com/downloads/#{JRUBY_VERSION}/jruby-complete-#{JRUBY_VERSION}.jar"    
   rescue
     warn(WARNING)
   end
+  check_sha1("jruby-complete-#{JRUBY_VERSION}.jar", "4d9cb332bad3633c9c23a720542f456dc0c58a81")
 end
 
 directory "../lib/ruby"
@@ -46,3 +46,6 @@ def check_sha1(filename, expected_hash)
     raise "bad sha1 checksum for #{filename} (expected #{expected_hash} got #{sha1.hexdigest})"
   end
 end
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -18,7 +18,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -813,6 +813,8 @@ files:
 - samples/processing_app/topics/motion/puff.rb
 - samples/processing_app/topics/motion/reflection1.rb
 - samples/processing_app/topics/motion/reflection2.rb
+- samples/processing_app/topics/ruby_hook/hooky.rb
+- samples/processing_app/topics/ruby_hook/subclass.rb
 - samples/processing_app/topics/shaders/README
 - samples/processing_app/topics/shaders/Rakefile
 - samples/processing_app/topics/shaders/blur_filter.rb