add puma and version bump assets

Author: mshwery

Gemfile

@@ -39,6 +39,8 @@ gem 'eco'
 # Store ActiveRecord IDs non-obviously in URL using hashids.
 gem 'hashids'
 
+gem 'puma'
+
 # rails 4.2 removes support for respond_to/respond_with
 gem 'responders', '~> 2.0' 
 

Gemfile.lock

@@ -77,6 +77,7 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     pg (0.18.3)
+    puma (2.14.0)
     rack (1.6.4)
     rack-cors (0.4.0)
     rack-test (0.6.3)
@@ -154,6 +155,7 @@ DEPENDENCIES
   hashids
   jquery-rails
   pg
+  puma
   rack-cors
   rails (= 4.2.0)
   rails_12factor

Procfile

@@ -0,0 +1 @@
+bundle exec puma -C config/puma.rb

config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = '1.1'
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path

config/puma.rb

@@ -0,0 +1,15 @@
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+on_worker_boot do
+  # Worker specific setup for Rails 4.1+
+  # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
+  ActiveRecord::Base.establish_connection
+end