replaced files

Author: jbwilmoth

Gemfile

@@ -1,20 +1,26 @@
-source 'https://rubygems.org'
+source :rubygems
 
-# PostgreSQL driver
-gem 'pg'
+# SQLite3 driver
+gem 'sqlite3'
 
 # Sinatra driver
 gem 'sinatra'
+gem 'sinatra-contrib'
 
 # Use Thin for our web server
 gem 'thin'
 
 gem 'activesupport'
 gem 'activerecord'
+gem 'shotgun'
 
 gem 'rake'
+gem 'bcrypt-ruby', '~> 3.0.0'
+gem 'pry'
 
-gem 'shotgun'
 
-gem 'oauth'
-gem 'twitter'
+group :test do
+  gem 'faker'
+  gem 'rspec'
+  gem 'shoulda-matchers'
+end

Rakefile

@@ -1,5 +1,5 @@
 require 'rake'
-
+require 'rspec/core/rake_task'
 
 
 require ::File.expand_path('../config/environment', __FILE__)
@@ -89,13 +89,13 @@ namespace :db do
   desc "Create the database at #{DB_NAME}"
   task :create do
     puts "Creating database #{DB_NAME} if it doesn't exist..."
-    exec("createdb #{DB_NAME}")
+    exec("touch #{DB_NAME}")
   end
 
   desc "Drop the database at #{DB_NAME}"
   task :drop do
     puts "Dropping database #{DB_NAME}..."
-    exec("dropdb #{DB_NAME}")
+    exec("rm #{DB_NAME}")
   end
 
   desc "Migrate the database (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
@@ -122,3 +122,8 @@ desc 'Start IRB with application environment loaded'
 task "console" do
   exec "irb -r./config/environment"
 end
+
+desc "Run the specs"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default  => :spec

config/database.rb

@@ -13,31 +13,9 @@
   autoload ActiveSupport::Inflector.camelize(filename), model_file
 end
 
-# We have to do this in case we have models that inherit from each other.
-# If model Student inherits from model Person and app/models/student.rb is
-# required first, it will throw an error saying "Person" is undefined.
-#
-# With this lazy-loading technique, Ruby will try to load app/models/person.rb
-# the first time it sees "Person" and will only throw an exception if
-# that file doesn't define the Person class.
-
-# Heroku controls what database we connect to by setting the DATABASE_URL environment variable
-# We need to respect that if we want our Sinatra apps to run on Heroku without modification
-db = URI.parse(ENV['DATABASE_URL'] || "postgres://localhost/#{APP_NAME}_#{Sinatra::Application.environment}")
-
-DB_NAME = db.path[1..-1]
-
-# Note:
-#   Sinatra::Application.environment is set to the value of ENV['RACK_ENV']
-#   if ENV['RACK_ENV'] is set.  If ENV['RACK_ENV'] is not set, it defaults
-#   to :development
+DB_NAME = APP_ROOT.join('db', 'events.sqlite3').to_s
 
 ActiveRecord::Base.establish_connection(
-  :adapter  => db.scheme == 'postgres' ? 'postgresql' : db.scheme,
-  :host     => db.host,
-  :port     => db.port,
-  :username => db.user,
-  :password => db.password,
+  :adapter  => 'sqlite3',
   :database => DB_NAME,
-  :encoding => 'utf8'
 )

config/environment.rb

@@ -11,18 +11,15 @@
 require 'uri'
 require 'pathname'
 
-require 'pg'
+require 'sqlite3'
 require 'active_record'
 require 'logger'
 
 require 'sinatra'
-require 'shotgun'
-
+require "sinatra/reloader" if development?
+require 'bcrypt'
 require 'erb'
 
-require 'oauth'
-require 'twitter'
-
 # Some helper constants for path-centric logic
 APP_ROOT = Pathname.new(File.expand_path('../../', __FILE__))
 
@@ -34,8 +31,3 @@
 
 # Set up the database and models
 require APP_ROOT.join('config', 'database')
-
-$client = Twitter::REST::Client.new do |config|
-  config.consumer_key = ENV['TWITTER_KEY']
-  config.consumer_secret = ENV['TWITTER_SECRET']
-end