Refactor to be in line with the github style guide.

- Move require statements outside class defs.
- Use parens around defs with args.
- Remove implicit calls to super
- Replace offensive test fixture email.

Author: expez

lib/configuration.rb

@@ -8,7 +8,7 @@ class Configuration < ConfigToolkit::BaseConfig
 
   CONFIG_FILE = File.expand_path_relative_to_caller("../hatterrc")
 
-  def initialize config_file = CONFIG_FILE
+  def initialize(config_file = CONFIG_FILE)
     reader = ConfigToolkit::KeyValueReader.new config_file
     load reader
   end

lib/mailbox/maildir_mailbox.rb

@@ -1,12 +1,13 @@
-class Maildir_mailbox
-  require 'mail'
+require 'mail'
 
-  def initialize maildir_path
+class MaildirMailbox
+
+  def initialize(maildir_path)
     @maildir_path = maildir_path
     @maildir_path = "spec/fixtures/maildir"
   end
 
-  def mail where={label: nil, folder: nil, from: nil, to: nil, date: nil}
+  def mail(where={label: nil, folder: nil, from: nil, to: nil, date: nil})
     Mail.read(@maildir_path + "/INBOX/cur/TRAIN_00001.eml")
   end
 

lib/terminal.rb

@@ -1,13 +1,14 @@
+require 'termbox'
+require 'views/mail_view'
+require 'views/label_view'
+require 'views/folder_view'
+
 module Termbox
   TB_INPUT_ESCAPE = 1
   TB_INPUT_ALT = 2
 end
 
 class Terminal
-  require 'termbox'
-  require 'views/mail_view'
-  require 'views/label_view'
-  require 'views/folder_view'
 
   def initialize
     initialize_termbox
@@ -30,9 +31,9 @@ def initialize_views
     folder_view_location = {x0: 0, y0: 0, x1: 19, y1: 40}
     label_view_location = {x0: 0, y0: 41, x1: 19, y1: 79}
     mail_view_location = {x0: 20, y0: 0, x1: 79, y1: 79}
-    @views = [Mail_view.new(mail_view_location),
-              Label_view.new(label_view_location),
-              Folder_view.new(folder_view_location)]
+    @views = [MailView.new(mail_view_location),
+              LabelView.new(label_view_location),
+              FolderView.new(folder_view_location)]
   end
 
   def initialize_termbox

lib/views/folder_view.rb

@@ -1,8 +1,4 @@
-class Folder_view < View
-
-  def initialize location
-    super
-  end
+class FolderView < View
 
   def draw
     draw_folders

lib/views/label_view.rb

@@ -1,8 +1,4 @@
-class Label_view < View
-
-  def initialize location
-    super
-  end
+class LabelView < View
 
   def draw
     draw_labels

lib/views/mail_view.rb

@@ -1,9 +1,9 @@
 require 'views/view'
+require 'termbox'
 
-class Mail_view < View
-  require 'termbox'
+class MailView < View
 
-  def initialize location
+  def initialize(location)
     super
     @mail = @mailbox.most_recent
   end
@@ -23,7 +23,7 @@ def draw_borders
   end
 
   def draw_mail
-    from = @mail.sender
+    from, = @mail.from
     subject = @mail.subject
     text = @mail.body.decoded
     x = @start_x + @Border_width + 1

lib/views/view.rb

@@ -1,10 +1,11 @@
+require 'configuration'
+require 'termbox'
+
 class View
-  require 'configuration'
-  require 'termbox'
 
   attr_reader :colors, :mailbox
 
-  def initialize location
+  def initialize(location)
     @Border_width = 1
     @start_x = location[:x0]
     @start_y = location[:y0]
@@ -14,7 +15,7 @@ def initialize location
     set_colors
   end
 
-  def draw_text text, x, y
+  def draw_text(text, x, y)
     words = text.split(/\s+/)
     words.each do |word|
       if x + word.length + 1 >= @end_x
@@ -34,13 +35,13 @@ def draw_text text, x, y
     return y
   end
 
-  def draw_horizontal_line at
+  def draw_horizontal_line(at)
     @start_x.upto(@end_x) do |x|
       Termbox.tb_change_cell(x, at, " ".ord, @colors[:bg], @colors[:fg])
     end
   end
 
-  def draw_vertical_line at
+  def draw_vertical_line(at)
     @start_y.upto(@end_y) do |y|
       Termbox.tb_change_cell(at, y, " ".ord, @colors[:bg], @colors[:fg])
     end
@@ -49,13 +50,13 @@ def draw_vertical_line at
   private
 
   # Reads the maildir format from config file.  Requires the class and sets
-  # @mailbox to mailbox/<maildir-format>_mailbox
+  # @mailbox to mailbox/<maildir-format>Mailbox
   def set_mailbox
     config = Configuration.instance
     maildir_format = config.maildir_format
-    mailbox_class = maildir_format.capitalize + "_mailbox"
+    mailbox_class = maildir_format.capitalize + "Mailbox"
     class_dir = File.expand_path('../../', __FILE__) + "/mailbox"
-    mailbox_file = File.join class_dir, mailbox_class.downcase
+    mailbox_file = File.join class_dir, maildir_format + "_mailbox"
     require mailbox_file
     maildir_path = config.maildir
     @mailbox = self.class.const_get(mailbox_class).new maildir_path

spec/fixtures/maildir/INBOX/cur/TRAIN_00001.eml

@@ -1,63 +1,100 @@
-From [email protected]  Tue Aug 27 03:56:47 2002
-Return-Path: <[email protected]>
-Delivered-To: [email protected]
-Received: from localhost (localhost [127.0.0.1])
-	by phobos.labs.spamassassin.taint.org (Postfix) with ESMTP id 4451C43F99
-	for <zzzz@localhost>; Mon, 26 Aug 2002 22:56:47 -0400 (EDT)
-Received: from mail.webnote.net [193.120.211.219]
-	by localhost with POP3 (fetchmail-5.9.0)
-	for zzzz@localhost (single-drop); Tue, 27 Aug 2002 03:56:47 +0100 (IST)
-Received: from smtp.easydns.com (smtp.easydns.com [205.210.42.30])
-	by webnote.net (8.9.3/8.9.3) with ESMTP id DAA29086
-	for <[email protected]>; Tue, 27 Aug 2002 03:57:36 +0100
-Received: from 218.5.132.246 (unknown [211.160.14.157])
-	by smtp.easydns.com (Postfix) with SMTP id 7714C2C995
-	for <[email protected]>; Mon, 26 Aug 2002 22:57:31 -0400 (EDT)
-Received: from 55.92.178.196 ([55.92.178.196]) by smtp-server1.cfl.rr.com with QMQP; Aug, 26 2002 10:41:10 PM +1100
-Received: from [46.224.35.15] by rly-xl04.mx.aol.com with smtp; Aug, 26 2002 9:33:27 PM +1200
-Received: from unknown (26.113.85.29) by smtp4.cyberec.com with esmtp; Aug, 26 2002 8:57:10 PM -0100
-Received: from [183.62.39.149] by m10.grp.snv.yahoo.com with QMQP; Aug, 26 2002 7:52:32 PM +0600
-From: Veronica Styles <[email protected]>
-To: [email protected]
-Cc: 
-Subject: link to my webcam you wanted 
-Sender: Veronica Styles <[email protected]>
-Mime-Version: 1.0
-Content-Type: text/plain; charset="iso-8859-1"
-Date: Mon, 26 Aug 2002 22:57:34 -0400
-X-Mailer: eGroups Message Poster
-X-Priority: 1
-Message-Id: <[email protected]>
-
-Wanna see sexually curious teens playing with each other?
-
-http://www.site-personals.com <-- click here=)
-
-me and my horny girlfriends are waiting for you... we are probably eating each other out on webcam in our dormitory as ur reading this! (inbetween classes of course *wink*)
-
-see you soon baby,
--Veronica
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-mcmfkhcpedgetqj
-
+Return-Path: [email protected]
+Delivery-Date: Fri Sep 13 23:14:55 2002
+Return-Path: <[email protected]>
+Received: from mindupmerchants.com ([email protected] [24.205.211.91])
+	by lerami.lerctr.org (8.12.2/8.12.2/20020902/$Revision: 1.30 $) with ESMTP id g8E4EZE9029281
+	for <[email protected]>; Fri, 13 Sep 2002 23:14:48 -0500 (CDT)
+Message-Id: <[email protected]>
+Received: from 192.168.0.0 by mindupmerchants.com
+	with SMTP (MDaemon.PRO.v6.0.7.R)
+	for <[email protected]>; Fri, 13 Sep 2002 21:13:21 -0700
+From: "Ben Green" <[email protected]>
+To: [email protected]
+Subject: One of a kind Money maker! Try it for free!
+Date: Fri, 13 Sep 2002 21:13:19 -0700
+X-M5MailerProjectID: 4fb0caa2-c329-4c20-b331-229e681acee3
+Reply-To: [email protected]
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="----000000000000000000000"
+X-Return-Path: [email protected]
+X-MDaemon-Deliver-To: [email protected]
+X-Virus-Scanned: by amavisd-milter (http://amavis.org/)
+X-Status: 
+X-Keywords: 
+
+------000000000000000000000
+Content-Type: text/html;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: 7bit
+
+<body lang=EN-US>
+
+<div class=Section1>
+
+
+<p class=MsoBodyText style='text-align:justify'><b>CONSANTLY</b> being
+bombarded by so-called “FREE” money-making systems that teases you with limited
+information, and when it’s all said and done, blind-sides you by demanding your
+money/credit card information upfront in some slick way,<b> after-the-fact</b>!
+Yes, I too was as skeptical about such offers and the Internet in general with
+all its hype, as you probably are. Fortunate for me, my main business
+slowed-down (<i>I have been self-employed all my life</i>), so I looked for
+something to fit my lifestyle and some other way to assist me in paying my
+bills, without working myself to death or loosing more money; then, this
+proposal to try something new without any upfront investment (<i>great! because
+I had none</i>) interested me to click on the link provided. And I don’t regret
+at all that I did! I am very happy, and happy enough to recommend it to you as
+a system that is true to its word. I mean absolutely no upfront money. You join
+only if (<i>when</i>) you make money. You also get to track the results of your
+time and efforts instantly and updated daily! I especially liked this idea of
+personal control with real-time, staying informed statistics.</p>
+
+<p class=MsoBodyText style='text-align:justify'><b>This system is quite simply
+the most logical, opened, and fair of any others that I’ve seen before. Why?
+Because from the start, you get all the specific facts you need to seriously
+consider if this is right for you.  No teasing. No grand testimonies! No
+kidding! Just the facts! Unlike in other programs that give you “no idea” of
+their overall plan before first forking over your money/credit card; or worst
+yet, joining and finding-out too late, after wasting valuable time trying to
+figure them out, this system is straightforward and informative, providing you
+with the two things you really must know: “<u>What’s it all about</u>?” and “<u>How
+does it work</u>?”. These are the ultimate deal makers or deal breakers that
+need to be immediately disclosed, well before discovering that maybe you don’t
+want to do that; by then you are “hooked” and now locked into a frustrating
+battle to try to get your money back! </b></p>
+
+<p class=MsoBodyText style='text-align:justify'>I call this my “Platinum
+Choice” because it stands alone as a true, superior deal that is totally
+different from previously misleading, “hook-first” programs that promise lofty
+mega-money jackpots, but really just want your money upfront to line their own
+pockets! You’ve seen the headlines: “<u>Join free and Make $10,000 every week
+for life</u>” yeah, right!</p>
+
+<p class=MsoBodyText style='text-align:justify'>I did not make millions yet,
+but the whole thing was launched just a few weeks ago and I am more than happy
+with my earnings, so far. I must tell you, I wouldn’t be able to do anything
+without corporate help – which was unusually thorough, timely, and motivating. </p>
+
+<p class=MsoBodyText style='text-align:justify'>You have to see this in action
+for yourself and make up your own mind; just go to my site and fill out the
+form as soon as you can. You will get your own site in a few minutes. Then you
+are ready to try whether you can make some decent money with this system and
+the Internet’s explosive potential - fully loaded with hi-tech software, free
+corporate help, on-time member’s support and even protective safeguards! </p>
+
+<p class=MsoBodyText style='text-align:justify'>Get it now, and you can call me
+at any time with questions. It really could help you like it is helping me to
+finally be able to pay my bills, and keep my free time free.  Good luck!</p>
+
+<p class=MsoBodyText style='text-align:justify'><a
+href="http://www.mindupmerchants.com/default.asp?ID=5581">http://www.mindupmerchants.com/default.asp?ID=5581</a></p>
+
+<p class=MsoBodyText style='text-align:justify'>Ben Green, (775) 322-3323 </p>
+
+<p class=MsoBodyText>P.S.Free POP3 email is ofered for members now!</p>
+</div>
+
+</body>
+
+------000000000000000000000--