From d06d42ce408afb6a14912028f0632334001d9ae2 Mon Sep 17 00:00:00 2001 From: Anna Vester Date: Sat, 1 Dec 2012 17:20:34 -0600 Subject: [PATCH 1/2] Assignment #3: Panda and Tiger Levels --- config/database.yml.sample | 6 ------ db/seed.rb | 3 +++ models/show.rb | 2 +- watchman.rb | 13 +++++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 config/database.yml.sample diff --git a/config/database.yml.sample b/config/database.yml.sample deleted file mode 100644 index 44360d7..0000000 --- a/config/database.yml.sample +++ /dev/null @@ -1,6 +0,0 @@ -host: 'localhost' -adapter: 'postgresql' -database: 'watchman' -username: XXXXXXX -encoding: 'utf8' -pool: 5 diff --git a/db/seed.rb b/db/seed.rb index 3c028ff..ec262d9 100644 --- a/db/seed.rb +++ b/db/seed.rb @@ -3,5 +3,8 @@ Show.delete_all amc = Network.create(name: "AMC") nbc = Network.create(name: "NBC") +cbs = Network.create(name: "CBS") Show.create(name: "Mad Men", day_of_week: "Sunday", hour_of_day: 22, network: amc) Show.create(name: "Community", day_of_week: "Thursday", hour_of_day: 20, network: nbc) +Show.create(name: "Person of Interest", day_of_week: "Thursday", hour_of_day: 20, network: cbs) +Show.create(name: "Criminal Minds", day_of_week: "Wednesday", hour_of_day: 20, network: cbs) diff --git a/models/show.rb b/models/show.rb index 6c82f65..f7fc0b3 100644 --- a/models/show.rb +++ b/models/show.rb @@ -4,6 +4,6 @@ class Show < ActiveRecord::Base validates_presence_of :name def to_s - "#{name} airs at #{hour_of_day}:#{day_of_week}:00 on #{network} " + "#{name} airs at #{hour_of_day}:00 on #{day_of_week}" end end diff --git a/watchman.rb b/watchman.rb index ebe9be4..dc5aad5 100644 --- a/watchman.rb +++ b/watchman.rb @@ -13,3 +13,16 @@ puts show end end + +def find_show + dow = { Monday: 1, Tuesday: 2, Wednesday: 3, Thursday: 4, Friday: 5, Saturday: 6, Sunday: 7 } + puts "Pick a day of week: Use 1 for Monday ... 7 for Sunday" + user_pick = dow.key ( gets.to_i ) + + Network.all.each do |network| + network.shows.each { |show| puts show if show.day_of_week == user_pick.to_s } + end + +end + +find_show From 8c22470862bfeb2e5a802bb47dc0dea205f2eb90 Mon Sep 17 00:00:00 2001 From: Anna Vester Date: Sun, 2 Dec 2012 21:20:52 -0600 Subject: [PATCH 2/2] updated hash format --- watchman.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/watchman.rb b/watchman.rb index dc5aad5..38df26b 100644 --- a/watchman.rb +++ b/watchman.rb @@ -15,14 +15,14 @@ end def find_show - dow = { Monday: 1, Tuesday: 2, Wednesday: 3, Thursday: 4, Friday: 5, Saturday: 6, Sunday: 7 } + dow = { 1 => "Monday", 2 => "Tuesday", 3 => "Wednesday", 4 => "Thursday", 5 => "Friday", 6 => "Saturday", 7 => "Sunday" } puts "Pick a day of week: Use 1 for Monday ... 7 for Sunday" - user_pick = dow.key ( gets.to_i ) + user_pick = dow.fetch( gets.to_i ) { puts "sorry, not found" } Network.all.each do |network| - network.shows.each { |show| puts show if show.day_of_week == user_pick.to_s } + network.shows.each { |show| puts show if show.day_of_week == user_pick } end end -find_show +find_show \ No newline at end of file