Make it work again

Author: monkstone

processing_app/topics/advanced_data/data/data.yml

@@ -1,27 +1,22 @@
 ---
 bubbles:
-- :position:
+- position:
     x: 160
     y: 103
-  :diameter: 43.19838
-  :label: Happy
-- :position:
+  diameter: 43.19838
+  label: Happy
+- position:
     x: 372
     y: 137
-  :diameter: 52.42526
-  :label: Sad
-- :position:
+  diameter: 52.42526
+  label: Sad
+- position:
     x: 273
     y: 235
-  :diameter: 61.14072
-  :label: Joyous
-- :position:
+  diameter: 61.14072
+  label: Joyous
+- position:
     x: 121
     y: 179
-  :diameter: 44.758068
-  :label: Melancholy
-- :position:
-    x: 532
-    y: 137
-  :diameter: 53
-  :label: new label
+  diameter: 44.758068
+  label: Melancholy

processing_app/topics/advanced_data/load_save_yaml.rb

@@ -1,89 +1,109 @@
-######################################
-# Yet another examples of reading and
-# writing to some form of markup,
-# appropriately yaml.
-# by Martin Prout after Dan Shiffman
-# ###################################
-require 'forwardable'
-require 'psych'
-load_library :bubble
-
-attr_reader :bubble_data
+require 'yaml'
+
+attr_reader :bubbles, :bubble_data
+
+ MAX_BUBBLE = 10
+
+def settings
+  size(640, 360)
+end
 
 def setup
-  sketch_title 'Load Save Yaml'
-  # load data from file
-  @bubble_data = BubbleData.new 'bubbles'
-  bubble_data.load_data(data_path('data.yml'))
+  sketch_title 'Bubble Yaml'
+  # read source_string from file
+  load_data
 end
 
 def draw
   background 255
-  bubble_data.display mouse_x, mouse_y
+  bubbles.each do |bubble|
+    bubble.display
+    bubble.rollover(mouse_x, mouse_y)
+  end
+end
+
+def load_data
+  yaml = YAML.load_file(data_path('data.yml'))
+  # parse the source string
+  @bubble_data = BubbleData.new 'bubbles'
+  # get the bubble_data from the top level hash
+  data = bubble_data.extract_data yaml
+  # map the bubble_data array to an array of bubbles
+  @bubbles = data.map do |point|
+    pos = point['position']
+    Bubble.new(pos['x'], pos['y'], point['diameter'], point['label'])
+  end
+end
+
+def save_data
+  # demonstrate how easy it is to create json object from a hash in ruby
+  hash = bubble_data.to_hash
+  # overwite existing 'data.yml'
+  open(data_path('data.yml'), 'w') { |file| file.write(hash.to_yaml) }
 end
 
 def mouse_pressed
   # create a new bubble instance, where mouse was clicked
-  @bubble_data.create_new_bubble(mouse_x, mouse_y)
+  @bubble_data.add_bubble(
+    Bubble.new(mouse_x, mouse_y, rand(40..80), 'new label')
+  )
+  save_data
+  # reload the yaml data from the freshly created file
+  load_data
 end
 
-# Bubble class can create and display bubble data from a yaml file
+# Bubble data holder
 class BubbleData
-  extend Forwardable
-  def_delegators(:@bubbles, :each, :size)
-  include Enumerable
+  attr_reader :name, :data
+  def initialize(name = 'bubbles')
+    @name = name
+    @bubbles = []
+  end
 
-  MAX_BUBBLE = 10
+  def add_bubble(bubble)
+    bubbles << bubble
+    bubbles.shift if bubbles.size > MAX_BUBBLE
+  end
 
-  attr_reader :key
-  def initialize(key)
-    @bubbles = []
-    @key = key
-    super
+  def extract_data(yaml)
+    @bubbles = yaml[name]
   end
 
-  def create_new_bubble(x, y)
-    add(Bubble.new(x, y, rand(40..80), 'new label'))
-    save_data
-    load_data path
+  def to_hash
+    { name => bubbles.map(&:to_hash) }
   end
+end
+
+# The Bubble class
+class Bubble
+  attr_reader :x, :y, :diameter, :name, :over
 
-  def display(x, y)
-    each do |bubble|
-      bubble.display
-      bubble.rollover(x, y)
-    end
+  def initialize(x, y, diameter, name)
+    @x, @y, @diameter, @name = x, y, diameter, name
+    @over = false
   end
 
-  # @param path to yaml file
-  def load_data(path)
-    yaml = Psych.load_file(path)
-    data = yaml[key]
-    clear
-    # iterate the bubble_data array, and create an array of bubbles
-    data.each do |point|
-      add Bubble.new(
-        point['position']['x'],
-        point['position']['y'],
-        point['diameter'],
-        point['label'])
-      end
-    end
-
-    def add(bubble)
-      bubbles << bubble
-      bubbles.shift if bubbles.size > MAX_BUBBLE
-    end
-
-    private
-
-    def save_data
-      hash = { key => map(&:to_hash) }
-      # overwite existing 'data.yaml'
-      File.write(data_path('data.yml'), hash.to_yaml)
-    end
+  def rollover(px, py)
+    distance = dist px, py, x, y
+    @over = (distance < diameter / 2.0)
   end
 
-  def settings
-    size 640, 360
+  def display
+    stroke 0
+    stroke_weight 2
+    no_fill
+    ellipse x, y, diameter, diameter
+    return unless over
+    fill 0
+    text_align CENTER
+    text(name, x, y + diameter / 2.0 + 20)
   end
+
+  def to_hash
+    {
+      'position' => { 'x' => x, 'y' => y },
+      'diameter' => diameter,
+      'label' => name
+    }
+  end
+end