Skip to content

Commit

Permalink
Merge pull request #147 from codeforamerica/postgres
Browse files Browse the repository at this point in the history
Mongo to Postgres migration
  • Loading branch information
monfresh committed Apr 16, 2014
2 parents 2917260 + e08b517 commit ec61886
Show file tree
Hide file tree
Showing 113 changed files with 2,928 additions and 1,388 deletions.
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config
# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
Expand Down Expand Up @@ -46,3 +47,6 @@ dump.rdb

script/backup_mongo
script/import_to_staging

# Zeus
.zeus.sock
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ before_install: gem update bundler
bundler_args: --without assets:development:production
language: ruby
rvm:
- 2.1.1
- 2.1.1
addons:
postgresql: "9.3"
services:
- mongodb
- redis-server
- elasticsearch
- redis-server
- elasticsearch
before_script:
- rake db:mongoid:create_indexes
- psql -c 'create database ohana_api_test;' -U postgres
- cp config/database.travis.yml config/database.yml
- rake db:schema:load
- rake db:test:load
notifications:
campfire:
rooms:
Expand Down
44 changes: 21 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
source 'https://rubygems.org'

ruby '2.1.1'
gem 'rails', '3.2.17'
gem 'rails', '~> 4.0.4'

group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'uglifier', '>= 1.0.3'
end
gem "pg"

gem 'sass-rails', '~> 4.0.2'
gem 'coffee-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0'
gem 'bootstrap-sass'

# Rails 4
gem 'protected_attributes'
#gem 'rails-observers'
#gem 'rails-perftest'

# Front end
gem 'jquery-rails'
gem 'bootstrap-sass'
gem "haml-rails", ">= 0.4"
gem "haml-rails", '~> 0.5.3'

# Server for deployment
gem "passenger"
Expand All @@ -21,23 +26,18 @@ group :production, :staging do
gem 'rails_12factor' # Heroku recommended
end

# Test coverage
gem 'coveralls', require: false

# MongoDB ORM
gem "mongoid", ">= 3.1.2"

group :test, :development do
# Testing with Rspec
gem "rspec-rails", ">= 2.12.2"
gem "rspec-rails", '~> 2.14.2'
gem "factory_girl_rails", ">= 4.2.0"
end

group :test do
# Testing with Rspec and Mongoid
gem "database_cleaner", ">= 1.0.0.RC1"
gem "mongoid-rspec", ">= 1.7.0"
gem "capybara"
#gem "minitest"
gem 'shoulda-matchers'
# Test coverage
gem 'coveralls', require: false
end

group :development do
Expand All @@ -57,7 +57,7 @@ gem "geocoder", :git => "git://github.com/alexreisner/geocoder.git", :ref => "35
gem "redis"

# Format validation for URLs, phone numbers, zipcodes
gem "validates_formatting_of"
gem "validates_formatting_of", '~> 0.8.1'

# CORS support
gem 'rack-cors', :require => 'rack/cors'
Expand Down Expand Up @@ -98,8 +98,6 @@ gem "figaro"
gem "tire", :git => "git://github.com/monfresh/tire.git", :ref => "2d174e792a"

# Nested categories for OpenEligibility
gem "glebtv-mongoid_nested_set"

gem 'mongoid_time_field'
gem "ancestry"

gem 'mongoid_slug'
gem "friendly_id", "~> 5.0.3"
Loading

0 comments on commit ec61886

Please sign in to comment.