Don't validate again when checking if valid.

Unless validation has not yet been performed, of course.

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/band.rb b/lib/band.rb
index 9b949c7..dc69642 100644
--- a/lib/band.rb
+++ b/lib/band.rb
@@ -7,7 +7,6 @@ class Band
   attr_accessor :errors
 
   def initialize(params = nil)
-    @errors = []
     @contact = Contact.new
     @members = ""
     @songs = []
@@ -31,13 +30,13 @@ class Band
   end
 
   def valid?
-    validate!
-    errors.length == 0
+    validate! unless errors
+    !has_errors?
   end
 
   def validate!
     @errors = []
-    
+
     if @name.nil? || @name.strip.empty?
       errors << "Bandnavn mangler"
     end
@@ -49,8 +48,8 @@ class Band
     end
   end
 
-  def has_errors
-    errors.length > 0
+  def has_errors?
+    errors && errors.length > 0
   end
 
   def name_and_city
diff --git a/lib/contact.rb b/lib/contact.rb
index d5fd267..0a7a449 100644
--- a/lib/contact.rb
+++ b/lib/contact.rb
@@ -17,7 +17,7 @@ class Contact
   end
 
   def valid?
-    validate!
+    validate! unless @errors
     @errors.length == 0
   end