From 51959397c61e87222b288089caa28572128e2336 Mon Sep 17 00:00:00 2001 From: Salome Wubeshet Date: Wed, 16 Aug 2017 09:00:35 -0700 Subject: [PATCH 1/2] Create Pipe Salome Wubeshet SolarSystem.rb --- Pipe Salome Wubeshet SolarSystem.rb | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 Pipe Salome Wubeshet SolarSystem.rb diff --git a/Pipe Salome Wubeshet SolarSystem.rb b/Pipe Salome Wubeshet SolarSystem.rb new file mode 100644 index 00000000..8d5c5a4a --- /dev/null +++ b/Pipe Salome Wubeshet SolarSystem.rb @@ -0,0 +1,46 @@ +class SolarSystem + def initialize (all_planets) + @all_planets = all_planets + end + + def print_planets + return @all_planets + end + + def planets + return @all_planets + end + + def add + puts "What planet do you want to add?\n" + new_planet = gets.chomp + @planets << new_planet + end + +class Planet + attr_accessor :name, :color, :surface + + def initialize (name, color, surface) + @name = name + @color = color + @surface = surface + end + + def return_att + puts "Planet Name: #{name}\nPlanet Color: #{color}\nPlanet Surface: #{surface}" + end + + def planets + return @all_planets + end +end + +earth = SolarSystem.new("Earth", "Blue", "Waters and Rocks") +mars = SolarSystem.new("Mars", "Red", "Rocky") +venus = SolarSystem.new("Venus", "Green", "Granitic Rock") + +all_planets = [earth, mars, venus].add + +puts earth.return_att +puts mars.return_att +puts venus.return_att From ef38b40c852a3fe75b5019f3d21551c772cfc5e1 Mon Sep 17 00:00:00 2001 From: Salome Wubeshet Date: Wed, 16 Aug 2017 09:13:25 -0700 Subject: [PATCH 2/2] Update Pipe Salome Wubeshet SolarSystem.rb --- Pipe Salome Wubeshet SolarSystem.rb | 50 ++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/Pipe Salome Wubeshet SolarSystem.rb b/Pipe Salome Wubeshet SolarSystem.rb index 8d5c5a4a..aff5762d 100644 --- a/Pipe Salome Wubeshet SolarSystem.rb +++ b/Pipe Salome Wubeshet SolarSystem.rb @@ -7,15 +7,11 @@ def print_planets return @all_planets end - def planets - return @all_planets - end + # def planets + # return @all_planets + # end - def add - puts "What planet do you want to add?\n" - new_planet = gets.chomp - @planets << new_planet - end +end class Planet attr_accessor :name, :color, :surface @@ -24,23 +20,45 @@ def initialize (name, color, surface) @name = name @color = color @surface = surface + @all_planets = {} end def return_att - puts "Planet Name: #{name}\nPlanet Color: #{color}\nPlanet Surface: #{surface}" - end + count = 1 + puts "\n#{count} Planet Name: #{name}\n#{count+1} Planet Color: #{color}\n#{count+2} Planet Surface: #{surface}" - def planets - return @all_planets end + + def store (key) + @all_planets = {key => [@name, @color, @surface]} + end + + def add + puts "What planet do you want to add?\n" + new_planet = gets.chomp + @all_planets << new_planet + end + + # def planets + # return @all_planets + # end end -earth = SolarSystem.new("Earth", "Blue", "Waters and Rocks") -mars = SolarSystem.new("Mars", "Red", "Rocky") -venus = SolarSystem.new("Venus", "Green", "Granitic Rock") +earth = Planet.new("Earth", "Blue", "Waters and Rocks") +mars = Planet.new("Mars", "Red", "Rocky") +venus = Planet.new("Venus", "Green", "Granitic Rock") + +all_planets = [earth, mars, venus] -all_planets = [earth, mars, venus].add +puts earth.store("earth") +puts mars.store("mars") +puts venus.store("venus") puts earth.return_att puts mars.return_att puts venus.return_att + +# puts mars.return_att +# puts venus.return_att + +