From e9e3225d1b60de0ef7d83864278cae692bab5391 Mon Sep 17 00:00:00 2001
From: Milo Winningham <milo@winningham.net>
Date: Mon, 5 Mar 2012 00:31:16 -0800
Subject: [PATCH] readd face gem and remove database.yml now that we'll be
 using our own mysql configs

---
 .gitignore          |  3 ++-
 Gemfile             |  1 +
 Gemfile.lock        | 14 ++++++++++++++
 config/database.yml | 25 -------------------------
 4 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 config/database.yml

diff --git a/.gitignore b/.gitignore
index 154c971..c946bd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,9 @@
 # Ignore bundler config
 /.bundle
 
-# Ignore the default SQLite database.
+# Ignore the database and its configuration.
 /db/*.sqlite3
+/config/database.yml
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
diff --git a/Gemfile b/Gemfile
index 6262baf..a9686fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,6 +16,7 @@ group :development, :test do
 end
 
 gem 'activerecord-mysql2spatial-adapter'
+gem 'face'
 gem 'geokit'
 gem 'instagram', "~> 0.8.3"
 gem 'jquery-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index dc6ef7d..236de6e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,6 +22,9 @@ GEM
       activesupport (= 3.2.2)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    activerecord-mysql2spatial-adapter (0.4.2)
+      mysql2 (>= 0.2.13)
+      rgeo-activerecord (~> 0.4.3)
     activeresource (3.2.2)
       activemodel (= 3.2.2)
       activesupport (= 3.2.2)
@@ -61,6 +64,8 @@ GEM
     faraday_middleware (0.8.4)
       faraday (>= 0.7.4, < 0.9)
     ffi (1.0.11)
+    geokit (1.6.5)
+      multi_json
     hashie (1.2.0)
     hike (1.2.1)
     i18n (0.6.0)
@@ -81,6 +86,7 @@ GEM
     mime-types (1.17.2)
     multi_json (1.0.4)
     multipart-post (1.1.5)
+    mysql2 (0.3.11)
     nokogiri (1.5.0)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -110,6 +116,11 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rgeo (0.3.5)
+    rgeo-activerecord (0.4.3)
+      activerecord (>= 3.0.3)
+      arel (>= 2.0.6)
+      rgeo (>= 0.3.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -155,11 +166,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord-mysql2spatial-adapter
   capybara
   coffee-rails (~> 3.2.1)
   face
+  geokit
   instagram (~> 0.8.3)
   jquery-rails
+  mysql2
   rails (= 3.2.2)
   rspec-rails
   sass-rails (~> 3.2.3)
diff --git a/config/database.yml b/config/database.yml
deleted file mode 100644
index 51a4dd4..0000000
--- a/config/database.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000