From 343a70ee9fe7f218f2a2126dd3bd4be39b1390b0 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sat, 16 Mar 2013 18:55:47 -0400
Subject: [PATCH 1/3] Panda complete

---
 Gemfile.lock               |  2 ++
 config/database.yml.sample |  6 ------
 db/seed.rb                 |  4 ++++
 watchman.rb                | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 config/database.yml.sample

diff --git a/Gemfile.lock b/Gemfile.lock
index 2b2ab2c..86c6c37 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,6 +18,7 @@ GEM
     i18n (0.6.0)
     multi_json (1.3.4)
     pg (0.13.2)
+    pg (0.13.2-x86-mingw32)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -31,6 +32,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activerecord
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..d9397a5 100644
--- a/db/seed.rb
+++ b/db/seed.rb
@@ -3,5 +3,9 @@
 Show.delete_all
 amc = Network.create(name: "AMC")
 nbc = Network.create(name: "NBC")
+fox = Network.create(name: "FOX")
+fx = Network.create(name: "FX")
 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: "Bones", day_of_week: "Monday", hour_of_day: 20, network: fox)
+Show.create(name: "Archer", day_of_week: "Thursday", hour_of_day: 22, network: fx)
\ No newline at end of file
diff --git a/watchman.rb b/watchman.rb
index ebe9be4..d438fd2 100644
--- a/watchman.rb
+++ b/watchman.rb
@@ -6,10 +6,21 @@
 require "./db/seed"
 
 puts "There are #{Show.count} in the database"
-
 Network.all.each do |network|
 	puts "Shows airing on #{network}"
 	network.shows.each do |show|
 		puts show
 	end	
 end
+
+puts "\nAll shows"
+Show.all.each do |show|
+	puts show
+end
+
+puts "\nWhat day do you want to watch a show?"
+day = gets.chomp()
+puts "\nShows on #{day}"
+Show.all.each do |show| 
+	puts show if show.day_of_week == day
+end
\ No newline at end of file

From 2d853f44da4029e5c1fb49fe3cbab3c417dab7f2 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sat, 16 Mar 2013 19:02:19 -0400
Subject: [PATCH 2/3] Tiger complete

---
 watchman.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/watchman.rb b/watchman.rb
index d438fd2..81b5836 100644
--- a/watchman.rb
+++ b/watchman.rb
@@ -19,7 +19,7 @@
 end
 
 puts "\nWhat day do you want to watch a show?"
-day = gets.chomp()
+day = gets.chomp().capitalize
 puts "\nShows on #{day}"
 Show.all.each do |show| 
 	puts show if show.day_of_week == day

From 700ac9a8dd1d11509e967ecfb53dcc426f1f2669 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sat, 6 Apr 2013 22:15:08 -0400
Subject: [PATCH 3/3] Eagle complete

---
 db/migrate/001_create_games.rb             | 10 +++++++++
 db/migrate/002_create_publishers.rb        | 13 ++++++++++++
 db/migrate/201205031230_create_shows.rb    |  9 --------
 db/migrate/201205031300_create_networks.rb | 13 ------------
 db/seed.rb                                 | 21 ++++++++++---------
 models/game.rb                             |  9 ++++++++
 models/network.rb                          |  7 -------
 models/publisher.rb                        |  7 +++++++
 models/show.rb                             |  9 --------
 watchman.rb                                | 24 ++++++++--------------
 10 files changed, 58 insertions(+), 64 deletions(-)
 create mode 100644 db/migrate/001_create_games.rb
 create mode 100644 db/migrate/002_create_publishers.rb
 delete mode 100644 db/migrate/201205031230_create_shows.rb
 delete mode 100644 db/migrate/201205031300_create_networks.rb
 create mode 100644 models/game.rb
 delete mode 100644 models/network.rb
 create mode 100644 models/publisher.rb
 delete mode 100644 models/show.rb

diff --git a/db/migrate/001_create_games.rb b/db/migrate/001_create_games.rb
new file mode 100644
index 0000000..e220c51
--- /dev/null
+++ b/db/migrate/001_create_games.rb
@@ -0,0 +1,10 @@
+class CreateGames < ActiveRecord::Migration
+	def change
+		create_table :games do |t|
+			t.string :name
+			t.string :designer
+			t.integer :players_min
+			t.integer :players_max
+		end
+	end
+end
diff --git a/db/migrate/002_create_publishers.rb b/db/migrate/002_create_publishers.rb
new file mode 100644
index 0000000..2800799
--- /dev/null
+++ b/db/migrate/002_create_publishers.rb
@@ -0,0 +1,13 @@
+class CreatePublishers < ActiveRecord::Migration
+	def change
+		create_table :publishers do |t|
+			t.string :name
+			t.timestamps
+		end
+
+		change_table :games do |t|
+			t.references :publisher
+			t.timestamps
+		end
+	end
+end
diff --git a/db/migrate/201205031230_create_shows.rb b/db/migrate/201205031230_create_shows.rb
deleted file mode 100644
index 8197b57..0000000
--- a/db/migrate/201205031230_create_shows.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class CreateShows < ActiveRecord::Migration
-	def change
-		create_table :shows do |t|
-			t.string :name
-			t.string :day_of_week
-			t.integer :hour_of_day
-		end
-	end
-end
diff --git a/db/migrate/201205031300_create_networks.rb b/db/migrate/201205031300_create_networks.rb
deleted file mode 100644
index 2ef327c..0000000
--- a/db/migrate/201205031300_create_networks.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateNetworks < ActiveRecord::Migration
-	def change
-		create_table :networks do |t|
-			t.string :name
-			t.timestamps
-		end
-
-		change_table :shows do |t|
-			t.references :network
-			t.timestamps
-		end
-	end
-end
diff --git a/db/seed.rb b/db/seed.rb
index d9397a5..b537771 100644
--- a/db/seed.rb
+++ b/db/seed.rb
@@ -1,11 +1,12 @@
 # Cleaning Out
-Network.delete_all
-Show.delete_all
-amc = Network.create(name: "AMC")
-nbc = Network.create(name: "NBC")
-fox = Network.create(name: "FOX")
-fx = Network.create(name: "FX")
-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: "Bones", day_of_week: "Monday", hour_of_day: 20, network: fox)
-Show.create(name: "Archer", day_of_week: "Thursday", hour_of_day: 22, network: fx)
\ No newline at end of file
+Publisher.delete_all
+Game.delete_all
+ffg = Publisher.create(name: "Fantasy Flight Games")
+slg = Publisher.create(name: "Sirlin Games")
+zmg = Publisher.create(name: "Z-Man Games")
+
+Game.create(name: "Mansions of Madness", players_min: 2, players_max: 5, designer: "Corey Konieczka", publisher: ffg)
+Game.create(name: "Android: Infiltration", players_min: 2, players_max: 6, designer: "Donald X. Vaccarino", publisher: ffg)
+Game.create(name: "Puzzle Strike", players_min: 2, players_max: 4, designer: "David Sirlin", publisher: slg)
+Game.create(name: "Flash Duel", players_min: 1, players_max: 5, designer: "David Sirlin", publisher: slg)
+Game.create(name: "Pandemic", players_min: 2, players_max: 4, designer: "Matt Leacock", publisher: zmg)
\ No newline at end of file
diff --git a/models/game.rb b/models/game.rb
new file mode 100644
index 0000000..200c8ee
--- /dev/null
+++ b/models/game.rb
@@ -0,0 +1,9 @@
+class Game < ActiveRecord::Base
+	belongs_to :publisher
+
+	validates_presence_of :name
+
+	def to_s
+		"#{designer}'s \"#{name}\" for #{players_min}-#{players_max} players published by #{publisher}." # is for #{hour_of_day}:#{day_of_week}:00 on #{network} "
+	end
+end
diff --git a/models/network.rb b/models/network.rb
deleted file mode 100644
index 00b697c..0000000
--- a/models/network.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class Network < ActiveRecord::Base
-	has_many :shows
-
-	def to_s
-		name
-	end
-end
diff --git a/models/publisher.rb b/models/publisher.rb
new file mode 100644
index 0000000..12683bd
--- /dev/null
+++ b/models/publisher.rb
@@ -0,0 +1,7 @@
+class Publisher < ActiveRecord::Base
+	has_many :games
+
+	def to_s
+		name
+	end
+end
diff --git a/models/show.rb b/models/show.rb
deleted file mode 100644
index 6c82f65..0000000
--- a/models/show.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Show < ActiveRecord::Base
-	belongs_to :network
-
-	validates_presence_of :name
-
-	def to_s
-		"#{name} airs at #{hour_of_day}:#{day_of_week}:00 on #{network} "
-	end
-end
diff --git a/watchman.rb b/watchman.rb
index 81b5836..4c2b16f 100644
--- a/watchman.rb
+++ b/watchman.rb
@@ -5,22 +5,14 @@
 Dir.glob('./models/*').each { |r| require r}
 require "./db/seed"
 
-puts "There are #{Show.count} in the database"
-Network.all.each do |network|
-	puts "Shows airing on #{network}"
-	network.shows.each do |show|
-		puts show
-	end	
+puts "There are #{Game.count} games in the database:"
+Game.all.each do |game|
+	puts game
 end
 
-puts "\nAll shows"
-Show.all.each do |show|
-	puts show
-end
-
-puts "\nWhat day do you want to watch a show?"
-day = gets.chomp().capitalize
-puts "\nShows on #{day}"
-Show.all.each do |show| 
-	puts show if show.day_of_week == day
+puts "\nHow many players do you have? (Enter 1-6)"
+player_count = gets.chomp().to_i
+puts "\nGames for #{player_count} player(s):"
+Game.all.each do |game| 
+	puts game if game.players_min <= player_count && game.players_max >= player_count
 end
\ No newline at end of file