Merge pull request #704 from coderdojo-japan/Upgrade_to_rails5.2

Upgrade to rails5.2

Author: yasulab

Gemfile

@@ -1,13 +1,14 @@
 source 'https://rubygems.org'
 ruby '2.6.5'
 
-gem 'rails', '~> 5.1.7'
+gem 'rails', '~> 5.2.0'
 gem 'puma'
 gem "puma_worker_killer"
 gem 'pg'
 gem 'dumper'
+gem 'bootsnap'
 
-gem 'scrivito', '~> 1.15.0'
+gem 'scrivito', '~> 1.16.0'
 gem 'scrivito_section_widgets'
 gem 'scrivito_teaser_widget'
 

Gemfile.lock

@@ -1,52 +1,58 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
+    actioncable (5.2.4.1)
+      actionpack (= 5.2.4.1)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
+    actionpack (5.2.4.1)
+      actionview (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
+    actionview (5.2.4.1)
+      activesupport (= 5.2.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
+    activejob (5.2.4.1)
+      activesupport (= 5.2.4.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activerecord (5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
+      arel (>= 9.0)
+    activestorage (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    arel (8.0.0)
+    arel (9.0.0)
     autoprefixer-rails (9.7.4)
       execjs
     backports (3.16.0)
     bindex (0.8.1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
+    bootsnap (1.4.5)
+      msgpack (~> 1.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
@@ -191,6 +197,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     memoist (0.16.2)
     memory_profiler (0.9.14)
     method_source (0.9.2)
@@ -203,6 +211,7 @@ GEM
     minitest (5.14.0)
     minitest-retry (0.2.0)
       minitest (>= 5.0)
+    msgpack (1.3.1)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
@@ -250,17 +259,18 @@ GEM
     rack-user_agent (0.5.2)
       rack (>= 1.5)
       woothee (>= 1.0.0)
-    rails (5.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
+    rails (5.2.4.1)
+      actioncable (= 5.2.4.1)
+      actionmailer (= 5.2.4.1)
+      actionpack (= 5.2.4.1)
+      actionview (= 5.2.4.1)
+      activejob (= 5.2.4.1)
+      activemodel (= 5.2.4.1)
+      activerecord (= 5.2.4.1)
+      activestorage (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       bundler (>= 1.3.0)
-      railties (= 5.1.7)
+      railties (= 5.2.4.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -271,12 +281,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
+    railties (5.2.4.1)
+      actionpack (= 5.2.4.1)
+      activesupport (= 5.2.4.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (>= 0.19.0, < 2.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
@@ -323,38 +333,38 @@ GEM
       tilt (>= 1.1, < 3)
     sassc (2.2.1)
       ffi (~> 1.9)
-    scrivito (1.15.0)
-      scrivito_content_browser (= 1.15.0)
-      scrivito_editors (= 1.15.0)
-      scrivito_sdk (= 1.15.0)
-      scrivito_ui (= 1.15.0)
-    scrivito_content_browser (1.15.0)
+    scrivito (1.16.0)
+      scrivito_content_browser (= 1.16.0)
+      scrivito_editors (= 1.16.0)
+      scrivito_sdk (= 1.16.0)
+      scrivito_ui (= 1.16.0)
+    scrivito_content_browser (1.16.0)
       railties
-      scrivito_sdk (= 1.15.0)
-    scrivito_editors (1.15.0)
+      scrivito_sdk (= 1.16.0)
+    scrivito_editors (1.16.0)
       jquery-ui-rails (>= 5.0.0, < 7.0.0)
       railties
-      scrivito_content_browser (= 1.15.0)
-      scrivito_sdk (= 1.15.0)
-    scrivito_sdk (1.15.0)
+      scrivito_content_browser (= 1.16.0)
+      scrivito_sdk (= 1.16.0)
+    scrivito_sdk (1.16.0)
       addressable (~> 2.3)
       connection_pool (~> 2.2)
-      diff-lcs (~> 1.2)
+      diff-lcs (~> 1.3)
       hyp_diff (~> 0.0.4)
-      jbuilder (~> 2.0)
-      jquery-rails (~> 4.0)
-      json (>= 1.8.3)
+      jbuilder (~> 2.6)
+      jquery-rails (~> 4.1)
+      json (>= 1.8.6)
       memoist (>= 0.12.0)
       multi_json (~> 1.9)
       multipart-post (~> 2.0)
-      nokogiri (~> 1.6)
-      rails (>= 4.2, < 5.2)
+      nokogiri (~> 1.7)
+      rails (~> 5.2.0)
       rake (>= 0.9.2.2)
     scrivito_section_widgets (1.1.2)
       scrivito
     scrivito_teaser_widget (0.1.2)
       scrivito
-    scrivito_ui (1.15.0)
+    scrivito_ui (1.16.0)
       railties
     secure_headers (6.3.0)
     selenium-webdriver (3.142.7)
@@ -405,7 +415,7 @@ GEM
       bindex (>= 0.4.0)
       railties (>= 5.0)
     websocket (1.2.8)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     woothee (1.10.0)
@@ -417,6 +427,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootsnap
   bootstrap-sass
   capybara
   coffee-rails
@@ -449,15 +460,15 @@ DEPENDENCIES
   rack-host-redirect
   rack-mini-profiler
   rack-user_agent
-  rails (~> 5.1.7)
+  rails (~> 5.2.0)
   rails-controller-testing
   rails-html-sanitizer (~> 1.2.0)
   rake
   rspec-rails (~> 3.8)
   rspec-retry
   ruby-mp3info
   sass-rails (>= 5)
-  scrivito (~> 1.15.0)
+  scrivito (~> 1.16.0)
   scrivito_section_widgets
   scrivito_teaser_widget
   secure_headers
@@ -474,4 +485,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

bin/setup

@@ -69,4 +69,4 @@ chdir APP_ROOT do
 
   puts "\n== Restarting application server =="
   system! 'bin/rails restart'
-end
+end

bin/yarn

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

config/application.rb

@@ -9,11 +9,12 @@
 module CoderdojoJp
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.1
+    config.load_defaults 5.2
 
     # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
 
     # Timezone
     config.time_zone = 'Asia/Tokyo'

config/boot.rb

@@ -1,3 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/cable.yml

@@ -6,5 +6,5 @@ test:
 
 production:
   adapter: redis
-  url: redis://localhost:6379/1
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
   channel_prefix: coderdojo_jp_production

config/environments/development.rb

@@ -13,19 +13,23 @@
   config.consider_all_requests_local = true
 
   # Enable/disable caching. By default caching is disabled.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.seconds.to_i}"
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false
 
     config.cache_store = :null_store
   end
 
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
@@ -37,6 +41,9 @@
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.

config/environments/test.rb

@@ -15,7 +15,7 @@
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
@@ -27,6 +27,10 @@
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory
+  config.active_storage.service = :test
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.

config/initializers/application_controller_renderer.rb

@@ -1,6 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
-# ApplicationController.renderer.defaults.merge!(
-#   http_host: 'example.org',
-#   https: false
-# )
+# ActiveSupport::Reloader.to_prepare do
+#   ApplicationController.renderer.defaults.merge!(
+#     http_host: 'example.org',
+#     https: false
+#   )
+# end