# HG changeset patch # User nanaya # Date 1523647192 -32400 # Node ID 07d6c6639adf8ea2ab120061d642cd86e00108d7 # Parent 1c6a056269e6e14350f0d5e6403224196ac124ec Upgrade to rails 5.2. RIP code style. diff -r 1c6a056269e6 -r 07d6c6639adf Gemfile --- a/Gemfile Sat Apr 14 04:19:29 2018 +0900 +++ b/Gemfile Sat Apr 14 04:19:52 2018 +0900 @@ -1,8 +1,8 @@ source "https://rubygems.org" -gem "rails", "~> 5.1.0" +gem "rails", "~> 5.2.0" gem "jquery-rails" -gem "coffee-rails", "~> 4.2" # Rails 4.2 default +gem "coffee-rails" gem "bootstrap-sass" source "https://rails-assets.org" do @@ -17,9 +17,9 @@ gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby gem "jruby-openssl", :platforms => :jruby -gem "sass-rails", "~> 5.0" # Rails 4.2 default +gem "sass-rails" -gem "uglifier", ">= 1.3.0" # Rails 4.2 default +gem "uglifier" gem "therubyrhino", :platforms => :jruby diff -r 1c6a056269e6 -r 07d6c6639adf Gemfile.lock --- a/Gemfile.lock Sat Apr 14 04:19:29 2018 +0900 +++ b/Gemfile.lock Sat Apr 14 04:19:52 2018 +0900 @@ -2,50 +2,54 @@ remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.1.4) - actionpack (= 5.1.4) + actioncable (5.2.0) + actionpack (= 5.2.0) nio4r (~> 2.0) - websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.2.0) + activesupport (= 5.2.0) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) - arel (~> 8.0) + activemodel (5.2.0) + activesupport (= 5.2.0) + activerecord (5.2.0) + activemodel (= 5.2.0) + activesupport (= 5.2.0) + arel (>= 9.0) activerecord-jdbc-adapter (50.0) activerecord (>= 2.2) activerecord-jdbcpostgresql-adapter (50.0) activerecord-jdbc-adapter (~> 50.0) jdbc-postgres (>= 9.4, < 43) - activesupport (5.1.4) + activestorage (5.2.0) + actionpack (= 5.2.0) + activerecord (= 5.2.0) + marcel (~> 0.3.1) + activesupport (5.2.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - arel (8.0.0) - autoprefixer-rails (7.2.2) + arel (9.0.0) + autoprefixer-rails (8.2.0) execjs bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) @@ -60,14 +64,14 @@ coffee-script-source (1.12.2) concurrent-ruby (1.0.5) concurrent-ruby (1.0.5-java) - crass (1.0.3) - erubi (1.7.0) + crass (1.0.4) + erubi (1.7.1) execjs (2.7.0) - ffi (1.9.18) - ffi (1.9.18-java) + ffi (1.9.23) + ffi (1.9.23-java) globalid (0.4.1) activesupport (>= 4.2.0) - i18n (0.9.1) + i18n (1.0.0) concurrent-ruby (~> 1.0) jdbc-postgres (42.1.4) jquery-rails (4.3.1) @@ -75,57 +79,61 @@ railties (>= 4.2.0) thor (>= 0.14, < 2.0) jruby-openssl (0.9.21-java) - loofah (2.1.1) + loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) method_source (0.9.0) + mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.3) - newrelic_rpm (4.6.0.338) - nio4r (2.1.0) - nio4r (2.1.0-java) - nokogiri (1.8.1) + minitest (5.11.3) + newrelic_rpm (5.0.0.342) + nio4r (2.3.0) + nio4r (2.3.0-java) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogiri (1.8.1-java) - pg (0.21.0) - puma (3.11.0) - puma (3.11.0-java) - rack (2.0.3) - rack-test (0.8.2) + nokogiri (1.8.2-java) + pg (1.0.0) + puma (3.11.4) + puma (3.11.4-java) + rack (2.0.4) + rack-test (1.0.0) rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.2.0) sprockets-rails (>= 2.0.0) rails-assets-commonmark (0.28.1) rails-assets-highlightjs (9.12.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (5.2.0) + actionpack (= 5.2.0) + activesupport (= 5.2.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.0) - rb-fsevent (0.10.2) + rake (12.3.1) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - sass (3.5.3) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -150,13 +158,13 @@ thread_safe (0.3.6) thread_safe (0.3.6-java) tilt (2.0.8) - tzinfo (1.2.4) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.0.1) + uglifier (4.1.9) execjs (>= 0.3.0, < 3) - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-driver (0.6.5-java) + websocket-driver (0.7.0-java) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) @@ -167,18 +175,18 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter bootstrap-sass - coffee-rails (~> 4.2) + coffee-rails jquery-rails jruby-openssl newrelic_rpm pg puma - rails (~> 5.1.0) + rails (~> 5.2.0) rails-assets-commonmark! rails-assets-highlightjs! - sass-rails (~> 5.0) + sass-rails therubyrhino - uglifier (>= 1.3.0) + uglifier BUNDLED WITH - 1.16.0 + 1.16.1 diff -r 1c6a056269e6 -r 07d6c6639adf bin/bundle --- a/bin/bundle Sat Apr 14 04:19:29 2018 +0900 +++ b/bin/bundle Sat Apr 14 04:19:52 2018 +0900 @@ -1,3 +1,3 @@ #!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) load Gem.bin_path('bundler', 'bundle') diff -r 1c6a056269e6 -r 07d6c6639adf bin/setup --- a/bin/setup Sat Apr 14 04:19:29 2018 +0900 +++ b/bin/setup Sat Apr 14 04:19:52 2018 +0900 @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -18,6 +17,9 @@ system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + # puts "\n== Copying sample files ==" # unless File.exist?('config/database.yml') # cp 'config/database.yml.sample', 'config/database.yml' diff -r 1c6a056269e6 -r 07d6c6639adf bin/update --- a/bin/update Sat Apr 14 04:19:29 2018 +0900 +++ b/bin/update Sat Apr 14 04:19:52 2018 +0900 @@ -1,10 +1,9 @@ #!/usr/bin/env ruby -require 'pathname' require 'fileutils' include FileUtils # path to your application root. -APP_ROOT = Pathname.new File.expand_path('../../', __FILE__) +APP_ROOT = File.expand_path('..', __dir__) def system!(*args) system(*args) || abort("\n== Command #{args} failed ==") @@ -18,6 +17,9 @@ system! 'gem install bundler --conservative' system('bundle check') || system!('bundle install') + # Install JavaScript dependencies if using Yarn + # system('bin/yarn') + puts "\n== Updating database ==" system! 'bin/rails db:migrate' diff -r 1c6a056269e6 -r 07d6c6639adf bin/yarn --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/yarn Sat Apr 14 04:19:52 2018 +0900 @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + 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" + exit 1 + end +end diff -r 1c6a056269e6 -r 07d6c6639adf config/application.rb --- a/config/application.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/application.rb Sat Apr 14 04:19:52 2018 +0900 @@ -5,9 +5,14 @@ require_relative "config_init" +require "active_model/railtie" +# require "active_job/railtie" require "active_record/railtie" +# require "active_storage/engine" require "action_controller/railtie" # require "action_mailer/railtie" +require "action_view/railtie" +# require "action_cable/engine" require "sprockets/railtie" require "rails/test_unit/railtie" @@ -58,5 +63,7 @@ config.assets.initialize_on_precompile = false config.action_view.field_error_proc = proc { |html| html } + + config.load_defaults 5.0 end end diff -r 1c6a056269e6 -r 07d6c6639adf config/environments/development.rb --- a/config/environments/development.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/environments/development.rb Sat Apr 14 04:19:52 2018 +0900 @@ -9,15 +9,17 @@ # Do not eager load code on boot. config.eager_load = false - # Show full error reports and disable caching. + # Show full error reports. config.consider_all_requests_local = true + # Enable/disable caching. By default caching is disabled. - if Rails.root.join("tmp/caching-dev.txt").exist? - config.action_controller.perform_caching = false + # 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=172800" + 'Cache-Control' => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false @@ -25,8 +27,8 @@ config.cache_store = :null_store end - # Don't care if the mailer can't send. - # config.action_mailer.raise_delivery_errors = false + # Store uploaded files on the local file system (see config/storage.yml for options) + # config.active_storage.service = :local # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log @@ -34,18 +36,21 @@ # 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.assets.debug = true - # Raises error for missing translations. - config.action_view.raise_on_missing_translations = true - # Suppress logger output for asset requests. config.assets.quiet = true - # Use an evented file watcher to asynchronously detect changes in source code + # Raises error for missing translations + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. # config.file_watcher = ActiveSupport::EventedFileUpdateChecker end diff -r 1c6a056269e6 -r 07d6c6639adf config/environments/test.rb --- a/config/environments/test.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/environments/test.rb Sat Apr 14 04:19:52 2018 +0900 @@ -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=3600" + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" } # Show full error reports and disable caching. @@ -27,12 +27,9 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false - # config.action_mailer.perform_caching = false - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - # config.action_mailer.delivery_method = :test + # Store uploaded files on the local file system in a temporary directory + config.active_storage.service = :test # Print deprecation notices to the stderr. config.active_support.deprecation = :stderr diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/application_controller_renderer.rb --- a/config/initializers/application_controller_renderer.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/initializers/application_controller_renderer.rb Sat Apr 14 04:19:52 2018 +0900 @@ -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 diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/assets.rb --- a/config/initializers/assets.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/initializers/assets.rb Sat Apr 14 04:19:52 2018 +0900 @@ -1,11 +1,14 @@ # 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.0' -# Add additional assets to the asset load path +# Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') # Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/content_security_policy.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/initializers/content_security_policy.rb Sat Apr 14 04:19:52 2018 +0900 @@ -0,0 +1,25 @@ +# Be sure to restart your server when you modify this file. + +# Define an application-wide content security policy +# For further information see the following documentation +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy + +# Rails.application.config.content_security_policy do |policy| +# policy.default_src :self, :https +# policy.font_src :self, :https, :data +# policy.img_src :self, :https, :data +# policy.object_src :none +# policy.script_src :self, :https +# policy.style_src :self, :https + +# # Specify URI for violation reports +# # policy.report_uri "/csp-violation-report-endpoint" +# end + +# If you are using UJS then enable automatic nonce generation +# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } + +# Report CSP violations to a specified URI +# For further information see the following documentation: +# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only +# Rails.application.config.content_security_policy_report_only = true diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/cookies_serializer.rb --- a/config/initializers/cookies_serializer.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/initializers/cookies_serializer.rb Sat Apr 14 04:19:52 2018 +0900 @@ -2,4 +2,4 @@ # Specify a serializer for the signed and encrypted cookie jars. # Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :hybrid +Rails.application.config.action_dispatch.cookies_serializer = :json diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/new_framework_defaults.rb --- a/config/initializers/new_framework_defaults.rb Sat Apr 14 04:19:29 2018 +0900 +++ b/config/initializers/new_framework_defaults.rb Sat Apr 14 04:19:52 2018 +0900 @@ -17,8 +17,5 @@ # Require `belongs_to` associations by default. Previous versions had false. Rails.application.config.active_record.belongs_to_required_by_default = true -# Do not halt callback chains when a callback returns false. Previous versions had true. -ActiveSupport.halt_callback_chains_on_return_false = false - # Configure SSL options to enable HSTS with subdomains. Previous versions had false. Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff -r 1c6a056269e6 -r 07d6c6639adf config/initializers/new_framework_defaults_5_2.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/initializers/new_framework_defaults_5_2.rb Sat Apr 14 04:19:52 2018 +0900 @@ -0,0 +1,35 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains migration options to ease your Rails 5.2 upgrade. +# +# Once upgraded flip defaults one by one to migrate to the new default. +# +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +# Make Active Record use stable #cache_key alongside new #cache_version method. +# This is needed for recyclable cache keys. +# Rails.application.config.active_record.cache_versioning = true + +# Use AES-256-GCM authenticated encryption for encrypted cookies. +# Also, embed cookie expiry in signed or encrypted cookies for increased security. +# +# This option is not backwards compatible with earlier Rails versions. +# It's best enabled when your entire app is migrated and stable on 5.2. +# +# Existing cookies will be converted on read then written with the new scheme. +# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true + +# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages +# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. +# Rails.application.config.active_support.use_authenticated_message_encryption = true + +# Add default protection from forgery to ActionController::Base instead of in +# ApplicationController. +# Rails.application.config.action_controller.default_protect_from_forgery = true + +# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and +# 'f' after migrating old data. +# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + +# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. +# Rails.application.config.active_support.use_sha1_digests = true diff -r 1c6a056269e6 -r 07d6c6639adf config/spring.rb --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/spring.rb Sat Apr 14 04:19:52 2018 +0900 @@ -0,0 +1,6 @@ +%w[ + .ruby-version + .rbenv-vars + tmp/restart.txt + tmp/caching-dev.txt +].each { |path| Spring.watch(path) } diff -r 1c6a056269e6 -r 07d6c6639adf config/storage.yml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/storage.yml Sat Apr 14 04:19:52 2018 +0900 @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ]