From 4f31e8f326a03d30adc901fad696adbc32ca66ae Mon Sep 17 00:00:00 2001 From: Darko Date: Tue, 26 Nov 2013 14:22:54 +0100 Subject: [PATCH 1/4] Add juniors method and change output so it outputs both senior and junior --- student.rb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/student.rb b/student.rb index 514cc09..8f4ff29 100644 --- a/student.rb +++ b/student.rb @@ -9,7 +9,11 @@ def initialize(first_name, last_name, grade) def senior? grade == 12 - end + end + + def junior? + grade == 11 + end def to_s "#{last_name}, #{first_name}" @@ -20,11 +24,22 @@ def seniors(students) students.select { |student| student.senior? } end +def juniors(students) + students.select { |student| student.junior? } +end + fred = Student.new("Fred", "James", 12) sarah = Student.new("Sarah", "Smith", 12) jack = Student.new("Jack", "Gong", 11) all_students = [fred, sarah, jack] +puts 'Seniors' seniors(all_students).each do |student| - puts student + puts "* #{student}" +end + +puts +puts 'Juniors' +juniors(all_students).each do |student| + puts "* #{student}" end From 623d47087960ed043fbf682867399c294f0d7a6c Mon Sep 17 00:00:00 2001 From: Darko Date: Tue, 26 Nov 2013 14:36:18 +0100 Subject: [PATCH 2/4] Change formatting --- student.rb | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/student.rb b/student.rb index 8f4ff29..0736536 100644 --- a/student.rb +++ b/student.rb @@ -1,27 +1,28 @@ class Student - attr_reader :first_name, :last_name, :grade - def initialize(first_name, last_name, grade) - @first_name = first_name - @last_name = last_name - @grade = grade - end - - def senior? - grade == 12 + attr_reader :first_name, :last_name, :grade + + def initialize(first_name, last_name, grade) + @first_name = first_name + @last_name = last_name + @grade = grade + end + + def senior? + grade == 12 end def junior? grade == 11 end - def to_s - "#{last_name}, #{first_name}" - end + def to_s + "#{last_name}, #{first_name}" + end end def seniors(students) - students.select { |student| student.senior? } + students.select { |student| student.senior? } end def juniors(students) @@ -35,7 +36,7 @@ def juniors(students) puts 'Seniors' seniors(all_students).each do |student| - puts "* #{student}" + puts "* #{student}" end puts From 33f9d5f93fc6e03b9d66d8b96602d752e50f3d07 Mon Sep 17 00:00:00 2001 From: Darko Date: Tue, 26 Nov 2013 14:39:13 +0100 Subject: [PATCH 3/4] change formatting again, Rubymine is driving me crazy! --- student.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/student.rb b/student.rb index 0736536..2366f0a 100644 --- a/student.rb +++ b/student.rb @@ -1,7 +1,6 @@ class Student attr_reader :first_name, :last_name, :grade - def initialize(first_name, last_name, grade) @first_name = first_name @last_name = last_name From 9344506618e883c8c8e9fec3617ca520d96ee19c Mon Sep 17 00:00:00 2001 From: Darko Date: Tue, 26 Nov 2013 14:45:36 +0100 Subject: [PATCH 4/4] Add \n instead of puts on a separate line --- student.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/student.rb b/student.rb index 2366f0a..81a2f9c 100644 --- a/student.rb +++ b/student.rb @@ -38,8 +38,7 @@ def juniors(students) puts "* #{student}" end -puts -puts 'Juniors' +puts "\nJuniors" juniors(all_students).each do |student| puts "* #{student}" end