ruby-processing 2.4.4 → 2.5.0

data/samples/processing_app/topics/advanced_data/data/struct_data.yml

@@ -20,3 +20,8 @@
   y: 179
   diameter: 44.7
   label: Melancholy
+- !ruby/struct:BubbleStruct
+  x: 516
+  y: 217
+  diameter: 50
+  label: new label

data/samples/processing_app/topics/advanced_data/library/bubble/bubble.rb

@@ -2,9 +2,9 @@
 
 class Bubble
   include Processing::Proxy
-  
+
   attr_reader :x, :y, :diameter, :name, :over
-  
+
   # Create  the Bubble
   def initialize(x, y, diameter, name)
     @x = x
@@ -13,32 +13,32 @@ class Bubble
     @name = name
     @over = false
   end
-  
+
   # Checking if mouse is over the Bubble
   def rollover(px, py)
     d = dist(px,py,x,y)
     @over = (d < diameter/2)? true : false
   end
-  
+
   # Display the Bubble
   def display
     stroke(0)
     stroke_weight(2)
     noFill
-    ellipse(x,y,diameter,diameter)
+    ellipse(x, y, diameter, diameter)
     if (over)
       fill(0)
       text_align(CENTER)
-      text(name, x, y + diameter/2 + 20)
+      text(name, x, y + diameter / 2 + 20)
     end
   end
 
   def to_hash
-    {"position" => {"x" => x, "y" => y}, "diameter" => diameter, "label" => name}  
+    {'position' => {'x' => x, 'y' => y}, 'diameter' => diameter, 'label' => name}
   end
 
   def to_struct
-    BubbleStruct.new(x, y, diameter, name)	  
+    BubbleStruct.new(x, y, diameter, name)
   end
 end
 

data/samples/processing_app/topics/advanced_data/load_save_XML.rb

@@ -1,29 +1,29 @@
 #
 # Loading XML Data
-# by Daniel Shiffman.  
-# 
+# by Daniel Shiffman.
+#
 # This example demonstrates how to use loadXML
-# to retrieve data from an XML file and make objects 
+# to retrieve data from an XML file and make objects
 # from that data.
 #
 # Here is what the XML looks like:
 #
-# <?xml version="1.0"?>
+# <?xml version='1.0'?>
 # <bubbles>
 #  <bubble>
-#    <position x="160" y="103"/>
+#    <position x='160' y='103'/>
 #    <diameter>43.19838</diameter>
 #    <label>Happy</label>
 #  </bubble>
 #  <bubble>
-#    <position x="372" y="137"/>
+#    <position x='372' y='137'/>
 #    <diameter>52.42526</diameter>
 #    <label>Sad</label>
 #  </bubble>
 # </bubbles>
 #
-load_library "bubble"
- 
+load_library 'bubble'
+
 attr_reader :bubbles, :xml
 
 def setup
@@ -41,74 +41,73 @@ def draw
 
   text_align(LEFT)
   fill(0)
-  text("Click to add bubbles.", 10, height - 10)
+  text('Click to add bubbles.', 10, height - 10)
 end
 
 def load_data
   # Load XML file
-  @xml = loadXML("data.xml")
-  # Get all the child nodes named "bubble"
-  children = xml.get_children("bubble")
+  @xml = loadXML('data.xml')
+  # Get all the child nodes named 'bubble'
+  children = xml.get_children('bubble')
 
-  # The size of the array of Bubble objects is determined by the total XML elements named "bubble"
+  # The size of the array of Bubble objects is determined by the total XML elements named 'bubble'
   @bubbles = []
 
-  children.each do |element|    
+  children.each do |element|
     # The position element has two attributes: x and y
-    position_element = element.get_child("position")
+    position_element = element.get_child('position')
     # Note how with attributes we can get an integer or directly
-    x, y = position_element.get_int("x"), position_element.get_int("y")
-    
-    # The diameter is the content of the child named "diamater"
-    diameter_element = element.get_child("diameter")
+    x, y = position_element.get_int('x'), position_element.get_int('y')
+
+    # The diameter is the content of the child named 'diamater'
+    diameter_element = element.get_child('diameter')
     # Note how with the content of an XML node, we retrieve as a String and then convert
     diameter = (diameter_element.get_content).to_f
 
-    # The label is the content of the child named "label"
-    label_element = element.get_child("label")
+    # The label is the content of the child named 'label'
+    label_element = element.get_child('label')
     label = label_element.get_content
 
     # Make a Bubble object out of the data read
     bubbles << Bubble.new(x, y, diameter, label)
-  end 
+  end
 
 end
 
 # Still need to work on adding and deleting
 
 def mouse_pressed
-  
+
   # Create a new XML bubble element
-  bubble = xml.add_child("bubble")
-  
+  bubble = xml.add_child('bubble')
+
   # Set the poisition element
-  position = bubble.add_child("position")
+  position = bubble.add_child('position')
   # Here we can set attributes as integers directly
-  position.set_int("x",mouseX)
-  position.set_int("y",mouseY)
-  
+  position.set_int('x', mouseX)
+  position.set_int('y', mouseY)
+
   # Set the diameter element
-  diameter = bubble.add_child("diameter")
+  diameter = bubble.add_child('diameter')
   # Here for a node's content, we have to convert to a String
   diameter.set_content(rand(40.0 .. 80).to_s)
-  
+
   # Set a label
-  label = bubble.add_child("label")
-  label.set_content("New label")
-  
-  
+  label = bubble.add_child('label')
+  label.set_content('New label')
+
+
   # Here we are removing the oldest bubble if there are more than 10
-  children = xml.get_children("bubble")
+  children = xml.get_children('bubble')
     # If the XML file has more than 10 bubble elements
   if (children.length > 10)
     # Delete the first one
     xml.remove_child(children[0])
   end
-  
+
   # Save a new XML file
-  saveXML(xml,"data/data.xml")
-  
-  # reload the new data 
-  load_data
-end
+  saveXML(xml, 'data/data.xml')
 
+  # reload the new data
+  load_data
+end

data/samples/processing_app/topics/advanced_data/load_save_json.rb

@@ -1,20 +1,20 @@
-# This example demonstrates how easily "sketch data" can be retrieved from a json file
+# This example demonstrates how easily 'sketch data' can be retrieved from a json file
 # in ruby-processing. Note this sketch re-uses the Bubble class from the bubble library. 
 # The BubbleData class, can load, store and create instances of Bubble (and request them
 # to display and/or show their label, when 'mouse over').
 # @author Martin Prout, after Daniel Shiffmans version for processing
 # 
-require "json"
+require 'json'
 
 load_library :bubble
 
 attr_reader :bubble_data
 
-def setup()
+def setup
   size(640, 360)
   # initialize bubble_data with 'key' and read data from 'file path'
-  @bubble_data = BubbleData.new "bubbles"
-  bubble_data.load_data "data/data.json"
+  @bubble_data = BubbleData.new 'bubbles'
+  bubble_data.load_data 'data/data.json'
 end
 
 def draw
@@ -47,7 +47,7 @@ class BubbleData
   end  
   
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), "new label")    
+    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')    
     save_data 
     load_data path
   end
@@ -63,16 +63,16 @@ class BubbleData
   
   def load_data path
     @path = path
-    source_string = open(path, "r"){ |file| file.read }
+    source_string = open(path, 'r'){ |file| file.read }
     data = JSON.parse(source_string)[key]
     bubbles.clear
     # iterate the bubble_data array, and create an array of bubbles
     data.each do |point|
       self.add Bubble.new(
-        point["position"]["x"],
-        point["position"]["y"],
-        point["diameter"],
-        point["label"])
+        point['position']['x'],
+        point['position']['y'],
+        point['diameter'],
+        point['label'])
     end
   end
   

data/samples/processing_app/topics/advanced_data/load_save_struct_yaml.rb

@@ -1,7 +1,7 @@
 ######################################
 # Yet another examples of reading and
 # writing to some form of markup,
-# appropriately yaml using ruby structs 
+# appropriately yaml using ruby structs
 # by Martin Prout after Dan Shiffman
 ####################################
 load_library :bubble
@@ -9,10 +9,10 @@ load_library :bubble
 attr_reader :bubble_data
 
 
-def setup()
+def setup
   size(640, 360)
   @bubble_data = BubbleData.new :bubbles
-  bubble_data.load_data "data/struct_data.yml"
+  bubble_data.load_data 'data/struct_data.yml'
 end
 
 def draw
@@ -26,10 +26,13 @@ def mouse_pressed
   bubble_data.create_new_bubble(mouse_x, mouse_y)
 end
 
+require 'forwardable'
 
 class BubbleData
   include Enumerable
-  
+  extend Forwardable
+  def_delegators(:@bubble_array, :clear, :each, :<<, :shift, :size)
+
   MAX_BUBBLE = 10
 
   attr_reader :path, :bubble_array
@@ -37,29 +40,25 @@ class BubbleData
     @bubble_array = []
     @key = key
   end
-  
-  def each &block
-    bubble_array.each &block
-  end  
-  
+
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), "new label")    
-    save_data 
+    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')
+    save_data
     load_data path
   end
 
   def add bubble
-    bubble_array << bubble
-    bubble_array.shift if bubble_array.size > MAX_BUBBLE
-  end 
- 
+    self << bubble
+    self.shift if self.size > MAX_BUBBLE
+  end
+
    def load_data path
      @path = path
      yaml = Psych.load_file(path)
      # we are storing the data as an array of RubyStruct, in a hash with
      # a symbol as the key (the latter only to show we can, it makes no sense)
-     data = yaml[@key]      
-     bubble_array.clear
+     data = yaml[@key]
+     self.clear
      # iterate the bubble_data array, and populate the array of bubbles
      data.each do |pt|
        self.add Bubble.new(pt.x, pt.y, pt.diameter, pt.label)
@@ -71,15 +70,15 @@ class BubbleData
       bubble.display
       bubble.rollover(x, y)
     end
-  end  
+  end
+
+  private
 
-  private   
-  
   def save_data
-    hash = { @key =>  self.map{ |point| point.to_struct } }
+    hash = { @key =>  self.map { |point| point.to_struct } }
     yaml = hash.to_yaml
-    # overwite existing 'struct_data.yaml' 
-    open(path, 'w:UTF-8') {|f| f.write(yaml) }
+    # overwite existing 'struct_data.yaml'
+    open(path, 'w:UTF-8') { |f| f.write(yaml) }
   end
 
 end

data/samples/processing_app/topics/advanced_data/load_save_table.rb

@@ -16,7 +16,7 @@
 #
 require 'csv'
 
-load_library "bubble"
+load_library 'bubble'
 
 attr_reader :bubbles, :data
 
@@ -35,23 +35,23 @@ def draw
   
   text_align(LEFT)
   fill(0)
-  text("Click to add bubbles.", 10, height - 10)
+  text('Click to add bubbles.', 10, height - 10)
 end
 
 def load_data
   # Load CSV file into an Array of Hash objects
   # :headers option indicates the file has a header row
-  @data = CSV.read("data/data.csv", :headers => true).map{|row| row.to_hash}
+  @data = CSV.read('data/data.csv', :headers => true).map{|row| row.to_hash}
   
-  # The size of the array of Bubble objects is determined by the total number of "rows" in the CSV
+  # The size of the array of Bubble objects is determined by the total number of 'rows' in the CSV
   @bubbles = [] 
   
   data.each do |row|
     # You access the values via their column name (set by using headers option above)
-    x = row["x"].to_f
-    y = row["y"].to_f
-    d = row["diameter"].to_f
-    n = row["name"] 
+    x = row['x'].to_f
+    y = row['y'].to_f
+    d = row['diameter'].to_f
+    n = row['name'] 
     # Make a Bubble object out of the data read
     bubbles << Bubble.new(x, y, d, n)
   end  
@@ -59,8 +59,8 @@ def load_data
 end
 
 def mouse_pressed
-  # Create a new "row" hash
-  row = {"x" => mouse_x.to_s, "y" => mouse_y.to_s, "diameter" => random(40, 80).to_s, "name" => "Blah"}
+  # Create a new 'row' hash
+  row = {'x' => mouse_x.to_s, 'y' => mouse_y.to_s, 'diameter' => random(40, 80).to_s, 'name' => 'Blah'}
   # add the row to the existing data array
   data << row
   
@@ -69,7 +69,7 @@ def mouse_pressed
     # Delete the oldest row
     data.shift 
   end
-  # read column names from data, and generate csv "string" that can be written to file  
+  # read column names from data, and generate csv 'string' that can be written to file  
   column_names = data.first.keys
   s = CSV.generate do |csv|
     csv << column_names
@@ -78,7 +78,7 @@ def mouse_pressed
     end
   end
   # Writing the csv data back to the same file, (also specify UTF-8 format)
-  File.open("data/data.csv", 'w:UTF-8') { |file| file.write(s)}  
+  File.open('data/data.csv', 'w:UTF-8') { |file| file.write(s)}  
   # And reloading it
   load_data
 end

data/samples/processing_app/topics/advanced_data/load_save_yaml.rb

@@ -11,8 +11,8 @@ attr_reader :bubble_data
 def setup()
   size(640, 360)
   # load data from file
-  @bubble_data = BubbleData.new "bubbles"
-  bubble_data.load_data "data/data.yml"
+  @bubble_data = BubbleData.new 'bubbles'
+  bubble_data.load_data 'data/data.yml'
 end
 
 def draw
@@ -41,7 +41,7 @@ class BubbleData
   end  
   
   def create_new_bubble x, y
-    self.add Bubble.new(x, y, rand(40 .. 80), "new label")    
+    self.add Bubble.new(x, y, rand(40 .. 80), 'new label')    
     save_data 
     load_data path
   end
@@ -57,16 +57,16 @@ class BubbleData
   
   def load_data path
     @path = path
-    yaml = Psych.load_file("data/data.yml")
+    yaml = Psych.load_file('data/data.yml')
     data = yaml[key]
     bubbles.clear
     # iterate the bubble_data array, and create an array of bubbles
     data.each do |point|
       self.add Bubble.new(
-        point["position"]["x"],
-        point["position"]["y"],
-        point["diameter"],
-        point["label"])
+        point['position']['x'],
+        point['position']['y'],
+        point['diameter'],
+        point['label'])
     end
   end
   
@@ -82,8 +82,6 @@ class BubbleData
     hash = { key => self.map{ |point| point.to_hash } }
     yaml = hash.to_yaml
     # overwite existing 'data.yaml' 
-    open("data/data.yml", 'w:UTF-8') {|f| f.write(yaml) }
-  end
-  
+    open('data/data.yml', 'w:UTF-8') { |f| f.write(yaml) }
+  end  
 end
-