actionpack-page_caching 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c84b38d08e6b8ec36bf104688be7f8a9a1de1c05bdf10796289cb27a8e9883
-  data.tar.gz: 9b05d100d1820f6a0b480b015d8123ce4d0bae52229ac16d6d5833d787e265c7
+  metadata.gz: ddc94d6e16fd7d3cb21aa0d63a1ade832a271077ea5d9b1e42e769490f05f102
+  data.tar.gz: 0bc6935d09e011c00c437ddb6ee5aee424ebde5452a801cb582be7f5c977f940
 SHA512:
-  metadata.gz: 9583f9359843f6fa8b86cf3db2d46a5597cc7bc9c96fef71d741e30c01d04efda3b7f78642bf7d4a67f7421b3c1630c17099897381139573bb0500c41a824fb5
-  data.tar.gz: cb7f51ee9ce237b63ea2a5e8ecd88b1d33cc83483660939608c62b8ea8d1804fdd854cbd11c914010963b0fa7f8b5f25d06926444ba10164819b8b3fe6f0ed14
+  metadata.gz: 4319580bee3b3fe4f9ced4d73c180d623e625b4ae885a4cc7b66d2fb2e831aba3bdd630d8a2a3298f38186fc40602b799ec342772540cfe96c1636ab536a9e7b
+  data.tar.gz: a81007b1ebd1b0c06b5b836b0951ecba336ef182375ad8705ef6a057193941545a09b0642cd6cc651325c9222402d7ef4da3085dac75015edfcd923af49db1bf

data/.github/workflows/ci.yml

@@ -0,0 +1,85 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        gemfile:
+          - '6-1-stable'
+          - '7-0-stable'
+          - '7-1-stable'
+          - '7-2-stable'
+          - '8-0-stable'
+          - '8-1-stable'
+          - 'edge'
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
+        exclude:
+          - gemfile: '6-1-stable'
+            ruby: '3.1'
+          - gemfile: '6-1-stable'
+            ruby: '3.2'
+          - gemfile: '6-1-stable'
+            ruby: '3.3'
+          - gemfile: '6-1-stable'
+            ruby: '3.4'
+          - gemfile: '7-0-stable'
+            ruby: '3.3'
+          - gemfile: '7-0-stable'
+            ruby: '3.4'
+          - gemfile: '7-1-stable'
+            ruby: '3.4'
+          - gemfile: '7-2-stable'
+            ruby: '2.7'
+          - gemfile: '7-2-stable'
+            ruby: '3.0'
+          - gemfile: '8-0-stable'
+            ruby: '2.7'
+          - gemfile: '8-0-stable'
+            ruby: '3.0'
+          - gemfile: '8-0-stable'
+            ruby: '3.1'
+          - gemfile: '8-1-stable'
+            ruby: '2.7'
+          - gemfile: '8-1-stable'
+            ruby: '3.0'
+          - gemfile: '8-1-stable'
+            ruby: '3.1'
+          - gemfile: 'edge'
+            ruby: '2.7'
+          - gemfile: 'edge'
+            ruby: '3.0'
+          - gemfile: 'edge'
+            ruby: '3.1'
+          - gemfile: 'edge'
+            ruby: '3.2'
+      fail-fast: false
+
+    runs-on: ubuntu-latest
+    name: ${{ matrix.ruby }} rails-${{ matrix.gemfile }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - 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,95 @@
-## 1.1.1 (September 25, 2018)
+## 1.2.5 (September 21, 2026)
 
-*   Fixes handling of several forward slashes as root path.
+- Fix directory check for directory with shared prefix
 
-    *Xavier Noria*
+ _John Hawthorn_
 
-*   Documentation overhaul.
+## 1.2.4 (May 15, 2021)
 
-    *Xavier Noria*
+- Fix `URI.parser` deprecation warning in Rails 6.1
 
+  _Andrew White_
 
-## 1.1.0 (January 23, 2017)
+## 1.2.3 (June 12, 2020)
 
-*   Support dynamic `page_cache_directory` using a Proc, Symbol or callable
+- Simplifies code in `page_caching.rb`
 
-    *Andrew White*
+  _Xavier Noria_
 
-*   Support instance level setting of `page_cache_directory`
+## 1.2.2 (May 6, 2020)
 
-    *Andrew White*
+- Fix variable name
 
-*   Add support for Rails 5.0 and master
+  _Jack McCracken_
 
-    *Andrew White*
+## 1.2.1 (May 6, 2020)
 
+- Only write relative URIs when their normalized path begins with the normalized cache directory path
 
-## 1.0.2 (November 15, 2013)
+  _Jack McCracken_
 
-*   Fix load order problem with other gems.
+## 1.2.0 (December 11, 2019)
 
-    *Rafael Mendonça França*
+- Update RuboCop config
 
+  _Rafael Mendonça França_
 
-## 1.0.1 (October 24, 2013)
+- Fix for Rails 6 MIME lookups
+
+  _Rob Zolkos_
+
+- Remove Rails 4.2 from testing matrix
+
+  _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_
 
-*   Add Railtie to set `page_cache_directory` by default to `public` folder.
+- Documentation overhaul
+
+  _Xavier Noria_
+
+## 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.3"
+  gem.version       = "1.2.5"
   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-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-7-0-stable

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

data/gemfiles/Gemfile-7-1-stable

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

data/gemfiles/Gemfile-7-2-stable

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

data/gemfiles/Gemfile-8-0-stable

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

data/gemfiles/Gemfile-8-1-stable

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "8-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?
@@ -157,10 +157,11 @@ module ActionController
           end
 
           def cache_path(path, extension = nil)
-            unnormalized_path = File.join(normalized_cache_directory, cache_file(path, extension))
+            cache_directory = normalized_cache_directory
+            unnormalized_path = File.join(cache_directory, cache_file(path, extension))
             normalized_path = File.expand_path(unnormalized_path)
 
-            normalized_path if normalized_path.start_with?(normalized_cache_directory)
+            normalized_path if normalized_path.start_with?(File.join(cache_directory, ""))
           end
 
           def delete(path)

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,18 +185,38 @@ 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
 
+  def test_cache_does_not_escape_into_sibling_sharing_name_prefix
+    draw do
+      get "/page_caching_test/ok/:id", to: "page_caching_test#ok"
+    end
+
+    # Relative to the cache directory, "../../../" is the directory holding it.
+    ["../../../#{CACHE_DIR}_sibling/page", "../../../#{CACHE_DIR}_sibling"].each do |id|
+      if Rails.version =~ /^4\./
+        get :ok, id: id
+      else
+        get :ok, params: { id: id }
+      end
+    end
+
+    assert_equal [CACHE_DIR], Dir.entries(TEST_TMP_DIR) - [".", ".."]
+  end
+
   def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
     draw do
       get "posts.:format", to: "posts#index", as: :formatted_posts
@@ -422,9 +443,10 @@ class ProcPageCachingTest < ActionController::TestCase
   end
 
   def test_class_level_cache_page_raise_error
-    assert_raises(RuntimeError, /class-level cache_page method/) do
+    error = assert_raises(RuntimeError) do
       @controller.class.cache_page "cached content", "/proc_page_caching_test/ok"
     end
+    assert_match(/class-level cache_page method/, error.message)
   end
 end
 
@@ -478,9 +500,10 @@ class SymbolPageCachingTest < ActionController::TestCase
   end
 
   def test_class_level_cache_page_raise_error
-    assert_raises(RuntimeError, /class-level cache_page method/) do
+    error = assert_raises(RuntimeError) do
       @controller.class.cache_page "cached content", "/symbol_page_caching_test/ok"
     end
+    assert_match(/class-level cache_page method/, error.message)
   end
 end
 
@@ -535,8 +558,9 @@ class CallablePageCachingTest < ActionController::TestCase
   end
 
   def test_class_level_cache_page_raise_error
-    assert_raises(RuntimeError, /class-level cache_page method/) do
+    error = assert_raises(RuntimeError) do
       @controller.class.cache_page "cached content", "/callable_page_caching_test/ok"
     end
+    assert_match(/class-level cache_page method/, error.message)
   end
 end

data/test/instrumentation_test.rb

@@ -0,0 +1,63 @@
+require "abstract_unit"
+
+module Another
+  class InstrumentationController < ActionController::Base
+    self.perform_caching = true
+
+    def with_page_cache
+      cache_page("Super soaker", "/index.html")
+      head :ok
+    end
+  end
+end
+
+class InstrumentationTest < ActionController::TestCase
+  tests Another::InstrumentationController
+
+  def setup
+    super
+
+    @routes = ActionDispatch::Routing::RouteSet.new
+
+    @cache_path = File.expand_path("../tmp/test_cache", __FILE__)
+    ActionController::Base.page_cache_directory = @cache_path
+  end
+
+  def teardown
+    FileUtils.rm_rf(@cache_path)
+  end
+
+  def test_write_page_is_instrumented
+    events = []
+    subscriber = ActiveSupport::Notifications.subscribe("write_page.action_controller") do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    with_routing do |set|
+      set.draw do
+        get "/with_page_cache", to: "another/instrumentation#with_page_cache"
+      end
+
+      get :with_page_cache
+    end
+
+    assert_equal 1, events.size
+    assert_equal "/index.html", events.first.payload[:path]
+  ensure
+    ActiveSupport::Notifications.unsubscribe(subscriber)
+  end
+
+  def test_expire_page_is_instrumented
+    events = []
+    subscriber = ActiveSupport::Notifications.subscribe("expire_page.action_controller") do |*args|
+      events << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    @controller.class.expire_page("/index.html")
+
+    assert_equal 1, events.size
+    assert_equal "/index.html", events.first.payload[:path]
+  ensure
+    ActiveSupport::Notifications.unsubscribe(subscriber)
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-page_caching
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,14 +15,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 +44,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-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-7-0-stable
+- gemfiles/Gemfile-7-1-stable
+- gemfiles/Gemfile-7-2-stable
+- gemfiles/Gemfile-8-0-stable
+- gemfiles/Gemfile-8-1-stable
 - gemfiles/Gemfile-edge
 - lib/action_controller/caching/pages.rb
 - lib/action_controller/page_caching.rb
@@ -65,12 +66,11 @@ files:
 - lib/actionpack/page_caching/railtie.rb
 - test/abstract_unit.rb
 - test/caching_test.rb
-- test/log_subscriber_test.rb
+- test/instrumentation_test.rb
 homepage: https://github.com/rails/actionpack-page_caching
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,18 +78,17 @@ 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: 4.0.16
 specification_version: 4
 summary: Static page caching for Action Pack (removed from core in Rails 4.0)
 test_files:
 - test/abstract_unit.rb
 - test/caching_test.rb
-- test/log_subscriber_test.rb
+- test/instrumentation_test.rb

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="

data/gemfiles/Gemfile-5-0-stable

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

data/gemfiles/Gemfile-5-1-stable

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

data/gemfiles/Gemfile-5-2-stable

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

data/gemfiles/Gemfile-6-0-stable

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

data/test/log_subscriber_test.rb

@@ -1,57 +0,0 @@
-require "abstract_unit"
-require "active_support/log_subscriber/test_helper"
-require "action_controller/log_subscriber"
-
-module Another
-  class LogSubscribersController < ActionController::Base
-    abstract!
-
-    self.perform_caching = true
-
-    def with_page_cache
-      cache_page("Super soaker", "/index.html")
-      head :ok
-    end
-  end
-end
-
-class ACLogSubscriberTest < ActionController::TestCase
-  tests Another::LogSubscribersController
-  include ActiveSupport::LogSubscriber::TestHelper
-
-  def setup
-    super
-
-    @routes = ActionDispatch::Routing::RouteSet.new
-
-    @cache_path = File.expand_path("../tmp/test_cache", __FILE__)
-    ActionController::Base.page_cache_directory = @cache_path
-    @controller.cache_store = :file_store, @cache_path
-    ActionController::LogSubscriber.attach_to :action_controller
-  end
-
-  def teardown
-    ActiveSupport::LogSubscriber.log_subscribers.clear
-    FileUtils.rm_rf(@cache_path)
-  end
-
-  def set_logger(logger)
-    ActionController::Base.logger = logger
-  end
-
-  def test_with_page_cache
-    with_routing do |set|
-      set.draw do
-        get "/with_page_cache", to: "another/log_subscribers#with_page_cache"
-      end
-
-      get :with_page_cache
-      wait
-
-      logs = @logger.logged(:info)
-      assert_equal 3, logs.size
-      assert_match(/Write page/, logs[1])
-      assert_match(/\/index\.html/, logs[1])
-    end
-  end
-end