Update to rails 6.0.0.beta1

sleepepi · Jan 25, 2019 · 18729f5 · 18729f5
1 parent 6ab4e4d
commit 18729f5
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 - **Gem Changes**
   - Update to ruby 2.6.0
-  - Update to rails 5.2.2
+  - Update to rails 6.0.0.beta1
   - Update to carrierwave 1.3.1
 
 ## 4.0.0 (November 7, 2018)

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@
 # rubocop:disable Layout/ExtraSpacing
 source "https://rubygems.org"
 
-gem "rails",                   "5.2.2"
+gem "rails",                   "6.0.0.beta1"
 
 # Use PostgreSQL as the database for Active Record
 gem "pg",                      ">= 0.18", "< 2.0"
@@ -21,7 +21,8 @@ gem "jquery-rails",            "~> 4.3.3"
 gem "jquery-ui-rails",         "~> 6.0.1"
 gem "kaminari",                "~> 1.1.1"
 gem "mini_magick",             "~> 4.8.0"
-gem "pg_search",               "~> 2.1.2"
+# gem "pg_search",               "~> 2.1.2"
+gem "pg_search", git: "https://github.com/Casecommons/pg_search.git", ref: "bd070786a014f6ea4f2767e0abd0d818861116ab"
 
 # Rails defaults
 gem "bootsnap",                ">= 1.1.0", require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,63 +1,83 @@
+GIT
+  remote: https://github.com/Casecommons/pg_search.git
+  revision: bd070786a014f6ea4f2767e0abd0d818861116ab
+  ref: bd070786a014f6ea4f2767e0abd0d818861116ab
+  specs:
+    pg_search (2.1.3)
+      activerecord (>= 4.2)
+      activesupport (>= 4.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      activejob (= 6.0.0.beta1)
+      activerecord (= 6.0.0.beta1)
+      activestorage (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      actionview (= 6.0.0.beta1)
+      activejob (= 6.0.0.beta1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (6.0.0.beta1)
+      actionview (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actiontext (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      activerecord (= 6.0.0.beta1)
+      activestorage (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activemodel (6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+    activerecord (6.0.0.beta1)
+      activemodel (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
+    activestorage (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      activerecord (= 6.0.0.beta1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (6.0.0.beta1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
     autoprefixer-rails (9.1.0)
       execjs
     aws-eventstream (1.0.1)
-    aws-partitions (1.129.0)
-    aws-sdk-core (3.44.2)
+    aws-partitions (1.135.0)
+    aws-sdk-core (3.46.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
     aws-sdk-kms (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.30.0)
+    aws-sdk-s3 (1.30.1)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -71,7 +91,7 @@ GEM
       popper_js (>= 1.12.9, < 2)
       sass (>= 3.5.2)
     builder (3.2.3)
-    capybara (3.12.0)
+    capybara (3.13.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -124,12 +144,12 @@ GEM
     font-awesome-sass (5.3.1)
       sassc (>= 1.11)
     formatador (0.2.5)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    i18n (1.5.1)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jbuilder (2.8.0)
@@ -178,53 +198,51 @@ GEM
     msgpack (1.2.6)
     multi_json (1.13.1)
     nio4r (2.3.1)
-    nokogiri (1.10.0)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
-    pg (1.1.3)
-    pg_search (2.1.3)
-      activerecord (>= 4.2)
-      activesupport (>= 4.2)
-      arel (>= 6)
+    pg (1.1.4)
     popper_js (1.14.5)
     public_suffix (3.0.3)
     puma (3.12.0)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (6.0.0.beta1)
+      actioncable (= 6.0.0.beta1)
+      actionmailbox (= 6.0.0.beta1)
+      actionmailer (= 6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      actiontext (= 6.0.0.beta1)
+      actionview (= 6.0.0.beta1)
+      activejob (= 6.0.0.beta1)
+      activemodel (= 6.0.0.beta1)
+      activerecord (= 6.0.0.beta1)
+      activestorage (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 6.0.0.beta1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (6.0.0.beta1)
+      actionpack (= 6.0.0.beta1)
+      activesupport (= 6.0.0.beta1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     redis (4.1.0)
     regexp_parser (1.3.0)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     sass (3.7.3)
@@ -307,9 +325,9 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   mini_magick (~> 4.8.0)
   pg (>= 0.18, < 2.0)
-  pg_search (~> 2.1.2)
+  pg_search!
   puma (~> 3.11)
-  rails (= 5.2.2)
+  rails (= 6.0.0.beta1)
   redis (~> 4.0)
   sass-rails (~> 5.0)
   selenium-webdriver

diff --git a/bin/setup b/bin/setup
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-include FileUtils
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,20 +8,20 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
+FileUtils.chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
+  # Install JavaScript dependencies
   # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="

diff --git a/bin/update b/bin/update
@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-include FileUtils
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,23 +8,23 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
+FileUtils.chdir APP_ROOT do
   # This script is a way to update your development environment automatically.
   # Add necessary update steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
+  # Install JavaScript dependencies
   # system('bin/yarn')
 
   puts "\n== Updating database =="
-  system! 'bin/rails db:migrate'
+  system! 'rails db:migrate'
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! 'rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! 'rails restart'
 end
diff --git a/config/application.rb b/config/application.rb
@@ -12,7 +12,7 @@ module LoftHF
   # Framework for the https://lofthf.study website.
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers

diff --git a/config/cable.yml b/config/cable.yml
@@ -4,7 +4,7 @@ development:
   channel_prefix: loft_hf_development
 
 test:
-  adapter: async
+  adapter: test
 
 production:
   adapter: redis

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -16,6 +16,7 @@
   # Run rails dev:cache to toggle caching.
   if Rails.root.join("tmp", "caching-dev.txt").exist?
     config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
@@ -27,7 +28,7 @@
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # 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.
@@ -52,12 +53,12 @@
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Raises error for missing translations
+  # 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
+  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   # Set Action Cable server url for consumer connection
   config.action_cable.url = "ws://localhost/edge/lofthf.study/cable"