philosophies-suspenders 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43c7cad563378815be9fe78d5097f1135f282258
-  data.tar.gz: b858d5884f0a8c90868acee9c28cdf3e04f2a80a
+  metadata.gz: b762897a1fe6b3c5b01f1d68440f0ffa2d9d9642
+  data.tar.gz: 116fcd2581179059b4af0a3688f58b699229a0b3
 SHA512:
-  metadata.gz: ac59b2537ff06e7e1eb4b27bcebe6453fb2b5fa057c918caca43f2163b100652a6214cbe2d25b85e732f8ec77081bdbc886b6d3b122a580905955aefa0a2854d
-  data.tar.gz: cd26b6de6f50924fd43dc56af2cf4cf1498fdb432b6dd12eac015ffc1c070de46afe57c9d60bb86b34d845331457b841149acb8539b605881382d1041b90d077
+  metadata.gz: 7e708c7ab5ad9aae89e7b9e3b4cf1055749cbf02133ff76175403e9a996de6382d702ba6abd36fe5924d79a8d2f04158349c0463cf9c2b1ab51a16f059fbc3be
+  data.tar.gz: db02e7eb9b1817a8734601172181ccfcbf4b876ec43e1948dee2067c96ca14adfd039c3cdaf25c5123baa21bc0db8153b254e19a418977c5a99d7d9dc413ff64

data/Gemfile.lock

@@ -1,71 +1,77 @@
 PATH
   remote: .
   specs:
-    philosophies-suspenders (2.1.2)
+    philosophies-suspenders (2.2.0)
       bundler (~> 1.3)
-      rails (= 4.2.5.1)
+      rails (~> 5.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.0.0)
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
     coderay (1.1.0)
     columnize (0.9.0)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    mime-types (2.99)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nio4r (1.2.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -73,34 +79,33 @@ GEM
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -115,10 +120,10 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -126,6 +131,9 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
@@ -137,4 +145,4 @@ DEPENDENCIES
   rspec (~> 3.2)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -52,7 +52,7 @@ It includes application gems like:
   and style
 * [Title](https://github.com/calebthompson/title) for storing titles in
   translations
-* [Unicorn](https://github.com/defunkt/unicorn) to serve HTTP requests
+* [Puma](http://puma.io) to serve HTTP requests
 * [rails_12factor](https://github.com/heroku/rails_12factor) for easier Heroku
   deploys
 

data/lib/suspenders/app_builder.rb

@@ -126,7 +126,7 @@ module Suspenders
 
       inject_into_file(
         "config/environments/production.rb",
-        '  config.static_cache_control = "public, max-age=#{1.year.to_i}"',
+        '  config.public_file_server.headers = { \'Cache-Control\' => "public, max-age=#{1.year.to_i}" }',
         after: serve_static_files_line
       )
     end
@@ -292,8 +292,8 @@ end
       generate 'rspec:install'
     end
 
-    def configure_unicorn
-      copy_file 'unicorn.rb', 'config/unicorn.rb'
+    def configure_puma
+      copy_file 'puma.rb', 'config/puma.rb', force: true
     end
 
     def setup_foreman
@@ -486,7 +486,7 @@ end
 
     def set_heroku_serve_static_files
       %w(staging production).each do |environment|
-        run_heroku "config:add RAILS_SERVE_STATIC_FILES=true", environment
+        run_heroku "config:add RAILS_SERVE_STATIC_FILES=true RAILS_LOG_TO_STDOUT=true", environment
       end
     end
 
@@ -532,10 +532,6 @@ end
         "Rails.application.routes.draw do\nend"
     end
 
-    def disable_xml_params
-      copy_file 'disable_xml_params.rb', 'config/initializers/disable_xml_params.rb'
-    end
-
     def setup_default_rake_task
       append_file 'Rakefile' do
         <<-EOS
@@ -566,6 +562,14 @@ end
       bundle_command 'exec stairs --use-defaults'
     end
 
+    def configure_quiet_assets
+      config = <<-RUBY
+    config.assets.quiet = true
+      RUBY
+
+      inject_into_class "config/application.rb", "Application", config
+    end
+
     private
 
     def raise_on_missing_translations_in(environment)
@@ -591,7 +595,7 @@ end
     end
 
     def serve_static_files_line
-      "config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
+      "config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?\n"
     end
 
     def heroku_app_name_for(environment)

data/lib/suspenders/generators/app_generator.rb

@@ -99,6 +99,7 @@ module Suspenders
       build :configure_generators
       build :configure_i18n_for_missing_translations
       build :configure_rubocop
+      build :configure_quiet_assets
     end
 
     def setup_test_environment
@@ -147,10 +148,9 @@ module Suspenders
       build :configure_active_job
       build :configure_time_formats
       build :configure_simple_form
-      build :disable_xml_params
       build :fix_i18n_deprecation_warning
       build :setup_default_rake_task
-      build :configure_unicorn
+      build :configure_puma
       build :setup_foreman
       build :configure_airbrake
     end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
-  RAILS_VERSION = "4.2.5.1"
+  RAILS_VERSION = "~> 5.0.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/templates/Gemfile.erb

@@ -5,21 +5,20 @@ gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 
 gem "airbrake", require: false
 gem "autoprefixer-rails"
-gem "bundler", ">= 1.8.4"
-gem "coffee-rails", "~> 4.1.0"
+gem "bundler"
+gem "coffee-rails"
 gem "flutie"
 gem "i18n-tasks"
-gem "newrelic_rpm", ">= 3.9.8"
+gem "newrelic_rpm"
 gem "pg"
-gem "quiet_assets"
 gem "rack-canonical-host"
 gem "recipient_interceptor"
-gem "sass-rails", "~> 5.0"
+gem "sass-rails"
 gem "sidekiq"
 gem "simple_form"
 gem "title"
 gem "uglifier"
-gem "unicorn"
+gem "puma"
 
 source "https://rails-assets.org" do
   gem "rails-assets-jquery"
@@ -35,24 +34,21 @@ group :development do
 end
 
 group :development, :test do
+  gem "listen"
   gem "bundler-audit", require: false
   gem "dotenv-rails"
   gem "factory_girl_rails"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.1.0"
+  gem "rspec-rails"
   gem "rubocop"
 end
 
 group :test do
-  gem "capybara-webkit", ">= 1.2.0"
+  gem "capybara-webkit"
   gem "database_cleaner"
   gem "launchy"
   gem "rspec-sidekiq"
   gem "shoulda-matchers", require: false
   gem "timecop"
 end
-
-group :staging, :production do
-  gem "rails_12factor"
-end

data/templates/Procfile

@@ -1,2 +1,2 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec puma -C config/puma.rb
 worker: bundle exec sidekiq

data/templates/puma.rb

@@ -0,0 +1,28 @@
+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
+
+# The environment variable WEB_CONCURRENCY may be set to a default value based
+# on dyno size. To manually configure this value use heroku config:set
+# WEB_CONCURRENCY.
+#
+# Increasing the number of workers will increase the amount of resting memory
+# your dynos use. Increasing the number of threads will increase the amount of
+# potential bloat added to your dynos when they are responding to heavy
+# requests.
+#
+# Starting with a low number of workers and threads provides adequate
+# performance for most applications, even under load, while maintaining a low
+# risk of overusing memory.
+workers Integer(ENV.fetch("WEB_CONCURRENCY", 2))
+threads_count = Integer(ENV.fetch("MAX_THREADS", 2))
+threads(threads_count, threads_count)
+
+preload_app!
+
+rackup DefaultRackup
+environment ENV.fetch("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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philosophies-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Philosophie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,6 @@ files:
 - templates/config_i18n_tasks.yml
 - templates/config_locales_en.yml.erb
 - templates/database_cleaner_rspec.rb
-- templates/disable_xml_params.rb
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
 - templates/flashes_helper.rb
@@ -142,6 +141,7 @@ files:
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
+- templates/puma.rb
 - templates/rails_helper.rb
 - templates/secrets.yml
 - templates/setup.rb
@@ -150,7 +150,6 @@ files:
 - templates/staging.rb
 - templates/suspenders_gitignore
 - templates/suspenders_layout.html.erb.erb
-- templates/unicorn.rb
 homepage: https://github.com/philosophie/suspenders
 licenses:
 - MIT

data/templates/disable_xml_params.rb

@@ -1,3 +0,0 @@
-# Protect against injection attacks
-# http://www.kb.cert.org/vuls/id/380039
-ActionDispatch::ParamsParser::DEFAULT_PARSERS.delete(Mime::XML)

data/templates/unicorn.rb

@@ -1,30 +0,0 @@
-# https://devcenter.heroku.com/articles/rails-unicorn
-
-worker_processes (ENV["UNICORN_WORKERS"] || 3).to_i
-timeout (ENV["UNICORN_TIMEOUT"] || 15).to_i
-preload_app true
-
-before_fork do |_server, _worker|
-  Signal.trap "TERM" do
-    puts "Unicorn master intercepting TERM, sending myself QUIT instead"
-    Process.kill "QUIT", Process.pid
-  end
-
-  if defined? ActiveRecord::Base
-    ActiveRecord::Base.connection.disconnect!
-  end
-end
-
-after_fork do |_server, _worker|
-  Signal.trap "TERM" do
-    puts "Unicorn worker intercepting TERM, waiting for master to send QUIT"
-  end
-
-  if defined? ActiveRecord::Base
-    config = ActiveRecord::Base.configurations[Rails.env] ||
-      Rails.application.config.database_configuration[Rails.env]
-    config["reaping_frequency"] = (ENV["DB_REAPING_FREQUENCY"] || 10).to_i
-    config["pool"] = (ENV["DB_POOL"] || 2).to_i
-    ActiveRecord::Base.establish_connection(config)
-  end
-end