some tidy up

Author: monkstone

samples/processing_app/topics/advanced_data/Rakefile

@@ -8,7 +8,7 @@ task default: [:demo]
 
 desc 'demo'
 task :demo do
-  samples_list.shuffle.each{ |sample| run_sample sample }
+  samples_list.shuffle.each { |sample| run_sample sample }
 end
 
 def samples_list
@@ -17,14 +17,14 @@ def samples_list
   Dir.glob('*.rb').each do |file|
     files << File.join(SAMPLES_DIR, file)
   end
-  return files
+  files
 end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
   open("|rp5 --nojruby run #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
-    end      
+    end
   end
 end

samples/processing_app/topics/advanced_data/counting_words.rb

@@ -1,8 +1,8 @@
+# A helper to keep track of word frequency.
 class Word
-  # A helper to keep track of word frequency.
   attr_accessor :word
   attr_reader :count
-  def initialize word
+  def initialize(word)
     @word = word
     @count = 1
   end
@@ -36,13 +36,12 @@ def setup
 def draw
   background 51
   fill 255
-  s = (tokens[counter] == 'I')? tokens[counter] : tokens[counter].downcase
+  s = (tokens[counter] == 'I') ? tokens[counter] : tokens[counter].downcase
   @counter = (counter + 1) % tokens.length
-  if (concordance.has_key?(s))
+  if concordance.key? s
     # Get the word object and increase the count
     # We access objects from a Hash via its key, the String
-    w = concordance[s]
-    w.increment    # increment word count
+    concordance[s].increment    # increment word count
   else
     # Otherwise make a new Word instance and add it to
     # the Hash using the word String as the key
@@ -56,23 +55,22 @@ def draw
   # Look at each word
   concordance.values.each do |w|
     # Only display words that appear 3 times
-    if (w.count > 3)  # access word count
+    if w.count > 3  # access word count
       # The size is the count
       fsize = constrain(w.count, 0, 100)
       text_size(fsize)
       text(w.word, x, y)
       # Move along the x-axis
       x += text_width(w.word) + 1
     end
-
     # If x gets to the end, move y
     # If y == 0 we are done
-    if (y == 0)
+    if y == 0
       no_loop
     else
-      if (x > width)
+      if x > width
         x = 0
-        y = (y < 0)? 0 : y - 100
+        y = (y < 0) ? 0 : y - 100
       end
     end
   end

samples/processing_app/topics/advanced_data/library/word/word.rb

@@ -7,19 +7,20 @@
 class Word
   include Processing::Proxy
   # Store a count for occurences in two different books
-  attr_reader :count_dracula, :count_franken, :total_count, :word, :position, :width, :height, :speed
+  attr_reader :count_dracula, :count_franken, :total_count
+  attr_reader :word, :position, :width, :height, :speed
 
   def initialize(s)
     @width, @height = $app.width, $app.height
     @count_dracula, @count_franken, @total_count = 0, 0, 0
-    @position = [rand(width), rand(-height..height*2)]
+    @position = [rand(width), rand(-height..height * 2)]
     @word = s
   end
 
   # We will display a word if it appears at least 5 times
   # and only in one of the books
   def qualify?
-    return ((count_dracula == total_count || count_franken == total_count) && total_count > 5)
+    ((count_dracula == total_count || count_franken == total_count) && total_count > 5)
   end
 
   # Increment the count for Dracula
@@ -40,22 +41,18 @@ def move
     @speed = map(total_count, 5, 25, 0.1, 0.4).to_f
     @speed = constrain(speed, 0, 10.0)
     @position[Y] += speed
-
-    if (position[Y] > height*2)
-      @position[Y] = -height
-    end
+    @position[Y] = -height if position[Y] > height * 2
   end
 
-
   # Depending on which book it gets a color
   def display
-    if (count_dracula > 0)
+    if count_dracula > 0
       fill(255)
-    elsif (count_franken > 0)
+    elsif count_franken > 0
       fill(0)
     end
     # Its size is also tied to number of occurences
-    fs = map(total_count,5,25,2,24.0).to_f
+    fs = map(total_count, 5, 25, 2, 24.0).to_f
     fs = constrain(fs, 2, 48)
     text_size(fs)
     text_align(CENTER)

samples/processing_app/topics/advanced_data/load_save_XML.rb

@@ -36,9 +36,8 @@ def draw
   # Display all bubbles
   bubbles.each do |b|
     b.display
-    b.rollover(mouseX, mouseY)
+    b.rollover(mouse_x, mouse_y)
   end
-
   text_align(LEFT)
   fill(0)
   text('Click to add bubbles.', 10, height - 10)
@@ -49,65 +48,49 @@ def load_data
   @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|
     # The position element has two attributes: x and y
     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')
-    # Note how with the content of an XML node, we retrieve as a String and then convert
+    # 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')
     label = label_element.get_content
-
     # Make a Bubble object out of the data read
     bubbles << Bubble.new(x, y, diameter, label)
   end
-
 end
 
 # Still need to work on adding and deleting
-
 def mouse_pressed
-
   # Create a new XML bubble element
   bubble = xml.add_child('bubble')
-
   # Set the poisition element
   position = bubble.add_child('position')
   # Here we can set attributes as integers directly
   position.set_int('x', mouseX)
   position.set_int('y', mouseY)
-
   # Set the diameter element
   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')
-
-
   # Here we are removing the oldest bubble if there are more than 10
   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
-
+  # If the XML file has more than 10 bubble elements
+  xml.remove_child(children[0]) if children.length > 10
   # Save a new XML file
   saveXML(xml, 'data/data.xml')
-
   # reload the new data
   load_data
-end
+end

samples/processing_app/topics/advanced_data/regex.rb

@@ -11,7 +11,7 @@
 
 def setup
   size(360, 480)
-  @url = 'http://processing.org'
+  @url = 'https://processing.org'
   # Load the links
   @links = load_links(url)
   links.uniq! # get rid of the duplicates
@@ -43,4 +43,4 @@ def load_links(s)
             [\w=]*
         )?
     /ix)
-end
+end

samples/processing_app/topics/advanced_data/threads.rb

@@ -15,22 +15,21 @@
 # This sketch will load data from all of these URLs in a separate thread
 
 URLS = [
-'http://processing.org',
-'http://www.processing.org/exhibition/',
-'http://www.processing.org/reference/',
-'http://www.processing.org/reference/libraries',
-'http://www.processing.org/reference/tools',
-'http://www.processing.org/reference/environment',
-'http://www.processing.org/learning/',
-'http://www.processing.org/learning/basics/',
-'http://www.processing.org/learning/topics/',
-'http://www.processing.org/learning/gettingstarted/',
-'http://www.processing.org/download/',
-'http://www.processing.org/shop/',
-'http://www.processing.org/about/'
+  'https://processing.org',
+  'https://www.processing.org/exhibition/',
+  'https://www.processing.org/reference/',
+  'https://www.processing.org/reference/libraries',
+  'https://www.processing.org/reference/tools',
+  'https://www.processing.org/reference/environment',
+  'https://www.processing.org/learning/',
+  'https://www.processing.org/learning/basics/',
+  'https://www.processing.org/learning/topics/',
+  'https://www.processing.org/learning/gettingstarted/',
+  'https://www.processing.org/download/',
+  'https://www.processing.org/shop/',
+  'https://www.processing.org/about/'
 ]
 
-
 attr_reader :finished, :percent
 
 def setup
@@ -42,34 +41,33 @@ def setup
 
 def draw
   background(0)
-
-  # If we're not finished draw a 'loading bar'
-  # This is so that we can see the progress of the thread
-  # This would not be necessary in a sketch where you wanted to load data in the background
-  # and hide this from the user, allowing the draw loop to simply continue
-  if (!finished)
+  # If we're not finished draw a 'loading bar', so that we can see the progress
+  # of the thread. This would not be necessary in a sketch where you wanted to
+  # load data in the background and hide this from the user.
+  if !finished
     stroke(255)
     no_fill
-    rect(width/2-150, height/2, 300, 10)
+    rect(width / 2 - 150, height / 2, 300, 10)
     fill(255)
     # The size of the rectangle is mapped to the percentage completed
     w = map(percent, 0, 1, 0, 300)
-    rect(width/2-150, height/2, w, 10)
+    rect(width / 2 - 150, height / 2, w, 10)
     text_size(16)
     text_align(CENTER)
     fill(255)
-    text('Loading', width/2, height/2+30)
+    text('Loading', width / 2, height / 2 + 30)
   else
     # The thread is complete!
     text_align(CENTER)
     text_size(24)
     fill(255)
-    text('Finished loading. Click the mouse to load again.', width/2, height/2)
+    message = 'Finished loading. Click the mouse to load again.'
+    text(message, width / 2, height / 2)
   end
 end
 
 def load_data
-  Thread.new {
+  Thread.new do
     # The thread is not completed
     @finished = false
     @percent = 0
@@ -88,9 +86,9 @@ def load_data
       @percent = i.to_f / URLS.length
     end
     @finished = true
-  }
+  end
 end
 
 def mouse_pressed   # guard against calling load_data when running
-  load_data unless !finished
+  load_data if finished
 end

samples/processing_app/topics/advanced_data/threads_two.rb

@@ -14,39 +14,48 @@ def setup
   @frames = []
   @done_loading = false
   @curr = 0
-  thread do    # supply a block in ruby-processing rather than use reflection
+  load_image_thread
+  @ang = 0.0
+end
+
+def load_image_thread
+  thread do     # supply a block in ruby-processing rather than use reflection
     FRAMES.times do |i|
       frames << load_image("a#{i.to_s.rjust(3, '0')} copy.jpg") # ruby syntax
       @curr = i
-      delay(75) #just slows down this thread - the main draw cycle is unaffected...
+      delay(75) # just slows down this thread, the main draw cycle is unaffected
     end
     @curr = 0
     frame_rate(30)
     @done_loading = true
   end
-  @ang = 0.0
 end
 
-
 def draw
-  if (done_loading)
-    background(0)
-    image(frames[curr], 0, 0)
-    @curr += 1
-    if (curr > 115)
-      @curr = 0
-    end
+  if done_loading
+    display_animation
   else
+    display_loading ang
     @ang += 0.1
-    x = cos(ang) * 8
-    y = sin(ang) * 8
-    fill(0, 8)
-    rect(50, 150, 100, 100)
-    fill(32, 32, 255)
-    ellipse(x + 100, y + 200, 8, 8)
-    fill(0)
-    rect(120, 150, 170, 100)
-    fill(128)
-    text("loading frames (#{curr} of 115)", 200, 200)
   end
 end
+
+def display_animation
+  background(0)
+  image(frames[curr], 0, 0)
+  @curr += 1
+  @curr = 0 if curr >= FRAMES
+end
+
+def display_loading(ang)
+  x = cos(ang) * 8
+  y = sin(ang) * 8
+  fill(0, 8)
+  rect(50, 150, 100, 100)
+  fill(32, 32, 255)
+  ellipse(x + 100, y + 200, 8, 8)
+  fill(0)
+  rect(120, 150, 170, 100)
+  fill(128)
+  text("loading frames (#{curr} of 115)", 200, 200)
+end