Merge pull request #77 from sikachu/rails-6-1-ready

Update CI matrix and make the gem Rails 6.1 compatible

Author: matthewd

.travis.yml

@@ -14,9 +14,10 @@ rvm:
   - 2.1.10
   - 2.2.10
   - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
 
 gemfile:
   - Gemfile
@@ -27,6 +28,7 @@ gemfile:
   - gemfiles/Gemfile-5-1-stable
   - gemfiles/Gemfile-5-2-stable
   - gemfiles/Gemfile-6-0-stable
+  - gemfiles/Gemfile-6-1-stable
   - gemfiles/Gemfile-edge
 
 matrix:
@@ -39,6 +41,12 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.1.10
       gemfile: Gemfile
+    - rvm: 2.2.10
+      gemfile: Gemfile
+    - rvm: 2.3.8
+      gemfile: Gemfile
+    - rvm: 2.4.10
+      gemfile: Gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-5-0-stable
     - rvm: 1.9.3
@@ -47,6 +55,8 @@ matrix:
       gemfile: gemfiles/Gemfile-5-2-stable
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile-6-1-stable
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-5-0-stable
     - rvm: 2.0.0
@@ -55,6 +65,8 @@ matrix:
       gemfile: gemfiles/Gemfile-5-2-stable
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-6-1-stable
     - rvm: 2.1.10
       gemfile: gemfiles/Gemfile-5-0-stable
     - rvm: 2.1.10
@@ -67,8 +79,16 @@ matrix:
       gemfile: gemfiles/Gemfile-6-0-stable
     - rvm: 2.3.8
       gemfile: gemfiles/Gemfile-6-0-stable
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-6-1-stable
+    - rvm: 2.2.10
+      gemfile: gemfiles/Gemfile-6-1-stable
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile-6-1-stable
+    - rvm: 2.4.10
+      gemfile: gemfiles/Gemfile-6-1-stable
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-edge
     - rvm: 2.0.0
@@ -79,27 +99,38 @@ matrix:
       gemfile: gemfiles/Gemfile-edge
     - rvm: 2.3.8
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.4.6
+    - rvm: 2.4.10
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.4.6
+    - rvm: 2.4.10
+      gemfile: gemfiles/Gemfile-4-0-stable
+    - rvm: 2.4.10
+      gemfile: gemfiles/Gemfile-4-1-stable
+    - rvm: 2.5.8
       gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.4.6
+    - rvm: 2.5.8
       gemfile: gemfiles/Gemfile-4-1-stable
-    - rvm: 2.5.5
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.5.5
+    - rvm: 2.6.6
       gemfile: gemfiles/Gemfile-4-1-stable
-    - rvm: 2.6.3
+    - rvm: 2.6.6
+      gemfile: gemfiles/Gemfile-4-2-stable
+    - rvm: 2.6.6
+      gemfile: gemfiles/Gemfile-5-0-stable
+    - rvm: 2.6.6
+      gemfile: gemfiles/Gemfile-5-1-stable
+    - rvm: 2.7.2
       gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.6.3
+    - rvm: 2.7.2
       gemfile: gemfiles/Gemfile-4-1-stable
-    - rvm: 2.6.3
+    - rvm: 2.7.2
       gemfile: gemfiles/Gemfile-4-2-stable
-    - rvm: 2.6.3
+    - rvm: 2.7.2
       gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.6.3
+    - rvm: 2.7.2
       gemfile: gemfiles/Gemfile-5-1-stable
 
+
 notifications:
   email: false
   irc:

gemfiles/Gemfile-6-1-stable

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "6-1-stable"

lib/action_controller/action_caching.rb

@@ -2,6 +2,8 @@
 
 module ActionController
   module Caching
+    extend ActiveSupport::Autoload
+
     eager_autoload do
       autoload :Actions
     end

lib/action_controller/caching/actions.rb

@@ -228,10 +228,10 @@ def initialize(controller, options = {}, infer_extension = true)
 
       private
         def normalize!(path)
-          ext = URI.parser.escape(extension.to_s) if extension
+          ext = URI::DEFAULT_PARSER.escape(extension.to_s) if extension
           path << "index" if path[-1] == ?/
-          path << ".#{ext}" if extension && !path.split("?", 2).first.ends_with?(".#{ext}")
-          URI.parser.unescape(path)
+          path << ".#{ext}" if extension && !path.split("?", 2).first.end_with?(".#{ext}")
+          URI::DEFAULT_PARSER.unescape(path)
         end
       end
     end