actionpack-page_caching 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4a8baf2e26a08aa06aabc67d4783382223dbef4c
-  data.tar.gz: '081b862c7762f68baa7ca15a9358689773616bb0'
+SHA256:
+  metadata.gz: 92965e865a7dfa9dcb0c95f6ccbe2e6a67368eab493c5d6187ecf433cdade0d4
+  data.tar.gz: 5ac29afdd687929ae4a4d1d22b7f58f60663e71c9a07df415ca16fc863c38a2d
 SHA512:
-  metadata.gz: 62aca2629984d4538f10ed0cad44265e91238f231cdd071fb36875a35e6607f547ab69aa33cf7e45c87b05677db69f777682cd2324de6c4a3de133e922fe8aa6
-  data.tar.gz: 7b354f5a3fc117733b5f92228bae747730dda7c70293aa60e7ea8e337c449897f5fa3e2a36179f8b8b409ebd5ff40ee360ba9a7ffb147bd46c71e2431089a15f
+  metadata.gz: 8d854ecd63f9ac358593acc46915e2615e8681408dee8c04ee97b34f21d692c9200a6b249cb02f2d4e59a1258c7f030ca73ee700ca7d5c5f6d9156749fe08d79
+  data.tar.gz: b5c41eb6c92adb0ea3db3f1ac8b250b739e5119aa006a74dce7ab54ac9921be6d9437ed49ffec702c5fce8e78edb056f23f81b190b7d1bf36522549f1fbdc93b

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -8,80 +8,117 @@ AllCops:
 Style/AndOr:
   Enabled: true
 
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
+# Align `when` with `case`.
+Layout/CaseIndentation:
   Enabled: true
 
-# Align `when` with `case`.
-Style/CaseIndentation:
+Layout/ClosingHeredocIndentation:
   Enabled: true
 
 # Align comments with method definitions.
-Style/CommentIndentation:
+Layout/CommentIndentation:
+  Enabled: true
+
+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
 
-# No extra empty lines.
-Style/EmptyLines:
+Layout/EmptyLinesAroundAccessModifier:
+  Enabled: true
+  EnforcedStyle: only_before
+
+Layout/EmptyLinesAroundBlockBody:
   Enabled: true
 
 # In a regular class definition, no empty lines around the body.
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
+  Enabled: true
+
+# In a regular method definition, no empty lines around the body.
+Layout/EmptyLinesAroundMethodBody:
   Enabled: true
 
 # In a regular module definition, no empty lines around the body.
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
 Style/HashSyntax:
   Enabled: true
 
+Layout/FirstArgumentIndentation:
+  Enabled: true
+
 # Method definitions after `private` or `protected` isolated calls need one
 # extra level of indentation.
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
 
 # Two spaces, no tabs (for indentation).
-Style/IndentationWidth:
+Layout/IndentationWidth:
+  Enabled: true
+
+Layout/LeadingCommentSpace:
+  Enabled: true
+
+Layout/SpaceAfterColon:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAfterSemicolon:
   Enabled: true
 
-Style/SpaceAfterColon:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Style/SpaceAfterComma:
+Layout/SpaceAroundKeyword:
   Enabled: true
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceBeforeComma:
   Enabled: true
 
-Style/SpaceAroundKeyword:
+Layout/SpaceBeforeComment:
   Enabled: true
 
-Style/SpaceAroundOperators:
+Layout/SpaceBeforeFirstArg:
   Enabled: true
 
-Style/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{}`.
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
 # Use `foo { bar }` not `foo {bar}`.
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   Enabled: true
+  EnforcedStyleForEmptyBraces: space
 
 # Use `{ a: 1 }` not `{a:1}`.
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: true
 
 # Check quotes usage according to lint rule below.
@@ -90,27 +127,66 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 # Detect hard tabs, no hard tabs.
-Style/Tab:
+Layout/Tab:
   Enabled: true
 
-# Blank lines should not have any spaces.
-Style/TrailingBlankLines:
+# Empty lines should not have any spaces.
+Layout/TrailingEmptyLines:
   Enabled: true
 
 # No trailing whitespace.
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   Enabled: true
 
 # Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Lint/EndAlignment:
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/ErbNewArguments:
   Enabled: true
-  AlignWith: variable
 
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Lint/RedundantStringCoercion:
+  Enabled: true
+
+Lint/UriEscapeUnescape:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
+Style/ParenthesesAroundCondition:
+  Enabled: true
+
+Style/RedundantBegin:
+  Enabled: true
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/TrivialAccessors:
+  Enabled: true

data/.travis.yml

@@ -8,47 +8,26 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.9
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile-4-0-stable
-  - 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:
   allow_failures:
     - gemfile: gemfiles/Gemfile-edge
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile
-    - rvm: 2.0.0
-      gemfile: Gemfile
-    - rvm: 2.1.9
-      gemfile: Gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 2.1.9
-      gemfile: gemfiles/Gemfile-5-0-stable
-    - rvm: 1.9.3
+    - rvm: 2.4.6
+      gemfile: gemfiles/Gemfile-6-0-stable
+    - rvm: 2.4.6
       gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.1.9
-      gemfile: gemfiles/Gemfile-edge
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile-4-0-stable
-    - rvm: 2.4.0
-      gemfile: gemfiles/Gemfile-4-1-stable
 
 notifications:
   email: false

data/Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem "rails"
+gem "rubocop", ">= 0.77.0", require: false

data/README.md

@@ -11,7 +11,7 @@ files that the web server can serve directly:
 2. Its response is calculated and stored in a file _F_.
 3. Next time _E_ is requested, the web server sends _F_ directly.
 
-That applies only to GET or HEAD requests whose reponse code is 200, the rest
+That applies only to GET or HEAD requests whose response code is 200, the rest
 are ignored.
 
 Unlike caching proxies or other more sophisticated setups, page caching results
@@ -213,4 +213,3 @@ Code Status
 -----------
 
 * [![Build Status](https://travis-ci.org/rails/actionpack-page_caching.svg?branch=master)](https://travis-ci.org/rails/actionpack-page_caching)
-* [![Dependency Status](https://gemnasium.com/rails/actionpack-page_caching.svg)](https://gemnasium.com/rails/actionpack-page_caching)

data/actionpack-page_caching.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "actionpack-page_caching"
-  gem.version       = "1.1.1"
+  gem.version       = "1.2.0"
   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 = '>= 1.9.3'
+  gem.required_ruby_version = ">= 2.4.6"
   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.license       = "MIT"
 
-  gem.add_dependency "actionpack", ">= 4.0.0", "< 6"
+  gem.add_dependency "actionpack", ">= 5.0.0"
 
   gem.add_development_dependency "mocha"
 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/pages.rb

@@ -136,9 +136,7 @@ module ActionController
             MSG
           end
 
-          def default_extension
-            @default_extension
-          end
+          attr_reader :default_extension
 
           def cache_file(path, extension)
             if path.empty? || path =~ %r{\A/+\z}
@@ -275,7 +273,13 @@ module ActionController
               request.path
             end
 
-          if (type = Mime::LOOKUP[self.content_type]) && (type_symbol = type.symbol).present?
+          type = if self.respond_to?(:media_type)
+            Mime::LOOKUP[self.media_type]
+          else
+            Mime::LOOKUP[self.content_type]
+          end
+
+          if type && (type_symbol = type.symbol).present?
             extension = ".#{type_symbol}"
           end
 

data/test/caching_test.rb

@@ -24,7 +24,6 @@ module PageCachingTestHelpers
   end
 
   private
-
     def assert_page_cached(action, options = {})
       expected = options[:content] || action.to_s
       path = cache_file(action, options)
@@ -330,19 +329,17 @@ class PageCachingTest < ActionController::TestCase
   end
 
   def test_page_caching_directory_set_as_pathname
-    begin
-      ActionController::Base.page_cache_directory = Pathname.new(FILE_STORE_PATH)
-
-      draw do
-        get "/page_caching_test/ok", to: "page_caching_test#ok"
-      end
+    ActionController::Base.page_cache_directory = Pathname.new(FILE_STORE_PATH)
 
-      get :ok
-      assert_response :ok
-      assert_page_cached :ok
-    ensure
-      ActionController::Base.page_cache_directory = FILE_STORE_PATH
+    draw do
+      get "/page_caching_test/ok", to: "page_caching_test#ok"
     end
+
+    get :ok
+    assert_response :ok
+    assert_page_cached :ok
+  ensure
+    ActionController::Base.page_cache_directory = FILE_STORE_PATH
   end
 
   def test_page_caching_directory_set_on_controller_instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionpack-page_caching
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -60,10 +54,10 @@ files:
 - README.md
 - Rakefile
 - actionpack-page_caching.gemspec
-- gemfiles/Gemfile-4-0-stable
-- 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/caching/pages.rb
 - lib/action_controller/page_caching.rb
@@ -84,15 +78,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Static page caching for Action Pack (removed from core in Rails 4.0)

data/gemfiles/Gemfile-4-0-stable

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", github: "rails/rails", branch: "4-0-stable"
-gem "mime-types", "< 3"

data/gemfiles/Gemfile-4-1-stable

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", github: "rails/rails", branch: "4-1-stable"
-gem "mime-types", "< 3"

data/gemfiles/Gemfile-4-2-stable

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", github: "rails/rails", branch: "4-2-stable"
-gem "mime-types", "< 3"
-
-if RUBY_VERSION < "2.1"
-  gem "nokogiri", "< 1.7"
-end