Merge pull request #104 from CLOSER-Cohorts/develop

Version 6.0

.gitattributes

@@ -1 +1,2 @@
-vendor/* linguist-vendored
+vendor/**/* linguist-vendored
+public/**/* linguist-vendored

.gitignore

@@ -21,4 +21,6 @@
 *.xml
 coverage/
 vendor/
-node_modules/
+node_modules/
+# Ignore application configuration
+/config/application.yml

Gemfile

@@ -56,16 +56,36 @@ gem 'angular-rails-templates', '~> 1.0'
 # TODO: Are we using this?
 gem 'parallel'
 
-#
+# Faster JavaScript/JSON converter
 gem 'oj'
 gem 'jbuilder_cache_multi'
+
+# Heroku email service
 gem 'postmark-rails', '>= 0.10.0'
+
+# Limits processing time in rack layer for added loading protection
 gem 'rack-timeout'
 
+# Create background workers
+gem 'resque'
+
+# Automatically scales dynos
+gem "hirefire-resource"
+
+# Allows the attaching of AWS buckets
+gem 'aws-sdk', '~> 2'
+
+# To search for memory leaks and memory bloat
+gem 'derailed'
+
+# To better enable custom configurations
+gem 'figaro'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
   gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+  gem 'sys-proctable', platforms: [:mingw, :mswin, :x64_mingw]
 end
 
 group :development do
@@ -86,4 +106,4 @@ group :test do
   gem 'rails-controller-testing'
 end
 
-gem 'coveralls', require: false
+gem 'coveralls', require: false

Gemfile.lock

@@ -1,50 +1,57 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0)
-      actionpack (= 5.0.0)
+    actioncable (5.0.0.1)
+      actionpack (= 5.0.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
+    actionmailer (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0)
-      actionview (= 5.0.0)
-      activesupport (= 5.0.0)
+    actionpack (5.0.0.1)
+      actionview (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0)
-      activesupport (= 5.0.0)
+    actionview (5.0.0.1)
+      activesupport (= 5.0.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0)
-      activesupport (= 5.0.0)
+    activejob (5.0.0.1)
+      activesupport (= 5.0.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0)
-      activesupport (= 5.0.0)
-    activerecord (5.0.0)
-      activemodel (= 5.0.0)
-      activesupport (= 5.0.0)
+    activemodel (5.0.0.1)
+      activesupport (= 5.0.0.1)
+    activerecord (5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0)
+    activesupport (5.0.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    angular-rails-templates (1.0.0)
+    angular-rails-templates (1.0.2)
       railties (>= 4.2, < 6)
-      sprockets (~> 3.0)
+      sprockets (>= 3.0, < 5)
       tilt
-    arel (7.1.0)
+    arel (7.1.1)
+    aws-sdk (2.5.6)
+      aws-sdk-resources (= 2.5.6)
+    aws-sdk-core (2.5.6)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.5.6)
+      aws-sdk-core (= 2.5.6)
     bcrypt (3.1.11)
     bcrypt (3.1.11-x64-mingw32)
+    benchmark-ips (2.7.2)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     bower-rails (0.10.0)
@@ -59,14 +66,24 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.2)
-    coveralls (0.8.14)
+    coveralls (0.8.15)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
     db_fixtures_dump (0.1.1)
     debug_inspector (0.0.2)
+    derailed (0.1.0)
+      derailed_benchmarks
+    derailed_benchmarks (1.3.1)
+      benchmark-ips (~> 2)
+      get_process_mem (~> 0)
+      heapy (~> 0)
+      memory_profiler (~> 0)
+      rack (>= 1)
+      rake (> 10, < 12)
+      thor (~> 0.19)
     devise (4.2.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -76,16 +93,22 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.7.0)
+    figaro (1.1.1)
+      thor (~> 0.14)
     genericons-rails (0.5.0)
+    get_process_mem (0.2.1)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
+    heapy (0.1.2)
+    hirefire-resource (0.3.11)
     i18n (0.7.0)
     jbuilder (2.6.0)
       activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
     jbuilder_cache_multi (0.0.3)
       jbuilder (>= 1.5.0, < 3)
-    jquery-rails (4.1.1)
+    jmespath (1.3.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -94,12 +117,14 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    memory_profiler (0.9.6)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
+    mono_logger (1.1.0)
     multi_json (1.12.1)
     nio4r (1.2.1)
     nokogiri (1.6.8)
@@ -108,7 +133,7 @@ GEM
     nokogiri (1.6.8-x64-mingw32)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    oj (2.17.1)
+    oj (2.17.3)
     orm_adapter (0.5.0)
     parallel (1.9.0)
     pg (0.18.4)
@@ -129,26 +154,26 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.4.2)
-    rails (5.0.0)
-      actioncable (= 5.0.0)
-      actionmailer (= 5.0.0)
-      actionpack (= 5.0.0)
-      actionview (= 5.0.0)
-      activejob (= 5.0.0)
-      activemodel (= 5.0.0)
-      activerecord (= 5.0.0)
-      activesupport (= 5.0.0)
+    rails (5.0.0.1)
+      actioncable (= 5.0.0.1)
+      actionmailer (= 5.0.0.1)
+      actionpack (= 5.0.0.1)
+      actionview (= 5.0.0.1)
+      activejob (= 5.0.0.1)
+      activemodel (= 5.0.0.1)
+      activerecord (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0)
+      railties (= 5.0.0.1)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (0.1.1)
+    rails-controller-testing (1.0.1)
       actionpack (~> 5.x)
       actionview (~> 5.x)
       activesupport (~> 5.x)
     rails-dom-testing (2.0.1)
       activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-    rails-erd (1.4.7)
+    rails-erd (1.5.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       choice (~> 0.2.0)
@@ -160,23 +185,31 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.0.0)
-      actionpack (= 5.0.0)
-      activesupport (= 5.0.0)
+    railties (5.0.0.1)
+      actionpack (= 5.0.0.1)
+      activesupport (= 5.0.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (11.2.2)
     rdoc (4.2.2)
       json (~> 1.4)
     redis (3.3.1)
+    redis-namespace (1.5.2)
+      redis (~> 3.0, >= 3.0.4)
     redis-rack-cache (1.2.4)
       rack-cache (~> 1.2)
       redis-store (~> 1.1.0)
     redis-store (1.1.7)
       redis (>= 2.2)
-    responders (2.2.0)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
+    resque (1.26.0)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     ruby-graphviz (1.2.2)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -193,7 +226,9 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    skylight (0.10.5)
+    sinatra (1.0)
+      rack (>= 1.0)
+    skylight (0.10.6)
       activesupport (>= 3.0.0)
     spring (1.7.2)
     sprockets (3.7.0)
@@ -203,18 +238,21 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sys-proctable (1.1.1-universal-mingw32)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.5)
-    tins (1.6.0)
+    tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     tzinfo-data (1.2016.6)
       tzinfo (>= 1.0.0)
-    uglifier (3.0.0)
+    uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
     warden (1.2.6)
       rack (>= 1.0)
     web-console (2.3.0)
@@ -232,13 +270,17 @@ PLATFORMS
 
 DEPENDENCIES
   angular-rails-templates (~> 1.0)
+  aws-sdk (~> 2)
   bower-rails
   byebug
   coffee-rails (~> 4.2.0)
   coveralls
   db_fixtures_dump
+  derailed
   devise
+  figaro
   genericons-rails
+  hirefire-resource
   jbuilder (~> 2.0)
   jbuilder_cache_multi
   jquery-rails
@@ -256,10 +298,12 @@ DEPENDENCIES
   rails_12factor
   redis
   redis-rack-cache
+  resque
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   skylight
   spring
+  sys-proctable
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
@@ -268,4 +312,4 @@ RUBY VERSION
    ruby 2.2.3p173
 
 BUNDLED WITH
-   1.13.0.rc.1
+   1.13.0