From 7b3ce243c3e2532e57d6f1a8ec88b999489e8f10 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sun, 21 Apr 2013 19:18:58 -0400
Subject: [PATCH 01/13] Panda complete

---
 Gemfile          | 1 +
 Gemfile.lock     | 5 ++++-
 theweb.rb        | 4 ++++
 views/layout.erb | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 416fe44..96fa1dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,3 +4,4 @@ gem 'rake'
 gem 'activesupport'
 gem 'sinatra'
 gem 'sinatra-contrib'
+gem 'eventmachine', '~> 1.0.0.beta.4.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d79568..4628783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,7 +5,8 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     backports (2.5.3)
-    eventmachine (0.12.10)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-x86-mingw32)
     i18n (0.6.0)
     multi_json (1.3.5)
     rack (1.4.1)
@@ -29,9 +30,11 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   activesupport
+  eventmachine (~> 1.0.0.beta.4.1)
   rake
   sinatra
   sinatra-contrib
diff --git a/theweb.rb b/theweb.rb
index a531ce4..16a9176 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -8,6 +8,10 @@
 	erb :dashboard
 end
 
+get '/about' do
+	erb :about
+end
+
 post '/number' do
 	@number_of_randoms = session[:number_of_randoms] || 0
 	@number_of_randoms += 1
diff --git a/views/layout.erb b/views/layout.erb
index 8797f75..92f36b6 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -46,7 +46,7 @@
           <div class="nav-collapse">
             <ul class="nav">
               <li class="active"><a href="#">Home</a></li>
-              <li><a href="#about">About</a></li>
+              <li><a href="about">About</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
           </div><!--/.nav-collapse -->

From 31c1707b9f5e5b50939b5cb6c1e900ee18af43e5 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sun, 21 Apr 2013 19:19:10 -0400
Subject: [PATCH 02/13] Panda complete

---
 views/about.erb | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 views/about.erb

diff --git a/views/about.erb b/views/about.erb
new file mode 100644
index 0000000..f5d17d6
--- /dev/null
+++ b/views/about.erb
@@ -0,0 +1,2 @@
+<h1>About me:</h1>
+<h2>Hi, I'm learning Ruby!</h2>

From 50fbe65eb7b9ee04b1801d71ad5ee2d51420f9ae Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sun, 21 Apr 2013 20:58:30 -0400
Subject: [PATCH 03/13] Tiger complete

---
 theweb.rb        | 9 ++++++++-
 views/about.erb  | 2 +-
 views/layout.erb | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/theweb.rb b/theweb.rb
index 16a9176..2923d8e 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -5,7 +5,14 @@
 enable :sessions
 
 get '/' do
-	erb :dashboard
+	#erb :dashboard
+	about_text = []
+	about_text << "I've been learning Ruby for about five months."
+	about_text << "I live in Atlanta, Georgia."
+	about_text << "I like reading, knitting, and gardening."
+	about_text << "I went to Clemson University. Go Tigers!!"
+	@random_text = about_text.sample
+	erb :about
 end
 
 get '/about' do
diff --git a/views/about.erb b/views/about.erb
index f5d17d6..2415daa 100644
--- a/views/about.erb
+++ b/views/about.erb
@@ -1,2 +1,2 @@
 <h1>About me:</h1>
-<h2>Hi, I'm learning Ruby!</h2>
+<h2>Hi!  I'm Melissa, and <%= @random_text %></h2>
diff --git a/views/layout.erb b/views/layout.erb
index 92f36b6..b7ab682 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -83,7 +83,7 @@
       <hr>
 
       <footer>
-				<p>Number of Randoms: <%= @number_of_randoms %></p>
+				<!--<p>Number of Randoms: <%= @number_of_randoms %></p>
 				OH HAI THERE
         <p>&copy; Company 2012</p>
       </footer>

From 7efffb708dcc2dcbb75519b3fc1d49286abad89a Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Mon, 22 Apr 2013 23:11:57 -0400
Subject: [PATCH 04/13] Fixed /about page random text

---
 theweb.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/theweb.rb b/theweb.rb
index 2923d8e..0e0954e 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -6,16 +6,18 @@
 
 get '/' do
 	#erb :dashboard
-	about_text = []
-	about_text << "I've been learning Ruby for about five months."
-	about_text << "I live in Atlanta, Georgia."
-	about_text << "I like reading, knitting, and gardening."
-	about_text << "I went to Clemson University. Go Tigers!!"
-	@random_text = about_text.sample
+	@about_text = []
+	@about_text << "I've been learning Ruby for about five months."
+	@about_text << "I live in Atlanta, Georgia."
+	@about_text << "I like reading, knitting, and gardening."
+	@about_text << "I went to Clemson University. Go Tigers!!"
+	session[:random_text] = @about_text
+	@random_text = session[:random_text].sample
 	erb :about
 end
 
 get '/about' do
+	@random_text = session[:random_text].sample
 	erb :about
 end
 

From 31cd9efd4a1e52184ee0bd1bf84454087509dda7 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Tue, 23 Apr 2013 01:07:49 -0400
Subject: [PATCH 05/13] Eagle complete

---
 Gemfile                             |  2 ++
 Gemfile.lock                        | 14 +++++++++
 db/migrate/001_creates_page.rb      | 13 +++++++++
 db/seed.rb                          | 19 ++++++++++++
 db/setup.rb                         | 15 ++++++++++
 models/book.rb                      | 21 ++++++++++++++
 models/page.rb                      | 13 +++++++++
 theweb.rb                           | 45 ++++++++++++++++++++++++++++-
 views/about.erb                     |  6 ++++
 views/adventure.erb                 | 13 +++++++++
 views/conclusion.erb                |  5 ++++
 views/layout.erb                    | 15 +++++-----
 views/number.erb                    |  4 +--
 views/{dashboard.erb => random.erb} |  2 +-
 14 files changed, 176 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/001_creates_page.rb
 create mode 100644 db/seed.rb
 create mode 100644 db/setup.rb
 create mode 100644 models/book.rb
 create mode 100644 models/page.rb
 create mode 100644 views/adventure.erb
 create mode 100644 views/conclusion.erb
 rename views/{dashboard.erb => random.erb} (90%)

diff --git a/Gemfile b/Gemfile
index 96fa1dd..18bfb52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,3 +5,5 @@ gem 'activesupport'
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'eventmachine', '~> 1.0.0.beta.4.1'
+gem 'activerecord'
+gem 'pg'
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4628783..5dae344 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     backports (2.5.3)
+    builder (3.0.4)
     eventmachine (1.0.3)
     eventmachine (1.0.3-x86-mingw32)
     i18n (0.6.0)
     multi_json (1.3.5)
+    pg (0.15.0-x86-mingw32)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -27,14 +38,17 @@ GEM
       sinatra (~> 1.3.0)
       tilt (~> 1.3)
     tilt (1.3.3)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
+  activerecord
   activesupport
   eventmachine (~> 1.0.0.beta.4.1)
+  pg
   rake
   sinatra
   sinatra-contrib
diff --git a/db/migrate/001_creates_page.rb b/db/migrate/001_creates_page.rb
new file mode 100644
index 0000000..0f3b6bd
--- /dev/null
+++ b/db/migrate/001_creates_page.rb
@@ -0,0 +1,13 @@
+class CreatesPage < ActiveRecord::Migration
+	def change
+		create_table :pages do |t|
+			t.text :content
+			t.text :preview
+			t.integer :parent_id
+			t.integer :option_a_id
+			t.integer :option_b_id
+			t.boolean :starting_point, default: false
+			t.boolean :conclusion, default: false
+		end
+	end
+end
diff --git a/db/seed.rb b/db/seed.rb
new file mode 100644
index 0000000..74df529
--- /dev/null
+++ b/db/seed.rb
@@ -0,0 +1,19 @@
+Page.delete_all
+
+campfire = Page.create(conclusion: true, preview: "Approach the campfire", 
+	content: "Bandits steal your bag.  You lose everything!!")
+sit = Page.create(conclusion: true, preview: "Sit down to eat your sandwich", 
+	content: "You are attacked by a hungry bear who smells bacon.  You lose.")
+walk = Page.create(conclusion: true, preview: "Keep walking",
+	content: "You made it back to the inn safely.  You win 100 gold pieces!!")
+
+forest = Page.create(option_a_id: sit.id, option_b_id: campfire.id,
+	preview: "Go into the forest", 
+	content: "You see a campfire in the distance.")
+road = Page.create(option_a_id: sit.id, option_b_id: walk.id,
+	preview: "Walk down the road",
+	content: "You are hungry.")
+
+start = Page.create(starting_point: true, option_a_id: forest.id, option_b_id: road.id,
+	preview: "Welcome, adventurer.", 
+	content: "You wake up on a road. It's foggy and damp. Your bag conatains 30 gold pieces and a bacon sandwich.")
diff --git a/db/setup.rb b/db/setup.rb
new file mode 100644
index 0000000..1cbf7ce
--- /dev/null
+++ b/db/setup.rb
@@ -0,0 +1,15 @@
+require 'pg'
+require 'active_record'
+require 'yaml'
+
+connection_details = YAML::load(File.open('config/database.yml'))
+
+# Setup out connection details
+ActiveRecord::Base.establish_connection(connection_details.merge({'database'=> 'postgres', 'schema_search_path'=> 'public'}))
+# create the 'tv' database 
+ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
+ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
+# connect to it
+ActiveRecord::Base.establish_connection(connection_details)
+# Migrate all the things
+ActiveRecord::Migrator.migrate("db/migrate/")
\ No newline at end of file
diff --git a/models/book.rb b/models/book.rb
new file mode 100644
index 0000000..5eb6f53
--- /dev/null
+++ b/models/book.rb
@@ -0,0 +1,21 @@
+class Book
+
+	attr_reader :current_page
+
+	def initialize(starting_page)
+		@current_page = starting_page
+	end
+
+	def input(input_string)
+		if input_string.chomp == "A"	
+			@current_page = current_page.options.first
+		elsif input_string.chomp == "B"
+			@current_page = current_page.options.last
+		end
+	end
+
+	def complete_game?
+		current_page.conclusion?
+	end
+
+end
diff --git a/models/page.rb b/models/page.rb
new file mode 100644
index 0000000..d695df2
--- /dev/null
+++ b/models/page.rb
@@ -0,0 +1,13 @@
+class Page < ActiveRecord::Base
+
+	attr_reader :options
+
+	def self.starting_point
+		Page.where(starting_point: true).first
+	end
+
+	def options
+		options = Page.find(option_a_id, option_b_id)
+	end
+
+end
diff --git a/theweb.rb b/theweb.rb
index 0e0954e..77aabe9 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -2,10 +2,15 @@
 require 'bundler/setup'
 require 'sinatra'
 require 'sinatra/reloader'
+
+require_relative 'db/setup'
+require_relative 'models/page'
+require_relative 'models/book'
+require "./db/seed"
+
 enable :sessions
 
 get '/' do
-	#erb :dashboard
 	@about_text = []
 	@about_text << "I've been learning Ruby for about five months."
 	@about_text << "I live in Atlanta, Georgia."
@@ -21,6 +26,43 @@
 	erb :about
 end
 
+get '/random' do
+	erb :random
+end
+
+get '/adventure' do
+	session[:book] = book = Book.new(Page.starting_point)
+	@content = session[:book].current_page.content
+	@option_1 = session[:book].current_page.options.first.preview
+	@option_2 = session[:book].current_page.options.last.preview
+	erb :adventure
+end
+
+post '/option_1' do
+	session[:book].input("A")
+	@content = session[:book].current_page.content
+	if session[:book].complete_game?
+		erb :conclusion
+	else
+		@option_1 = session[:book].current_page.options.first.preview
+		@option_2 = session[:book].current_page.options.last.preview
+		erb :adventure	
+	end
+end
+
+post '/option_2' do
+	session[:book].input("B")
+	@content = session[:book].current_page.content
+	if session[:book].complete_game? 
+		erb :conclusion
+	else
+		@option_1 = session[:book].current_page.options.first.preview
+		@option_2 = session[:book].current_page.options.last.preview
+		erb :adventure
+	end
+end
+
+
 post '/number' do
 	@number_of_randoms = session[:number_of_randoms] || 0
 	@number_of_randoms += 1
@@ -29,3 +71,4 @@
 	@the_number = rand(number_as_string)
 	erb :number
 end
+
diff --git a/views/about.erb b/views/about.erb
index 2415daa..0ba9d58 100644
--- a/views/about.erb
+++ b/views/about.erb
@@ -1,2 +1,8 @@
 <h1>About me:</h1>
 <h2>Hi!  I'm Melissa, and <%= @random_text %></h2>
+<break>
+<br>
+<form method="GET" action="/adventure">
+	<label for="adventure"><h2>Are you ready for an adventure?</h2></label>
+	<input type="submit" class="btn btn-large btn-primary" value="Yes!"/>
+</form>
\ No newline at end of file
diff --git a/views/adventure.erb b/views/adventure.erb
new file mode 100644
index 0000000..c53ae80
--- /dev/null
+++ b/views/adventure.erb
@@ -0,0 +1,13 @@
+<h1>Your story so far:</h1>
+
+<h2><%= @content %></h2>
+<br>
+<h2>What do you want to do next?</h2>
+
+<form method="POST" action="/option_1">
+	<input type="submit" class="btn btn-large btn-primary" value="<%= @option_1 %>"/>
+</form>
+
+<form method="POST" action="/option_2">
+	<input type="submit" class="btn btn-large btn-primary" value="<%= @option_2 %>"/>
+</form>
diff --git a/views/conclusion.erb b/views/conclusion.erb
new file mode 100644
index 0000000..cde0041
--- /dev/null
+++ b/views/conclusion.erb
@@ -0,0 +1,5 @@
+<h1>Your story so far:</h1>
+
+<h2><%= @content %></h2>
+<br>
+<h2>ADVENTURE COMPLETE</h2>
diff --git a/views/layout.erb b/views/layout.erb
index b7ab682..e80f04f 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -42,11 +42,13 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a class="brand" href="/">Randomizer</a>
+          <a class="brand" href="/">Demo App</a>
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="active"><a href="#">Home</a></li>
+              <li class="active"><a href="about">Home</a></li>
               <li><a href="about">About</a></li>
+              <li><a href="adventure">Adventure</a></li>
+              <li><a href="random">Random Number</a></li>
               <li><a href="#contact">Contact</a></li>
             </ul>
           </div><!--/.nav-collapse -->
@@ -60,8 +62,7 @@
       <div class="hero-unit">
 				<%= yield %> 
       </div>
-
-      <!-- Example row of columns -->
+        <!--
       <div class="row">
         <div class="span4">
           <h2>Heading</h2>
@@ -78,14 +79,14 @@
           <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
           <p><a class="btn" href="#">View details &raquo;</a></p>
         </div>
-      </div>
+      </div> -->
 
       <hr>
 
       <footer>
 				<!--<p>Number of Randoms: <%= @number_of_randoms %></p>
-				OH HAI THERE
-        <p>&copy; Company 2012</p>
+				OH HAI THERE -->
+        <p>&copy; Company 2013</p>
       </footer>
 
     </div> <!-- /container -->
diff --git a/views/number.erb b/views/number.erb
index 8cdbad4..ed11ba8 100644
--- a/views/number.erb
+++ b/views/number.erb
@@ -1,2 +1,2 @@
-<h1>OH HAI THERE</h1>
-<h2>The number is <%= @the_number %>
+<h1>Random number:</h1>
+<h2>The number is <%= @the_number %></h2>
diff --git a/views/dashboard.erb b/views/random.erb
similarity index 90%
rename from views/dashboard.erb
rename to views/random.erb
index d2559c0..ef75205 100644
--- a/views/dashboard.erb
+++ b/views/random.erb
@@ -1,4 +1,4 @@
-<h1>OH HAI THERE</h1>
+<h1>Random number:</h1>
 <form method="POST" action="/number">
 	<label for="number">Max number for Randomitude</label>
 	<input type="text" id="number" name="number"/>

From def1990ffe305507f935274bf960afa104c2a3a9 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Tue, 23 Apr 2013 01:43:30 -0400
Subject: [PATCH 06/13] Cleaned up

---
 theweb.rb        |  1 -
 views/layout.erb | 22 +---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/theweb.rb b/theweb.rb
index 77aabe9..46d50a0 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -62,7 +62,6 @@
 	end
 end
 
-
 post '/number' do
 	@number_of_randoms = session[:number_of_randoms] || 0
 	@number_of_randoms += 1
diff --git a/views/layout.erb b/views/layout.erb
index e80f04f..2d59dd0 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -62,30 +62,10 @@
       <div class="hero-unit">
 				<%= yield %> 
       </div>
-        <!--
-      <div class="row">
-        <div class="span4">
-          <h2>Heading</h2>
-           <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-          <p><a class="btn" href="#">View details &raquo;</a></p>
-        </div>
-        <div class="span4">
-          <h2>Heading</h2>
-           <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
-          <p><a class="btn" href="#">View details &raquo;</a></p>
-       </div>
-        <div class="span4">
-          <h2>Heading</h2>
-          <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-          <p><a class="btn" href="#">View details &raquo;</a></p>
-        </div>
-      </div> -->
-
+       
       <hr>
 
       <footer>
-				<!--<p>Number of Randoms: <%= @number_of_randoms %></p>
-				OH HAI THERE -->
         <p>&copy; Company 2013</p>
       </footer>
 

From f62050b1339027467d43a0de522363f83f7a2ac8 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Tue, 23 Apr 2013 20:25:41 -0400
Subject: [PATCH 07/13] Attempting to fix config for production

---
 theweb.rb           | 5 ++++-
 views/adventure.erb | 2 +-
 views/layout.erb    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/theweb.rb b/theweb.rb
index 46d50a0..794f1e2 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -3,7 +3,10 @@
 require 'sinatra'
 require 'sinatra/reloader'
 
-require_relative 'db/setup'
+configure(:development) do
+   require_relative 'db/setup'
+end
+
 require_relative 'models/page'
 require_relative 'models/book'
 require "./db/seed"
diff --git a/views/adventure.erb b/views/adventure.erb
index c53ae80..d6a7500 100644
--- a/views/adventure.erb
+++ b/views/adventure.erb
@@ -10,4 +10,4 @@
 
 <form method="POST" action="/option_2">
 	<input type="submit" class="btn btn-large btn-primary" value="<%= @option_2 %>"/>
-</form>
+</form>
\ No newline at end of file
diff --git a/views/layout.erb b/views/layout.erb
index 2d59dd0..6ff1f0d 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -45,7 +45,7 @@
           <a class="brand" href="/">Demo App</a>
           <div class="nav-collapse">
             <ul class="nav">
-              <li class="active"><a href="about">Home</a></li>
+              <li><a href="about">Home</a></li>
               <li><a href="about">About</a></li>
               <li><a href="adventure">Adventure</a></li>
               <li><a href="random">Random Number</a></li>

From 4aec1667b8111a99925e92d08a5c426c54fe6761 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Tue, 23 Apr 2013 21:07:25 -0400
Subject: [PATCH 08/13] Attempting to fix config for production again

---
 db/setup.rb | 25 ++++++++++++++-----------
 theweb.rb   |  5 +----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/db/setup.rb b/db/setup.rb
index 1cbf7ce..3cf87d7 100644
--- a/db/setup.rb
+++ b/db/setup.rb
@@ -1,15 +1,18 @@
 require 'pg'
 require 'active_record'
-require 'yaml'
 
-connection_details = YAML::load(File.open('config/database.yml'))
+configure(:development) do
+	require 'yaml'
 
-# Setup out connection details
-ActiveRecord::Base.establish_connection(connection_details.merge({'database'=> 'postgres', 'schema_search_path'=> 'public'}))
-# create the 'tv' database 
-ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
-ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
-# connect to it
-ActiveRecord::Base.establish_connection(connection_details)
-# Migrate all the things
-ActiveRecord::Migrator.migrate("db/migrate/")
\ No newline at end of file
+	connection_details = YAML::load(File.open('config/database.yml'))
+
+	# Setup out connection details
+	ActiveRecord::Base.establish_connection(connection_details.merge({'database'=> 'postgres', 'schema_search_path'=> 'public'}))
+	# create the 'tv' database 
+	ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
+	ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
+	# connect to it
+	ActiveRecord::Base.establish_connection(connection_details)
+	# Migrate all the things
+	ActiveRecord::Migrator.migrate("db/migrate/")
+end
\ No newline at end of file
diff --git a/theweb.rb b/theweb.rb
index 794f1e2..46d50a0 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -3,10 +3,7 @@
 require 'sinatra'
 require 'sinatra/reloader'
 
-configure(:development) do
-   require_relative 'db/setup'
-end
-
+require_relative 'db/setup'
 require_relative 'models/page'
 require_relative 'models/book'
 require "./db/seed"

From c72cd89dc36cf1009449a656d3dd535b9f159e7a Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Tue, 23 Apr 2013 23:34:42 -0400
Subject: [PATCH 09/13] Attempting to fix config for production again

---
 db/setup.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/db/setup.rb b/db/setup.rb
index 3cf87d7..d1100e3 100644
--- a/db/setup.rb
+++ b/db/setup.rb
@@ -7,7 +7,8 @@
 	connection_details = YAML::load(File.open('config/database.yml'))
 
 	# Setup out connection details
-	ActiveRecord::Base.establish_connection(connection_details.merge({'database'=> 'postgres', 'schema_search_path'=> 'public'}))
+	ActiveRecord::Base.establish_connection(connection_details.merge(
+		{'database'=> 'postgres', 'schema_search_path'=> 'public'}))
 	# create the 'tv' database 
 	ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
 	ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
@@ -15,4 +16,17 @@
 	ActiveRecord::Base.establish_connection(connection_details)
 	# Migrate all the things
 	ActiveRecord::Migrator.migrate("db/migrate/")
+end
+#configure :production, :development do
+configure :production do
+	db = URI.parse(ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
+ 
+	ActiveRecord::Base.establish_connection(
+			:adapter => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
+			:host     => db.host,
+			:username => db.user,
+			:password => db.password,
+			:database => db.path[1..-1],
+			:encoding => 'utf8'
+	)
 end
\ No newline at end of file

From 83b5322de2eb62e6f78199ab6560596a72a93b5b Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Wed, 24 Apr 2013 01:45:48 -0400
Subject: [PATCH 10/13] More clean up to remove changes for production

---
 db/setup.rb | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/db/setup.rb b/db/setup.rb
index d1100e3..dd4c0a8 100644
--- a/db/setup.rb
+++ b/db/setup.rb
@@ -1,32 +1,17 @@
 require 'pg'
 require 'active_record'
 
-configure(:development) do
-	require 'yaml'
+require 'yaml'
 
-	connection_details = YAML::load(File.open('config/database.yml'))
+connection_details = YAML::load(File.open('config/database.yml'))
 
-	# Setup out connection details
-	ActiveRecord::Base.establish_connection(connection_details.merge(
-		{'database'=> 'postgres', 'schema_search_path'=> 'public'}))
-	# create the 'tv' database 
-	ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
-	ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
-	# connect to it
-	ActiveRecord::Base.establish_connection(connection_details)
-	# Migrate all the things
-	ActiveRecord::Migrator.migrate("db/migrate/")
-end
-#configure :production, :development do
-configure :production do
-	db = URI.parse(ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
- 
-	ActiveRecord::Base.establish_connection(
-			:adapter => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
-			:host     => db.host,
-			:username => db.user,
-			:password => db.password,
-			:database => db.path[1..-1],
-			:encoding => 'utf8'
-	)
-end
\ No newline at end of file
+# Setup out connection details
+ActiveRecord::Base.establish_connection(connection_details.merge(
+	{'database'=> 'postgres', 'schema_search_path'=> 'public'}))
+# create the 'tv' database 
+ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
+ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
+# connect to it
+ActiveRecord::Base.establish_connection(connection_details)
+# Migrate all the things
+ActiveRecord::Migrator.migrate("db/migrate/")

From 9c3ab6e70b27a3750630463111a73befc41e45eb Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Thu, 25 Apr 2013 18:34:28 -0400
Subject: [PATCH 11/13] added .gitkeep file

---
 .gitkeep | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitkeep

diff --git a/.gitkeep b/.gitkeep
new file mode 100644
index 0000000..30fa1ce
--- /dev/null
+++ b/.gitkeep
@@ -0,0 +1 @@
+config
\ No newline at end of file

From e31e80c97dc84383ca29d68dec93e028e06b0655 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Thu, 25 Apr 2013 18:42:54 -0400
Subject: [PATCH 12/13] moved .gitkeep file to config dir

---
 .gitkeep        | 1 -
 config/.gitkeep | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 .gitkeep
 create mode 100644 config/.gitkeep

diff --git a/.gitkeep b/.gitkeep
deleted file mode 100644
index 30fa1ce..0000000
--- a/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-config
\ No newline at end of file
diff --git a/config/.gitkeep b/config/.gitkeep
new file mode 100644
index 0000000..8af715f
--- /dev/null
+++ b/config/.gitkeep
@@ -0,0 +1 @@
+keep the config directory
\ No newline at end of file

From df5c2d7007d577137fb2266b041d8bf7655241e0 Mon Sep 17 00:00:00 2001
From: meltar <meltar@gmail.com>
Date: Sun, 28 Apr 2013 14:47:32 -0400
Subject: [PATCH 13/13] Changed setup file

---
 db/setup.rb | 51 +++++++++++++++++++++++++++++++++++++++------------
 theweb.rb   |  3 +++
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/db/setup.rb b/db/setup.rb
index dd4c0a8..8290b78 100644
--- a/db/setup.rb
+++ b/db/setup.rb
@@ -1,17 +1,44 @@
 require 'pg'
 require 'active_record'
 
-require 'yaml'
+if ENV['DATABASE_URL'].nil?
+	require 'yaml'
 
-connection_details = YAML::load(File.open('config/database.yml'))
+	connection_details = YAML::load(File.open('config/database.yml'))
 
-# Setup out connection details
-ActiveRecord::Base.establish_connection(connection_details.merge(
-	{'database'=> 'postgres', 'schema_search_path'=> 'public'}))
-# create the 'tv' database 
-ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
-ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
-# connect to it
-ActiveRecord::Base.establish_connection(connection_details)
-# Migrate all the things
-ActiveRecord::Migrator.migrate("db/migrate/")
+	# Setup out connection details
+	ActiveRecord::Base.establish_connection(connection_details.merge(
+		{'database'=> 'postgres', 'schema_search_path'=> 'public'}))
+	# create the 'tv' database 
+	ActiveRecord::Base.connection.drop_database (connection_details.fetch('database')) rescue nil
+	ActiveRecord::Base.connection.create_database(connection_details.fetch('database')) rescue nil
+	# connect to it
+	ActiveRecord::Base.establish_connection(connection_details)
+	# Migrate all the things
+	ActiveRecord::Migrator.migrate("db/migrate/")
+else
+
+	db = URI.parse(ENV['DATABASE_URL'] || 'postgres://localhost/mydb')
+ 
+	ActiveRecord::Base.establish_connection(
+			:adapter => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
+			:host     => db.host,
+			:username => db.user,
+			:password => db.password,
+			:database => db.path[1..-1],
+			:encoding => 'utf8'
+	)
+  ActiveRecord::Base.connection.drop_database (db.path[1..-1]) rescue nil
+	ActiveRecord::Base.connection.create_database(db.path[1..-1]) rescue nil
+	# connect to it
+  ActiveRecord::Base.establish_connection(
+			:adapter => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
+			:host     => db.host,
+			:username => db.user,
+			:password => db.password,
+			:database => db.path[1..-1],
+			:encoding => 'utf8'
+	)
+	# Migrate all the things
+	ActiveRecord::Migrator.migrate("db/migrate/")
+end
\ No newline at end of file
diff --git a/theweb.rb b/theweb.rb
index 46d50a0..942e62c 100644
--- a/theweb.rb
+++ b/theweb.rb
@@ -3,6 +3,9 @@
 require 'sinatra'
 require 'sinatra/reloader'
 
+#ENV.to_hash.each do |key, value|
+ #   puts("#{key}\t#{value}")
+#end
 require_relative 'db/setup'
 require_relative 'models/page'
 require_relative 'models/book'