From 1bce43d6a51ee09631f55cf427a2e110d901ecb2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Mon, 2 Oct 2017 16:54:33 +0200 Subject: Don't validate again when checking if valid. Unless validation has not yet been performed, of course. --- lib/band.rb | 11 +++++------ lib/contact.rb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3