From 2dff3f5ada7a228b97227ea5f9c03fd280c69fc3 Mon Sep 17 00:00:00 2001 From: L Lumbreras Date: Sun, 1 Dec 2013 06:48:28 -0800 Subject: [PATCH 1/2] Add train hash and passenger struct --- recipe.rb | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/recipe.rb b/recipe.rb index d4b2000..6949b97 100644 --- a/recipe.rb +++ b/recipe.rb @@ -1,17 +1,14 @@ -ingredients = {} -ingredients[:avocados] = 4 -ingredients[:jalapenos] = 2 +train = {city: "Santa Fe", engines: 2, cars: 5, caboose: "Yes"} -Recipe = Struct.new(:ingredients, :method) +Passenger = Struct.new(:name, :train) -recipe = Recipe.new( {avacados: 4, jalapenos: 2}, ["Peel / Slice Avocados", "Chop jalapenos into small dice"]) +passenger = Passenger.new( "Jimmy Dean", train ) -puts "ingredients" -recipe.ingredients.each do |key, value| - puts "* #{key}: #{value}" +puts "\nTrain" +train.each do |key, value| + puts "* #{key.capitalize}: #{value}" end -puts "\nMethod" -recipe.method.each_with_index do |step, index| - puts "#{index+1}. #{step}" -end \ No newline at end of file +puts "\nPassenger" +puts "#{passenger.name} on train to #{passenger.train[:city]}. " + From de734c43c8f480b7ecfb7d4bb30886092ee811e5 Mon Sep 17 00:00:00 2001 From: L Lumbreras Date: Mon, 2 Dec 2013 16:23:57 -0800 Subject: [PATCH 2/2] Change train from hash to struct --- recipe.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/recipe.rb b/recipe.rb index 6949b97..41b71ac 100644 --- a/recipe.rb +++ b/recipe.rb @@ -1,13 +1,11 @@ -train = {city: "Santa Fe", engines: 2, cars: 5, caboose: "Yes"} +Train = Struct.new(:city,:engines, :cars, :caboose) +train = Train.new("Santa Fe", 2, 5, "Yes") Passenger = Struct.new(:name, :train) - passenger = Passenger.new( "Jimmy Dean", train ) puts "\nTrain" -train.each do |key, value| - puts "* #{key.capitalize}: #{value}" -end +puts "* City: #{train.city}\n* Engines: #{train.engines}\n* Cars: #{train.cars}\n* Caboose: #{train.caboose}" puts "\nPassenger" puts "#{passenger.name} on train to #{passenger.train[:city]}. "