actionpack-page_caching 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5abbd11f21a931bd64d38d91a0ae38d717d1afea2c0a5536a7df9981f07248
-  data.tar.gz: d2ac93992ddb056d8902f28031a7d93976f67354b0bd14d265f112f504add562
+  metadata.gz: 89bc2dc16c419dd0cc85e43d0318d2cf25698aadf2e5b52f79188038a4159bd9
+  data.tar.gz: 1ee8bbc284ae4ccf1249648779edd731dd856102886eda5ceffe6827b46c7bbb
 SHA512:
-  metadata.gz: 94c76032e911c0675a4be758cd1c3885ff72b9c69c69369a41e1ce2537d092e63fe3ded7238257081d606dd1fc546720aed37a7814e2ff56039cb9d6911762a0
-  data.tar.gz: 16800c630f714dc81440a6418a3da1ee63971859cb4e2b0786602b89d26e871b021eb1e4d36b3bc5c4cee8313308418ae7412e6c4e738263932ee13706ce95eb
+  metadata.gz: c62d167b5f9b06ec6ae84253cab216544d9e887da74b5dc860fc75655bbea488349eb2b85cea21609ad4ce5fd4abe0c815acb09c05d489af968d7f5e8f1a6d52
+  data.tar.gz: adb8c87f834ad88955f8c0d8e5282b64a41ac5948e235d923647164d68d30bac56b4ee4b4de50b9d587a0c48e5835981162873c6f59e6e557d2e3af9d86e41e0

data/.github/workflows/ci.yml

@@ -0,0 +1,78 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        gemfile:
+          - '4-2-stable'
+          - '5-0-stable'
+          - '5-1-stable'
+          - '5-2-stable'
+          - '6-0-stable'
+          - '6-1-stable'
+          - 'edge'
+        ruby:
+          - '2.4'
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+        exclude:
+          - gemfile: '4-2-stable'
+            ruby: '2.5'
+          - gemfile: '4-2-stable'
+            ruby: '2.6'
+          - gemfile: '4-2-stable'
+            ruby: '2.7'
+          - gemfile: '4-2-stable'
+            ruby: '3.0'
+          - gemfile: '5-0-stable'
+            ruby: '2.7'
+          - gemfile: '5-0-stable'
+            ruby: '3.0'
+          - gemfile: '5-1-stable'
+            ruby: '2.7'
+          - gemfile: '5-1-stable'
+            ruby: '3.0'
+          - gemfile: '5-2-stable'
+            ruby: '2.7'
+          - gemfile: '5-2-stable'
+            ruby: '3.0'
+          - gemfile: '6-0-stable'
+            ruby: '2.4'
+          - gemfile: '6-1-stable'
+            ruby: '2.4'
+          - gemfile: 'edge'
+            ruby: '2.4'
+          - gemfile: 'edge'
+            ruby: '2.5'
+          - gemfile: 'edge'
+            ruby: '2.6'
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+    name: ${{ matrix.ruby }} rails-${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          bundler: ${{ fromJSON('["2", "1"]')[matrix.ruby == '2.4'] }}
+
+      - run: bundle exec rake test
+
+    env:
+      BUNDLE_GEMFILE: gemfiles/Gemfile-${{ matrix.gemfile }}
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 3
+

data/.rubocop.yml

@@ -4,10 +4,6 @@ AllCops:
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
 
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
 # Align `when` with `case`.
 Layout/CaseIndentation:
   Enabled: true
@@ -22,13 +18,6 @@ Layout/CommentIndentation:
 Layout/ElseAlignment:
   Enabled: true
 
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-  AutoCorrect: true
-
 Layout/EmptyLineAfterMagicComment:
   Enabled: true
 
@@ -51,9 +40,12 @@ Layout/EmptyLinesAroundMethodBody:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
+# Align `end` with the matching keyword or starting expression except for
+# assignments, where it should be aligned with the LHS.
+Layout/EndAlignment:
   Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
 
 Layout/FirstArgumentIndentation:
   Enabled: true
@@ -86,6 +78,10 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundKeyword:
   Enabled: true
 
+# Use `foo {}` not `foo{}`.
+Layout/SpaceBeforeBlockBraces:
+  Enabled: true
+
 Layout/SpaceBeforeComma:
   Enabled: true
 
@@ -95,20 +91,6 @@ Layout/SpaceBeforeComment:
 Layout/SpaceBeforeFirstArg:
   Enabled: true
 
-Style/DefWithParentheses:
-  Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-Style/RedundantFreeze:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
 # Use `foo { bar }` not `foo {bar}`.
 Layout/SpaceInsideBlockBraces:
   Enabled: true
@@ -121,11 +103,6 @@ Layout/SpaceInsideHashLiteralBraces:
 Layout/SpaceInsideParens:
   Enabled: true
 
-# Check quotes usage according to lint rule below.
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
 # Detect hard tabs, no hard tabs.
 Layout/Tab:
   Enabled: true
@@ -138,19 +115,21 @@ Layout/TrailingEmptyLines:
 Layout/TrailingWhitespace:
   Enabled: true
 
-# Use quotes for string literals when they are enough.
-Style/RedundantPercentQ:
-  Enabled: true
-
 Lint/AmbiguousOperator:
   Enabled: true
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
 
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
 Lint/ErbNewArguments:
   Enabled: true
 
+Lint/RedundantStringCoercion:
+  Enabled: true
+
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
@@ -158,16 +137,29 @@ Lint/RequireParentheses:
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
-Lint/RedundantStringCoercion:
+Lint/UselessAssignment:
   Enabled: true
 
 Lint/UriEscapeUnescape:
   Enabled: true
 
-Lint/UselessAssignment:
+# Prefer &&/|| over and/or.
+Style/AndOr:
   Enabled: true
 
-Lint/DeprecatedClassMethods:
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
   Enabled: true
 
 Style/ParenthesesAroundCondition:
@@ -176,6 +168,13 @@ Style/ParenthesesAroundCondition:
 Style/RedundantBegin:
   Enabled: true
 
+Style/RedundantFreeze:
+  Enabled: true
+
+# Use quotes for string literals when they are enough.
+Style/RedundantPercentQ:
+  Enabled: true
+
 Style/RedundantReturn:
   Enabled: true
   AllowMultipleReturnValues: true
@@ -184,9 +183,10 @@ Style/Semicolon:
   Enabled: true
   AllowAsExpressionSeparator: true
 
-# Prefer Foo.method over Foo::method
-Style/ColonMethodCall:
+# Check quotes usage according to lint rule below.
+Style/StringLiterals:
   Enabled: true
+  EnforcedStyle: double_quotes
 
 Style/TrivialAccessors:
   Enabled: true

data/CHANGELOG.md

@@ -1,47 +1,89 @@
-## 1.1.1 (September 25, 2018)
+## 1.2.4 (May 15, 2021)
 
-*   Fixes handling of several forward slashes as root path.
+- Fix `URI.parser` deprecation warning in Rails 6.1
 
-    *Xavier Noria*
+  _Andrew White_
 
-*   Documentation overhaul.
+## 1.2.3 (June 12, 2020)
 
-    *Xavier Noria*
+- Simplifies code in `page_caching.rb`
 
+  _Xavier Noria_
 
-## 1.1.0 (January 23, 2017)
+## 1.2.2 (May 6, 2020)
 
-*   Support dynamic `page_cache_directory` using a Proc, Symbol or callable
+- Fix variable name
 
-    *Andrew White*
+  _Jack McCracken_
 
-*   Support instance level setting of `page_cache_directory`
+## 1.2.1 (May 6, 2020)
 
-    *Andrew White*
+- Only write relative URIs when their normalized path begins with the normalized cache directory path
 
-*   Add support for Rails 5.0 and master
+  _Jack McCracken_
 
-    *Andrew White*
+## 1.2.0 (December 11, 2019)
 
+- Update RuboCop config
 
-## 1.0.2 (November 15, 2013)
+  _Rafael Mendonça França_
 
-*   Fix load order problem with other gems.
+- Fix for Rails 6 MIME lookups
 
-    *Rafael Mendonça França*
+  _Rob Zolkos_
 
+- Remove Rails 4.2 from testing matrix
 
-## 1.0.1 (October 24, 2013)
+  _Rob Zolkos_
+
+- Minimum of Ruby 2.4 required
+
+  _Rob Zolkos_
+
+- Remove upper dependency for `actionpack`
+
+  _Anton Kolodii_
+
+## 1.1.1 (September 25, 2018)
+
+- Fixes handling of several forward slashes as root path
+
+  _Xavier Noria_
+
+- Documentation overhaul
+
+  _Xavier Noria_
 
-*   Add Railtie to set `page_cache_directory` by default to `public` folder.
+## 1.1.0 (January 23, 2017)
+
+- Support dynamic `page_cache_directory` using a Proc, Symbol or callable
+
+  _Andrew White_
+
+- Support instance level setting of `page_cache_directory`
+
+  _Andrew White_
+
+- Add support for Rails 5.0 and master
+
+  _Andrew White_
+
+## 1.0.2 (November 15, 2013)
+
+- Fix load order problem with other gems.
+
+  _Rafael Mendonça França_
+
+## 1.0.1 (October 24, 2013)
 
-    Fixes #5.
+- Add Railtie to set `page_cache_directory` by default to `public` folder.
 
-    *Žiga Vidic*
+  Fixes #5.
 
+  _Žiga Vidic_
 
 ## 1.0.0 (February 27, 2013)
 
-*   Extract Action Pack - Action Caching from Rails core.
+- Extract Action Pack - Action Caching from Rails core.
 
-    *Francesco Rodriguez*, *Rafael Mendonça França*, *Michiel Sikkes*
+  _Francesco Rodriguez_, _Rafael Mendonça França_, _Michiel Sikkes_

data/README.md

@@ -212,4 +212,4 @@ Contributing
 Code Status
 -----------
 
-* [![Build Status](https://travis-ci.org/rails/actionpack-page_caching.svg?branch=master)](https://travis-ci.org/rails/actionpack-page_caching)
+* [![Build Status](https://github.com/rails/actionpack-page_caching/actions/workflows/ci.yml/badge.svg)](https://github.com/rails/actionpack-page_caching/actions/workflows/ci.yml)

data/actionpack-page_caching.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "actionpack-page_caching"
-  gem.version       = "1.2.2"
+  gem.version       = "1.2.4"
   gem.author        = "David Heinemeier Hansson"
   gem.email         = "david@loudthinking.com"
   gem.description   = "Static page caching for Action Pack (removed from core in Rails 4.0)"
@@ -8,14 +8,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/rails/actionpack-page_caching"
   gem.license       = "MIT"
 
-  gem.required_ruby_version = ">= 2.4.6"
+  gem.required_ruby_version = ">= 1.9.3"
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  gem.add_dependency "actionpack", ">= 5.0.0"
+  gem.add_dependency "actionpack", ">= 4.0.0"
 
   gem.add_development_dependency "mocha"
 end

data/gemfiles/Gemfile-4-2-stable

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

data/gemfiles/Gemfile-6-1-stable

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

data/gemfiles/Gemfile-edge

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
-gem "rails", github: "rails/rails", branch: "master"
-gem "arel", github: "rails/arel", branch: "master"
+gem "rails", github: "rails/rails", branch: "main"

data/lib/action_controller/caching/pages.rb

@@ -146,7 +146,7 @@ module ActionController
             if path.empty? || path =~ %r{\A/+\z}
               name = "/index"
             else
-              name = URI.parser.unescape(path.chomp("/"))
+              name = URI::DEFAULT_PARSER.unescape(path.chomp("/"))
             end
 
             if File.extname(name).empty?

data/lib/action_controller/page_caching.rb

@@ -2,12 +2,8 @@ require "action_controller/caching/pages"
 
 module ActionController
   module Caching
-    eager_autoload do
-      autoload :Pages
-    end
-
     include Pages
   end
 end
 
-ActionController::Base.send(:include, ActionController::Caching::Pages)
+ActionController::Base.include(ActionController::Caching::Pages)

data/test/caching_test.rb

@@ -1,5 +1,6 @@
+require "rails/version"
 require "abstract_unit"
-require "mocha/setup"
+require "mocha/minitest"
 require "find"
 
 CACHE_DIR = "test_cache"
@@ -184,14 +185,17 @@ class PageCachingTest < ActionController::TestCase
 
     project_root = File.expand_path("../../", __FILE__)
 
-
     # Make a path that escapes the cache directory
     get_to_root = "../../../"
 
     # Make sure this relative path points at the project root
     assert_equal project_root, File.expand_path(File.join(FILE_STORE_PATH, get_to_root))
 
-    get :ok, params: { id: "#{get_to_root}../pwnd" }
+    if Rails.version =~ /^4\./
+      get :ok, id: "#{get_to_root}../pwnd"
+    else
+      get :ok, params: { id: "#{get_to_root}../pwnd" }
+    end
 
     assert_predicate Find.find(File.join(project_root, "test")).grep(/pwnd/), :empty?
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-page_caching
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -45,19 +45,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - actionpack-page_caching.gemspec
+- gemfiles/Gemfile-4-2-stable
 - gemfiles/Gemfile-5-0-stable
 - gemfiles/Gemfile-5-1-stable
 - gemfiles/Gemfile-5-2-stable
 - gemfiles/Gemfile-6-0-stable
+- gemfiles/Gemfile-6-1-stable
 - gemfiles/Gemfile-edge
 - lib/action_controller/caching/pages.rb
 - lib/action_controller/page_caching.rb
@@ -70,7 +72,7 @@ homepage: https://github.com/rails/actionpack-page_caching
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,15 +80,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.6
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Static page caching for Action Pack (removed from core in Rails 4.0)
 test_files:

data/.travis.yml

@@ -1,43 +0,0 @@
-language: ruby
-sudo: false
-
-cache:
-  bundler: true
-
-before_install:
-  - gem install bundler
-
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile-5-0-stable
-  - gemfiles/Gemfile-5-1-stable
-  - gemfiles/Gemfile-5-2-stable
-  - gemfiles/Gemfile-6-0-stable
-  - gemfiles/Gemfile-edge
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile-edge
-  exclude:
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile-6-0-stable
-    - rvm: 2.4.6
-      gemfile: gemfiles/Gemfile-edge
-
-notifications:
-  email: false
-  irc:
-    on_success: change
-    on_failure: always
-    channels:
-      - "irc.freenode.org#rails-contrib"
-  campfire:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: "eRCx+FMvH50pmLu0GZTF7NN+2X+CesgodYUlHvCr5EXQ0ZO/YUmeW8vAh/N8\njSrLWYpk/4P/JA63JGWsvFor/zpkTnfwzX3LWgw04GV0V3T9jsn9CD2Coiu6\nFll5u4fUCUwpfbB4RlCkjvFdQmW+F9mmbRGMCDO5CmuPHOyyPH0="