high_voltage 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56801929181e1df1b48361637a33d0e49431827f
-  data.tar.gz: e5e8b40606fd4863b423cd682ae3bc0426d11af2
+  metadata.gz: f6fe8331cf7311ae941daea7a313a66e350a5565
+  data.tar.gz: d1f5bb5ec3984ce97f167a7e4b56c9936ff1a788
 SHA512:
-  metadata.gz: 7baeff6c124d223bbe28962a65ad6fcfdddc7a505c15dd63c6fb0e52530508809c03acee1bc37bd10f65e36aea1d430ef714d00518c38370941d9fc397eaa3f6
-  data.tar.gz: c9dd536f08b5ce08cf6ae7a479e3e4f99556d117611656c7ce795843046627f87da726bb5a83163a6a4131968a8081fbc637b89015d76f41daad9c4fab79d167
+  metadata.gz: 7b5f88d3c1b88243befa89c0e1c8e1640b9b1556ea070dcbb7eff8bfeab51c88d6907e6746730d9318c4a276f026f45695eefc800e9aba078bc4ee48714860a8
+  data.tar.gz: 949ae450736d58557bc15ecdcd6f33098ae2ada670563b9440e8b65e7883d12154ddc170d3f42d1147133d4452ccabe7d771707eef320779113e32bdccc636a7

data/.travis.yml

@@ -7,9 +7,10 @@ install:
 language:
   - ruby
 rvm:
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.0.0-p648
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 script: 'bundle exec rake spec'
 notifications:
   email: false

data/Appraisals

@@ -3,7 +3,11 @@ rails_versions = ['~> 4.0.0', '~> 4.1.0', '~> 4.2.0']
 rails_versions.each do |rails_version|
   appraise "rails#{rails_version.slice(/\d+\.\d+/)}" do
     gem 'rails', rails_version
-    gem 'actionpack-action_caching'
-    gem 'actionpack-page_caching'
   end
 end
+
+appraise "rails50" do
+  gem "rails", "~> 5.0.0.beta3"
+  gem "rspec-rails", "3.5.0.beta1"
+  gem "rails-controller-testing"
+end

data/Gemfile

@@ -1,5 +1,6 @@
-source "http://rubygems.org"
-
-gem 'appraisal'
+source "https://rubygems.org"
 
 gemspec
+
+gem "appraisal"
+gem "rspec-rails", "~> 3.2"

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    high_voltage (2.4.0)
+    high_voltage (3.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.5.2)
+      actionview (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.2)
+      activesupport (= 4.2.5.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activesupport (4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activesupport (4.2.5.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -34,55 +34,55 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.5.2)
+      actionpack (= 4.2.5.2)
+      activesupport (= 4.2.5.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rspec-core (3.2.1)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rake (10.5.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     slop (3.6.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -94,7 +94,7 @@ DEPENDENCIES
   appraisal
   high_voltage!
   pry
-  rspec-rails (~> 3.2.0)
+  rspec-rails (~> 3.2)
 
 BUNDLED WITH
-   1.10.0
+   1.11.2

data/NEWS.md

@@ -1,3 +1,8 @@
+New for 3.0.0
++ HighVoltage now supports Rails 5.0.0.beta3 and up.
++ Properly handle extensions in root route constraint requests.
++ Removes caching in preparation for Rails 5.
+
 New for 2.4.0
 + Retrieve a list of available static pages via `HighVoltage.page_ids`.
 + Properly handle page ids which are blank when being sanitized.

data/README.md

@@ -15,13 +15,9 @@ Yeah, like "About us", "Directions", marketing pages, etc.
 Include in your Gemfile:
 
 ```ruby
-gem 'high_voltage', '~> 2.3.0'
+gem 'high_voltage', '~> 3.0.0'
 ```
 
-For Rails versions prior to 3.0, use the 0.9.2 tag of high_voltage:
-
-    https://github.com/thoughtbot/high_voltage/tree/v0.9.2
-
 ## Usage
 
 Write your static pages and put them in the RAILS_ROOT/app/views/pages directory.
@@ -32,13 +28,13 @@ Write your static pages and put them in the RAILS_ROOT/app/views/pages directory
 After putting something interesting there, you can link to it from anywhere in your app with:
 
 ```ruby
-link_to 'About', page_path('about')
+<%= link_to 'About', page_path('about') %>
 ```
 
 You can nest pages in a directory structure, if that makes sense from a URL perspective for you:
 
 ```ruby
-link_to 'Q4 Reports', page_path('about/corporate/policies/HR/en_US/biz/sales/Quarter-Four')
+<%= link_to 'Q4 Reports', page_path('about/corporate/policies/HR/en_US/biz/sales/Quarter-Four') %>
 ```
 
 Bam.
@@ -168,7 +164,7 @@ end
 
 #### Caching
 
-Caching has been deprecated and will be removed in the next release.
+Built in caching support has been removed in HighVoltage. See [PR 221](https://github.com/thoughtbot/high_voltage/pull/221).
 
 Page caching and action caching can be done via Rails. Visit the [Caching with
 Rails: An overview](http://guides.rubyonrails.org/caching_with_rails.html) guide
@@ -335,7 +331,7 @@ and [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers):
 # spec/controllers/pages_controller_spec.rb
 describe PagesController, '#show' do
   %w(earn_money screencast about contact).each do |page|
-    context 'on GET to /pages/#{page}' do
+    context "on GET to /pages/#{page}" do
       before do
         get :show, id: page
       end
@@ -362,7 +358,7 @@ Thank you, [contributors]!
 
 ## License
 
-High Voltage is copyright © 2009-2015 thoughtbot. It is free software, and may
+High Voltage is copyright © 2009-2016 thoughtbot. It is free software, and may
 be redistributed under the terms specified in the [`LICENSE`] file.
 
 [`LICENSE`]: /MIT-LICENSE

data/app/controllers/concerns/high_voltage/static_page.rb

@@ -13,23 +13,18 @@ module HighVoltage::StaticPage
     end
 
     rescue_from HighVoltage::InvalidPageIdError, with: :invalid_page
-
-    if respond_to?(:caches_action)
-      caches_action :show, layout: HighVoltage.action_caching_layout,
-        if: -> { HighVoltage.action_caching }
-    end
-
-    if respond_to?(:caches_page)
-      caches_page :show, if: -> { HighVoltage.page_caching }
-    end
-
-    hide_action :current_page, :page_finder, :page_finder_factory
   end
 
   def show
     render template: current_page
   end
 
+  def invalid_page
+    raise ActionController::RoutingError, "No such page: #{params[:id]}"
+  end
+
+  private
+
   def current_page
     page_finder.find
   end
@@ -41,8 +36,4 @@ module HighVoltage::StaticPage
   def page_finder_factory
     HighVoltage::PageFinder
   end
-
-  def invalid_page
-    raise ActionController::RoutingError, "No such page: #{params[:id]}"
-  end
 end

data/gemfiles/rails4.0.gemfile

@@ -1,10 +1,9 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "appraisal"
+gem "rspec-rails", "~> 3.2"
 gem "rails", "~> 4.0.0"
-gem "actionpack-action_caching"
-gem "actionpack-page_caching"
 
 gemspec :path => "../"

data/gemfiles/rails4.1.gemfile

@@ -1,10 +1,9 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "appraisal"
+gem "rspec-rails", "~> 3.2"
 gem "rails", "~> 4.1.0"
-gem "actionpack-action_caching"
-gem "actionpack-page_caching"
 
 gemspec :path => "../"

data/gemfiles/rails4.2.gemfile

@@ -1,10 +1,9 @@
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem "appraisal"
+gem "rspec-rails", "~> 3.2"
 gem "rails", "~> 4.2.0"
-gem "actionpack-action_caching"
-gem "actionpack-page_caching"
 
 gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rspec-rails", "3.5.0.beta1"
+gem "rails", "~> 5.0.0.beta3"
+gem "rails-controller-testing"
+
+gemspec :path => "../"

data/high_voltage.gemspec

@@ -18,5 +18,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("activesupport", ">= 3.1.0")
   s.add_development_dependency("pry")
-  s.add_development_dependency("rspec-rails", "~> 3.2.0")
 end

data/lib/high_voltage/configuration.rb

@@ -1,10 +1,5 @@
 module HighVoltage
   module Configuration
-    CACHING_DEPRECATION_WARNING = <<-WARNING.strip_heredoc.squish
-    Caching support has been deprecated and will be removed
-    in the next release.
-    WARNING
-
     attr_accessor(
       :content_path,
       :home_page,
@@ -14,8 +9,6 @@ module HighVoltage
       :routes,
     )
 
-    attr_reader :action_caching, :action_caching_layout, :page_caching
-
     def configure
       yield self
     end
@@ -24,27 +17,6 @@ module HighVoltage
       base.set_default_configuration
     end
 
-    def action_caching=(value)
-      unless value == false
-        ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
-      end
-      @action_caching = value
-    end
-
-    def action_caching_layout=(value)
-      unless value == false
-        ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
-      end
-      @action_caching_layout = value
-    end
-
-    def page_caching=(value)
-      unless value == false
-        ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
-      end
-      @page_caching = value
-    end
-
     def page_ids
       HighVoltage::PageCollector.new(HighVoltage.full_path).page_ids
     end
@@ -54,10 +26,6 @@ module HighVoltage
     end
 
     def set_default_configuration
-      @action_caching = false
-      @action_caching_layout = true
-      @page_caching = false
-
       self.content_path = 'pages/'
       self.home_page = nil
       self.layout = 'application'

data/lib/high_voltage/constraints/root_route.rb

@@ -2,20 +2,27 @@ module HighVoltage
   module Constraints
     # Routing constraint to validate request.path has a corresponding view
     class RootRoute
-      def self.matches?(request)
-        pattern = file_pattern(request.path)
+      class << self
+        def matches?(request)
+          page_id = clean_page_path(request.path)
+          pattern = file_pattern(page_id)
 
-        Dir.glob(pattern).any?
-      end
+          Dir.glob(pattern).any?
+        end
 
-      private
+        private
 
-      def self.file_pattern(page_id)
-        "#{content_path}#{page_id}.html*"
-      end
+        def clean_page_path(request_path)
+          request_path.sub(/\.html$/, "")
+        end
+
+        def file_pattern(page_id)
+          "#{content_path}#{page_id}.html*"
+        end
 
-      def self.content_path
-        Rails.root.join('app', 'views', HighVoltage.content_path).to_s
+        def content_path
+          Rails.root.join("app", "views", HighVoltage.content_path).to_s
+        end
       end
     end
   end

data/lib/high_voltage/version.rb

@@ -1,3 +1,3 @@
 module HighVoltage
-  VERSION = "2.4.0".freeze
+  VERSION = "3.0.0".freeze
 end

data/spec/constraints/root_route_spec.rb

@@ -1,18 +1,33 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe HighVoltage::Constraints::RootRoute, '.matches?' do
-  it 'returns true when the view file exists' do
+describe HighVoltage::Constraints::RootRoute, ".matches?" do
+  it "returns true when the view file exists" do
     request = double(path: 'index')
-    allow(Dir).to receive(:glob).and_return(["about.html.erb"])
+    file_path = Rails.root.join("app", "views", "pages", "index.html*").to_s
+
+    allow(Dir).to receive(:glob).with(file_path).and_return(["about.html.erb"])
 
     result = HighVoltage::Constraints::RootRoute.matches?(request)
 
     expect(result).to be true
   end
 
-  it 'returns false when the view files does not exist' do
+  it "returns true when the view file exists and url ends with .html" do
+    request = double(path: "index.html")
+    file_path = Rails.root.join("app", "views", "pages", "index.html*").to_s
+
+    allow(Dir).to receive(:glob).with(file_path).and_return(["about.html.erb"])
+
+    result = HighVoltage::Constraints::RootRoute.matches?(request)
+
+    expect(result).to be true
+  end
+
+  it "returns false when the view files does not exist" do
     request = double(path: 'index')
-    allow(File).to receive(:glob).and_return([])
+    file_path = Rails.root.join("app", "views", "pages", "index", ".html*").to_s
+
+    allow(File).to receive(:glob).with(file_path).and_return([])
 
     result = HighVoltage::Constraints::RootRoute.matches?(request)
 

data/spec/high_voltage/configuration_spec.rb

@@ -7,11 +7,8 @@ describe HighVoltage::Configuration do
     before(:each) do
       HighVoltage.configure do |config|
         ActiveSupport::Deprecation.silence do
-          config.action_caching = config_value
-          config.action_caching_layout = config_value
           config.content_path = config_value
           config.layout = config_value
-          config.page_caching = config_value
           config.parent_engine = config_value
           config.route_drawer = config_value
           config.routes = config_value
@@ -25,109 +22,10 @@ describe HighVoltage::Configuration do
       end
     end
 
-    it { expect(HighVoltage.action_caching).to eq config_value }
-    it { expect(HighVoltage.action_caching_layout).to eq config_value }
     it { expect(HighVoltage.content_path).to eq config_value }
     it { expect(HighVoltage.layout).to eq config_value }
-    it { expect(HighVoltage.page_caching).to eq config_value }
     it { expect(HighVoltage.parent_engine).to eq config_value }
     it { expect(HighVoltage.route_drawer).to eq config_value }
     it { expect(HighVoltage.routes).to eq config_value }
   end
-
-  describe "#action_caching" do
-    context "action caching is enabled" do
-      it 'displays a deprecation warning' do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.action_caching = true
-        end
-
-        expect(ActiveSupport::Deprecation).to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-
-    context "action caching is disabled" do
-      it 'does not display a deprecation warning' do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.action_caching = false
-        end
-
-        expect(ActiveSupport::Deprecation).not_to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-  end
-
-  describe "#action_caching_layout" do
-    context "action caching layout is enabled" do
-      it 'displays a deprecation warning' do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.action_caching_layout = true
-        end
-
-        expect(ActiveSupport::Deprecation).to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-
-    context "action caching layout is disabled" do
-      it "does not display a deprecation warning" do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.action_caching_layout = false
-        end
-
-        expect(ActiveSupport::Deprecation).not_to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-  end
-
-  describe "#page_caching" do
-    context "page caching is enabled" do
-      it "displays a deprecation warning" do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.page_caching = true
-        end
-
-        expect(ActiveSupport::Deprecation).to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-
-    context "page caching is disbled" do
-      it "does not display a deprecation warning" do
-        allow(ActiveSupport::Deprecation).to receive(:warn)
-
-        HighVoltage.configure do |config|
-          config.page_caching = false
-        end
-
-        expect(ActiveSupport::Deprecation).not_to have_received(:warn)
-          .with(HighVoltage::Configuration::CACHING_DEPRECATION_WARNING)
-      end
-    end
-  end
-
-  describe '#set_default_configuration' do
-    it 'defaults caching without a deprecation warning' do
-      allow(ActiveSupport::Deprecation).to receive(:warn)
-
-      Class.new do
-        extend HighVoltage::Configuration
-      end
-
-      expect(ActiveSupport::Deprecation).not_to have_received(:warn)
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ require "pry"
 require "active_model/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
-require "actionpack/action_caching/railtie"
-require "actionpack/page_caching/railtie"
 require "rspec/rails"
 
 require "high_voltage"
@@ -30,4 +28,13 @@ RSpec.configure do |config|
   config.include RSpec::Matchers
   config.mock_with :rspec
   config.order = "random"
+
+  if Rails::VERSION::MAJOR >= 5
+    require "rails-controller-testing"
+
+    config.include(
+      Rails::Controller::Testing::TemplateAssertions,
+      type: :controller,
+    )
+  end
 end

data/spec/support/http_method_shim.rb

@@ -0,0 +1,15 @@
+# Rails 5 deprecates calling HTTP action methods with positional arguments
+# in favor of keyword arguments. However, the keyword argument form is only
+# supported in Rails 5+. Since we support back to 4, we need some sort of shim
+# to avoid super noisy deprecations when running tests.
+module HTTPMethodShim
+  def get(path, params = nil, headers = nil)
+    super(path, params: params, headers: headers)
+  end
+end
+
+if Rails::VERSION::MAJOR >= 5
+  RSpec.configure do |config|
+    config.include HTTPMethodShim, type: :controller
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,20 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 description: Fire in the disco. Fire in the ... taco bell.
 email:
 - support@thoughtbot.com
@@ -83,6 +69,7 @@ files:
 - gemfiles/rails4.0.gemfile
 - gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
+- gemfiles/rails50.gemfile
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/configuration.rb
@@ -95,9 +82,7 @@ files:
 - lib/high_voltage/route_drawers/root.rb
 - lib/high_voltage/version.rb
 - spec/constraints/root_route_spec.rb
-- spec/controllers/action_caching_controller_spec.rb
 - spec/controllers/alternative_finder_controller_spec.rb
-- spec/controllers/page_caching_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
 - spec/fake_app.rb
@@ -131,6 +116,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/app/controllers/alternative_finder_controller.rb
 - spec/support/app/controllers/subclassed_pages_controller.rb
+- spec/support/http_method_shim.rb
 homepage: http://github.com/thoughtbot/high_voltage
 licenses:
 - MIT
@@ -151,15 +137,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller
 test_files:
 - spec/constraints/root_route_spec.rb
-- spec/controllers/action_caching_controller_spec.rb
 - spec/controllers/alternative_finder_controller_spec.rb
-- spec/controllers/page_caching_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
 - spec/fake_app.rb
@@ -193,3 +177,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/app/controllers/alternative_finder_controller.rb
 - spec/support/app/controllers/subclassed_pages_controller.rb
+- spec/support/http_method_shim.rb

data/spec/controllers/action_caching_controller_spec.rb

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-describe HighVoltage::PagesController, '#action_caching' do
-  let(:page_name) { :exists }
-
-  context 'action_caching set to true' do
-    after do
-      set_action_caching_without_deprecation(false)
-    end
-
-    it 'caches the action' do
-      allow(controller).to receive(:_save_fragment)
-      set_action_caching_without_deprecation(true)
-
-      get :show, id: page_name
-
-      expect(controller).to have_received(:_save_fragment)
-        .with("test.host#{page_path(page_name)}", {})
-    end
-  end
-
-  context 'action_caching set to false' do
-    it 'does not cache the action' do
-      allow(controller).to receive(:_save_fragment)
-      set_action_caching_without_deprecation(false)
-
-      get :show, id: page_name
-
-      expect(controller).not_to have_received(:_save_fragment)
-    end
-  end
-
-  def set_action_caching_without_deprecation(value)
-    ActiveSupport::Deprecation.silence do
-      HighVoltage.action_caching = value
-    end
-  end
-end

data/spec/controllers/page_caching_controller_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe HighVoltage::PagesController, '#cache_page' do
-  let(:page_name) { :exists }
-
-  context 'page_caching set to true' do
-    after do
-      set_page_caching_without_deprecation(false)
-    end
-
-    it 'caches the page' do
-      allow(controller).to receive(:cache_page)
-      set_page_caching_without_deprecation(true)
-
-      get :show, id: page_name
-
-      expect(controller).to have_received(:cache_page)
-    end
-  end
-
-  context 'page_caching set to false' do
-    it 'does not cache the page' do
-      allow(controller).to receive(:cache_page)
-      set_page_caching_without_deprecation(false)
-
-      get :show, id: page_name
-
-      expect(controller).not_to have_received(:cache_page)
-    end
-  end
-
-  def set_page_caching_without_deprecation(value)
-    ActiveSupport::Deprecation.silence do
-      HighVoltage.page_caching = value
-    end
-  end
-end