Merge pull request #22 from pcreux/rails4

Switch over to Rails4

Author: pcreux

.gitignore

@@ -1,4 +1,16 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
+# 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'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

.rspec

@@ -0,0 +1,3 @@
+--color
+--warnings
+--require spec_helper

Gemfile

@@ -1,24 +1,64 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
+ruby '2.2.0'
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.1.8'
+
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 4.0.3'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .js.coffee assets and views
+gem 'coffee-rails', '~> 4.0.0'
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer',  platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+
+# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+gem 'spring',        group: :development
+
+gem 'activeadmin',  github: 'activeadmin'
+gem 'inherited_resources', '~> 1.4.1'
+gem "devise"
 
-gem 'rails', '3.0.10'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'nifty-generators'
-gem "activeadmin", '0.5.0'
 gem "faker"
-gem 'newrelic_rpm', '3.1.1'
+#gem 'newrelic_rpm', '3.1.1'
 gem 'hoptoad_notifier', '2.4.11'
-gem 'rack-throttle'
 
 group :development do
-  gem 'mechanize'
+  gem 'mechanize','2.7.3'
 end
 
 group :production do
+  gem 'pg'
   gem 'unicorn'
 
   # Enable gzip compression on heroku, but don't compress images.
   gem 'heroku-deflater'
 
   # Heroku injects it if it's not in there already
   gem 'rails_12factor'
+
+  gem 'rack-throttle'
+  gem 'rack-cache'
 end
+
+group :development, :test do
+  gem 'sqlite3'
+  gem 'factory_girl_rails'
+  gem 'rspec-rails', '~> 3.0.0'
+  gem 'spork', '~> 1.0rc'
+end
+
+group :test do
+  gem "shoulda"
+  gem "shoulda-matchers"
+  gem "webmock", "~> 1.11.0"
+  gem "webrat"
+  gem 'simplecov', :require => false
+end
+