Merge branch 'dev'

Author: Bobby Shannon

.gitignore

@@ -21,3 +21,12 @@
 
 # .DS_Store
 .DS_Store
+
+# Environment variables
+config/application.yml
+
+# Uploads
+uploads/
+
+# Database
+config/database.yml

.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+ - 2.3.0
+script:
+  - bin/rake db:migrate RAILS_ENV=test
+  - bin/rake
+notifications:
+  slack: stratusprint:aJ1xLvYZNRwJiH9hMlWKbBsv

Gemfile

@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '>= 5.0.0.beta2', '< 5.1'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+gem 'rails', '5.0.0.beta3'
+# Use PostgreSQL as the database for Active Record
+gem 'pg', group: [:development, :production]
 # Use Puma as the app server
 gem 'puma'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
@@ -13,16 +13,48 @@ gem 'puma'
 gem 'redis', '~> 3.0'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
+# Data serialization
+gem 'active_model_serializers', :github => 'rails-api/active_model_serializers'
+# User authentication
+gem 'omniauth', '>= 1.0.0'
+gem "devise", :github => 'plataformatec/devise'
+gem 'devise_token_auth', :github => 'StratusPrint/devise_token_auth', :branch => 'master'
+# Resource authorization
+gem 'cancancan', '~> 1.10'
+# Environment variables
+gem 'figaro'
+# API documentation via swagger
+gem 'swagger-blocks'
+# CORS
+gem 'rack-cors', :require => 'rack/cors'
+# ActiveModel Validators
+gem 'activevalidators'
+gem 'enumerize'
+# File uploads
+gem 'carrierwave', '0.10.0'
+gem 'carrierwave-base64'
+# Background processing
+gem 'sidekiq'
+gem 'sidekiq-cron'
+gem 'sinatra', github: 'sinatra/sinatra'
+gem 'carrierwave_backgrounder', github: 'lardawge/carrierwave_backgrounder'
+gem 'mime-types', '2.3'
+# REST client
+gem 'rest-client'
+# Logging
+gem 'multi_logger'
+# Result filtering
+gem 'has_scope'
 
-# Use Capistrano for deployment
-# gem 'capistrano-rails', group: :development
-
-# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible
-# gem 'rack-cors'
-
-group :development, :test do
+group :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
+  gem 'rspec-rails'
+  gem 'sqlite3'
+  gem 'factory_girl_rails'
+  gem 'database_cleaner'
+  gem 'json-schema'
+  gem 'coveralls', require: false
 end
 
 group :development do