actionpack-page_caching 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89bc2dc16c419dd0cc85e43d0318d2cf25698aadf2e5b52f79188038a4159bd9
-  data.tar.gz: 1ee8bbc284ae4ccf1249648779edd731dd856102886eda5ceffe6827b46c7bbb
+  metadata.gz: ddc94d6e16fd7d3cb21aa0d63a1ade832a271077ea5d9b1e42e769490f05f102
+  data.tar.gz: 0bc6935d09e011c00c437ddb6ee5aee424ebde5452a801cb582be7f5c977f940
 SHA512:
-  metadata.gz: c62d167b5f9b06ec6ae84253cab216544d9e887da74b5dc860fc75655bbea488349eb2b85cea21609ad4ce5fd4abe0c815acb09c05d489af968d7f5e8f1a6d52
-  data.tar.gz: adb8c87f834ad88955f8c0d8e5282b64a41ac5948e235d923647164d68d30bac56b4ee4b4de50b9d587a0c48e5835981162873c6f59e6e557d2e3af9d86e41e0
+  metadata.gz: 4319580bee3b3fe4f9ced4d73c180d623e625b4ae885a4cc7b66d2fb2e831aba3bdd630d8a2a3298f38186fc40602b799ec342772540cfe96c1636ab536a9e7b
+  data.tar.gz: a81007b1ebd1b0c06b5b836b0951ecba336ef182375ad8705ef6a057193941545a09b0642cd6cc651325c9222402d7ef4da3085dac75015edfcd923af49db1bf

data/.github/workflows/ci.yml

@@ -11,63 +11,71 @@ jobs:
     strategy:
       matrix:
         gemfile:
-          - '4-2-stable'
-          - '5-0-stable'
-          - '5-1-stable'
-          - '5-2-stable'
-          - '6-0-stable'
           - '6-1-stable'
+          - '7-0-stable'
+          - '7-1-stable'
+          - '7-2-stable'
+          - '8-0-stable'
+          - '8-1-stable'
           - 'edge'
         ruby:
-          - '2.4'
-          - '2.5'
-          - '2.6'
           - '2.7'
           - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+          - '3.4'
         exclude:
-          - gemfile: '4-2-stable'
-            ruby: '2.5'
-          - gemfile: '4-2-stable'
-            ruby: '2.6'
-          - gemfile: '4-2-stable'
+          - 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: '4-2-stable'
+          - gemfile: '7-2-stable'
             ruby: '3.0'
-          - gemfile: '5-0-stable'
+          - gemfile: '8-0-stable'
             ruby: '2.7'
-          - gemfile: '5-0-stable'
+          - gemfile: '8-0-stable'
             ruby: '3.0'
-          - gemfile: '5-1-stable'
+          - gemfile: '8-0-stable'
+            ruby: '3.1'
+          - gemfile: '8-1-stable'
             ruby: '2.7'
-          - gemfile: '5-1-stable'
+          - gemfile: '8-1-stable'
             ruby: '3.0'
-          - gemfile: '5-2-stable'
+          - gemfile: '8-1-stable'
+            ruby: '3.1'
+          - gemfile: 'edge'
             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'
+            ruby: '3.0'
           - gemfile: 'edge'
-            ruby: '2.5'
+            ruby: '3.1'
           - gemfile: 'edge'
-            ruby: '2.6'
+            ruby: '3.2'
       fail-fast: false
 
     runs-on: ubuntu-latest
     name: ${{ matrix.ruby }} rails-${{ matrix.gemfile }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - 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
 
@@ -75,4 +83,3 @@ jobs:
       BUNDLE_GEMFILE: gemfiles/Gemfile-${{ matrix.gemfile }}
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
-

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.2.5 (September 21, 2026)
+
+- Fix directory check for directory with shared prefix
+
+ _John Hawthorn_
+
 ## 1.2.4 (May 15, 2021)
 
 - Fix `URI.parser` deprecation warning in Rails 6.1

data/actionpack-page_caching.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "actionpack-page_caching"
-  gem.version       = "1.2.4"
+  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)"

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/lib/action_controller/caching/pages.rb

@@ -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

@@ -200,6 +200,23 @@ class PageCachingTest < ActionController::TestCase
     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
@@ -426,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
 
@@ -482,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
 
@@ -539,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.4
+  version: 1.2.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -54,12 +53,12 @@ files:
 - 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-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
@@ -67,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
@@ -87,11 +85,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-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/gemfiles/Gemfile-4-2-stable

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

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