actionpack-action_caching 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1c3e6a065ee870841cd63083ad4fbe729a3f3d39
-  data.tar.gz: 7ec1ff92fc66365d06709ff8158687922aae7dc3
+SHA256:
+  metadata.gz: 13e2fb3bc82b8a207a5712370efc031c31510dc257dbd2c044edf1c26ac01c30
+  data.tar.gz: df99ab7f3623d4b4e2f1729f6cc3db276242f2362803606315b03c93bfe1cc7f
 SHA512:
-  metadata.gz: c48324f7e2c76ddc22e3b9799bef687f2de43d122c319cc62df0fa5539b3a42209f24cb88847e8dd1168bf6a710f951179359de51d8570d63115211efc87a97e
-  data.tar.gz: e9c4f0b4f373207d16cc27f486c5747661f70d4adad18d21287126e3072e3a55b1bdf83296893b5ea85d331907d578f44e7979dc9257978e3d97f87991d96a83
+  metadata.gz: 96ab04f9ff4d0250f94229cb6fb70a4d85e8ed8e4c0068c626a9fb2e7dddb08809ec38b440f18a259cf17ab98d30bef17736d276cfeb5c2a99ce7f69a598c501
+  data.tar.gz: 478aa629c1579202d7a01d9e4f84062812136cbd8009f10bbaf91d72242d27678a76ee5277090959088522db01c81473e9170ba3bd2b37e0abd913dcee331d2d

data/.travis.yml

@@ -5,15 +5,18 @@ cache:
   bundler: true
 
 before_install:
-  - gem install bundler
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.9
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 
 gemfile:
   - Gemfile
@@ -21,6 +24,9 @@ gemfile:
   - gemfiles/Gemfile-4-1-stable
   - 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-edge
 
 matrix:
@@ -31,24 +37,68 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.0.0
       gemfile: Gemfile
-    - rvm: 2.1.9
+    - rvm: 2.1.10
       gemfile: Gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-5-0-stable
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile-5-1-stable
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile-5-2-stable
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile-6-0-stable
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.1.9
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-5-1-stable
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-5-2-stable
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.1.10
       gemfile: gemfiles/Gemfile-5-0-stable
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-5-1-stable
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-5-2-stable
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.2.10
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-6-0-stable
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile-edge
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.1.9
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-edge
+    - rvm: 2.2.10
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.4.0
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile-edge
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-edge
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-4-0-stable
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-4-1-stable
+    - rvm: 2.5.5
       gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.4.0
+    - rvm: 2.5.5
       gemfile: gemfiles/Gemfile-4-1-stable
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-4-0-stable
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-4-1-stable
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-4-2-stable
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-5-0-stable
+    - rvm: 2.6.3
+      gemfile: gemfiles/Gemfile-5-1-stable
 
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-## 1.2.0 (January 23, 2014)
+## 1.2.1 (November 12, 2019)
+
+*   Fix HTML escaping when `:layout` is `false`.
+
+    *Anton Katunin*
+
+*   Add support to Rails 6.
+
+    *Jacob Bednarz*
+
+
+## 1.2.0 (January 23, 2017)
 
 *   Support proc options with zero arguments
 

data/README.md

@@ -8,7 +8,9 @@ Installation
 
 Add this line to your application's Gemfile:
 
-    gem "actionpack-action_caching"
+```ruby
+gem 'actionpack-action_caching'
+```
 
 And then execute:
 
@@ -28,12 +30,14 @@ that filters run before the cache is served, which allows for
 authentication and other restrictions on whether someone is allowed
 to execute such action.
 
-    class ListsController < ApplicationController
-      before_action :authenticate, except: :public
+```ruby
+class ListsController < ApplicationController
+  before_action :authenticate, except: :public
 
-      caches_page   :public
-      caches_action :index, :show
-    end
+  caches_page   :public
+  caches_action :index, :show
+end
+```
 
 In this example, the `public` action doesn't require authentication
 so it's possible to use the faster page caching. On the other hand
@@ -72,36 +76,38 @@ interval (in seconds) to schedule expiration of the cached item.
 
 The following example depicts some of the points made above:
 
-    class ListsController < ApplicationController
-      before_action :authenticate, except: :public
+```ruby
+class ListsController < ApplicationController
+  before_action :authenticate, except: :public
 
-      # simple fragment cache
-      caches_action :current
+  # simple fragment cache
+  caches_action :current
 
-      # expire cache after an hour
-      caches_action :archived, expires_in: 1.hour
+  # expire cache after an hour
+  caches_action :archived, expires_in: 1.hour
 
-      # cache unless it's a JSON request
-      caches_action :index, unless: -> { request.format.json? }
+  # cache unless it's a JSON request
+  caches_action :index, unless: -> { request.format.json? }
 
-      # custom cache path
-      caches_action :show, cache_path: { project: 1 }
+  # custom cache path
+  caches_action :show, cache_path: { project: 1 }
 
-      # custom cache path with a proc
-      caches_action :history, cache_path: -> { request.domain }
+  # custom cache path with a proc
+  caches_action :history, cache_path: -> { request.domain }
 
-      # custom cache path with a symbol
-      caches_action :feed, cache_path: :user_cache_path
+  # custom cache path with a symbol
+  caches_action :feed, cache_path: :user_cache_path
 
-      protected
-        def user_cache_path
-          if params[:user_id]
-            user_list_url(params[:user_id], params[:id])
-          else
-            list_url(params[:id])
-          end
-        end
+  protected
+    def user_cache_path
+      if params[:user_id]
+        user_list_url(params[:user_id], params[:id])
+      else
+        list_url(params[:id])
+      end
     end
+end
+```
 
 If you pass `layout: false`, it will only cache your action
 content. That's useful when your layout has dynamic information.
@@ -126,4 +132,3 @@ Code Status
 -----------
 
 * [![Build Status](https://travis-ci.org/rails/actionpack-action_caching.svg?branch=master)](https://travis-ci.org/rails/actionpack-action_caching)
-* [![Dependency Status](https://gemnasium.com/rails/actionpack-action_caching.svg)](https://gemnasium.com/rails/actionpack-action_caching)

data/actionpack-action_caching.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "actionpack-action_caching"
-  gem.version       = "1.2.0"
+  gem.version       = "1.2.1"
   gem.author        = "David Heinemeier Hansson"
   gem.email         = "david@loudthinking.com"
   gem.description   = "Action caching for Action Pack (removed from core in Rails 4.0)"
@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  gem.add_dependency "actionpack", ">= 4.0.0", "< 6"
+  gem.add_dependency "actionpack", ">= 4.0.0"
 
   gem.add_development_dependency "mocha"
-  gem.add_development_dependency "activerecord", ">= 4.0.0", "< 6"
+  gem.add_development_dependency "activerecord", ">= 4.0.0"
 end

data/gemfiles/Gemfile-5-1-stable

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

data/gemfiles/Gemfile-5-2-stable

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

data/gemfiles/Gemfile-6-0-stable

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

data/lib/action_controller/caching/actions.rb

@@ -177,7 +177,7 @@ module ActionController
           end
         else
           def render_to_string(controller, body)
-            controller.render_to_string(html: body, layout: true)
+            controller.render_to_string(html: body.html_safe, layout: true)
           end
         end
 

data/test/caching_test.rb

@@ -52,7 +52,7 @@ class ActionCachingTestController < CachingController
   layout "talk_from_action"
 
   def index
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
     render plain: @cache_this
   end
 
@@ -66,17 +66,17 @@ class ActionCachingTestController < CachingController
   end
 
   def with_layout
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
     render html: @cache_this, layout: true
   end
 
   def with_format_and_http_param
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
     render plain: @cache_this
   end
 
   def with_symbol_format
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
     render json: { timestamp: @cache_this }
   end
 
@@ -126,7 +126,7 @@ class ActionCachingTestController < CachingController
   end
 
   def invalid
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
 
     respond_to do |format|
       format.json { render json: @cache_this }
@@ -134,7 +134,7 @@ class ActionCachingTestController < CachingController
   end
 
   def accept
-    @cache_this = MockTime.now.to_f.to_s
+    @cache_this = CacheContent.to_s
 
     respond_to do |format|
       format.html { render html: @cache_this }
@@ -174,10 +174,11 @@ class ActionCachingTestController < CachingController
     end
 end
 
-class MockTime < Time
-  # Let Time spicy to assure that Time.now != Time.now
-  def to_f
-    super + rand
+class CacheContent
+  def self.to_s
+    # Let Time spicy to assure that Time.now != Time.now
+    time = Time.now.to_f + rand
+    (time.to_s + "<div />").html_safe
   end
 end
 
@@ -391,7 +392,7 @@ class ActionCacheTest < ActionController::TestCase
       get "/action_caching_test", to: "action_caching_test#index"
     end
 
-    MockTime.expects(:now).returns(12345).once
+    CacheContent.expects(:to_s).returns('12345.0').once
     @controller.expects(:read_fragment).with("hostname.com/action_caching_test", expires_in: 1.hour).once
     @controller.expects(:write_fragment).with("hostname.com/action_caching_test", "12345.0", expires_in: 1.hour).once
     get :index
@@ -582,9 +583,7 @@ class ActionCacheTest < ActionController::TestCase
     assert fragment_exist?("hostname.com/action_caching_test/index.xml")
 
     get :index, format: "xml"
-    assert_response :success
-    assert_equal cached_time, @response.body
-    assert_equal "application/xml", @response.content_type
+    assert_cached(cached_time, "application/xml")
 
     get :expire_xml
     assert_response :success
@@ -603,7 +602,12 @@ class ActionCacheTest < ActionController::TestCase
     get :index, params: { id: "content-type" }, format: "xml"
     get :index, params: { id: "content-type" }, format: "xml"
     assert_response :success
-    assert_equal "application/xml", @response.content_type
+
+    if @response.respond_to?(:media_type)
+      assert_equal "application/xml", @response.media_type
+    else
+      assert_equal "application/xml", @response.content_type
+    end
   end
 
   def test_correct_content_type_is_returned_for_cache_hit_on_action_with_string_key
@@ -615,7 +619,12 @@ class ActionCacheTest < ActionController::TestCase
     get :show, format: "xml"
     get :show, format: "xml"
     assert_response :success
-    assert_equal "application/xml", @response.content_type
+
+    if @response.respond_to?(:media_type)
+      assert_equal "application/xml", @response.media_type
+    else
+      assert_equal "application/xml", @response.content_type
+    end
   end
 
   def test_correct_content_type_is_returned_for_cache_hit_on_action_with_string_key_from_proc
@@ -627,7 +636,12 @@ class ActionCacheTest < ActionController::TestCase
     get :edit, params: { id: 1 }, format: "xml"
     get :edit, params: { id: 1 }, format: "xml"
     assert_response :success
-    assert_equal "application/xml", @response.content_type
+
+    if @response.respond_to?(:media_type)
+      assert_equal "application/xml", @response.media_type
+    else
+      assert_equal "application/xml", @response.content_type
+    end
   end
 
   def test_empty_path_is_normalized
@@ -850,16 +864,26 @@ class ActionCacheTest < ActionController::TestCase
       get(*args)
     end
 
-    def assert_cached(cache_time, content_type = "text/html")
+    def assert_cached(cache_time, media_type = "text/html")
       assert_response :success
       assert_equal cache_time, @response.body
-      assert_equal content_type, @response.content_type
+
+      if @response.respond_to?(:media_type)
+        assert_equal media_type, @response.media_type
+      else
+        assert_equal media_type, @response.content_type
+      end
     end
 
-    def assert_not_cached(cache_time, content_type = "text/html")
+    def assert_not_cached(cache_time, media_type = "text/html")
       assert_response :success
       assert_not_equal cache_time, @response.body
-      assert_equal content_type, @response.content_type
+
+      if @response.respond_to?(:media_type)
+        assert_equal media_type, @response.media_type
+      else
+        assert_equal media_type, @response.content_type
+      end
     end
 
     def content_to_cache

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-action_caching
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 description: Action caching for Action Pack (removed from core in Rails 4.0)
 email: david@loudthinking.com
 executables: []
@@ -84,6 +72,9 @@ files:
 - gemfiles/Gemfile-4-1-stable
 - 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-edge
 - lib/action_controller/action_caching.rb
 - lib/action_controller/caching/actions.rb
@@ -111,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Action caching for Action Pack (removed from core in Rails 4.0)