high_voltage 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6132908ee3ceb8d0bd92c7904926e07aa25d33fa
-  data.tar.gz: 7380d36e82d395f54ba6a360ec6bf22d3a6d1f61
+  metadata.gz: 7f93b914b6966f7141851a562ce82ffe1e218e01
+  data.tar.gz: d6456e304488fec82214e584d9dbd8f261151d69
 SHA512:
-  metadata.gz: 46412825479d480b85bb248ac95c08f8428b8b8e95f0c1365ff5430377d197cfcf9faf1a3ba83f94fccb34ee4bf5c9c19ee43d3d2b49a88ec53549096a148c9d
-  data.tar.gz: 012bbf16df86ae556196514c59c21b963d9300a82245663ec0ae2eee0c007e66ceac20e21dba0072d9abd3cfac81af36ee82dd109864883cca6af97f80b2a38a
+  metadata.gz: eabead4dde04710b58c97047ca3d0b18af4694696b0e800af9ad0618d08d37c358071999f2fb4a56455857c501d1204a1df73c91c85f58e1fe4d9c71a915d93d
+  data.tar.gz: 8a0b9a4dabe052d01a1b2f4edc91cc7bd15a36eff75ab49d7db3e4c18fe9509203edc214fc2a5d2767022cdfac32c384b94af8023583a5e39944fd94830be8ba

data/.travis.yml

@@ -1,8 +1,8 @@
 language:
   - ruby
 install:
-  - 'bundle install'
+  - 'travis_retry bundle install'
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.2

data/Appraisals

@@ -1,5 +1,5 @@
 if RUBY_VERSION >= '2.0'
-  rails_versions = ['~> 3.2.13', '~> 4.0.0']
+  rails_versions = ['~> 3.2.13', '~> 4.0.0', '~> 4.1.0']
 else
   rails_versions = ['~> 3.1.12', '~> 3.2.13']
 end
@@ -8,7 +8,7 @@ rails_versions.each do |rails_version|
   appraise "rails#{rails_version.slice(/\d+\.\d+/)}" do
     gem 'rails', rails_version
 
-    if rails_version == '~> 4.0.0'
+    if ['~> 4.0.0', '~> 4.1.0'].include? rails_version
       gem 'actionpack-action_caching'
       gem 'actionpack-page_caching'
     end

data/Gemfile.lock

@@ -1,62 +1,71 @@
 PATH
   remote: .
   specs:
-    high_voltage (2.1.0)
+    high_voltage (2.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    appraisal (0.5.2)
+    actionpack (4.1.1)
+      actionview (= 4.1.1)
+      activesupport (= 4.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.0)
       bundler
       rake
-    capybara (2.0.3)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.9)
-    diff-lcs (1.1.3)
-    ffi (1.9.0)
-    method_source (0.8.1)
-    mime-types (1.23)
-    mini_portile (0.5.1)
-    multi_json (1.7.7)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+      thor (>= 0.14.0)
+    builder (3.2.2)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    i18n (0.6.9)
+    json (1.8.1)
+    method_source (0.8.2)
+    minitest (5.3.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rspec-rails (2.1.0)
-      rspec (~> 2.1.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.33.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    slop (3.4.5)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
+    railties (4.1.1)
+      actionpack (= 4.1.1)
+      activesupport (= 4.1.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.1)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rspec-rails (2.14.2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    slop (3.5.0)
+    thor (0.19.1)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -64,7 +73,6 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 3.1.0)
   appraisal
-  capybara (= 2.0.3)
   high_voltage!
   pry
   rspec-rails

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2013 thoughtbot, inc.
+Copyright 2010-2014 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/NEWS.md

@@ -1,3 +1,11 @@
+New for 2.2.0:
++ Deprecate caching because page and action caching was removed in Rails 4
++ Refactor test suite to use rspec `expect` syntax consistently.
++ Added Rails 4.1 to test suite.
++ Remove Ruby 1.9.2 from test suite.
++ Remove Capybara from test suite.
++ Support dependency injection for Rails engine to define routes on
+
 New for 2.1.0:
 + Extract configuration options into a module
 + Add ability to configure whether layout is cached with action_caching

data/README.md

@@ -15,7 +15,7 @@ Yeah, like "About us", "Directions", marketing pages, etc.
 Include in your Gemfile:
 
 ```ruby
-gem 'high_voltage', '~> 2.1.0'
+gem 'high_voltage', '~> 2.2.0'
 ```
 
 For Rails versions prior to 3.0, use the 0.9.2 tag of high_voltage:
@@ -113,6 +113,18 @@ HighVoltage.configure do |config|
 end
 ```
 
+#### Specifying Rails engine for routes
+
+If you are using multiple Rails engines within your application, you can
+specify which engine to define the default HighVoltage routes on.
+
+```ruby
+# config/initializers/high_voltage.rb
+HighVoltage.configure do |config|
+  config.parent_engine = MyEngine
+end
+```
+
 #### Page titles and meta-data
 
 We suggest using `content_for` and `yield` for setting custom page titles and
@@ -145,36 +157,12 @@ end
 
 #### Caching
 
-High Voltage supports both [page](http://guides.rubyonrails.org/caching_with_rails.html#page-caching) and [action caching](http://guides.rubyonrails.org/caching_with_rails.html#action-caching).
+Caching has been deprecated and will be removed in the next release.
 
-To enable action-caching you can add the following to your initializer:
-
-```ruby
-# config/initializers/high_voltage.rb
-HighVolgate.configure do |config|
-  config.action_caching = true
-  config.action_caching_layout = false # optionally do not cache layout. default is true.
-end
-```
-
-To enable page-caching:
-
-```ruby
-# config/initializers/high_voltage.rb
-HighVolgate.configure do |config|
-  config.page_caching = true
-end
-```
-
-High Voltage will use your default cache store to store action caches.
-
-Using caching with Ruby on Rails 4 or higher requires gems:
-
-```ruby
-# Gemfile
-gem 'actionpack-action_caching'
-gem 'actionpack-page_caching'
-```
+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
+for more details. You can utilize the methods described there by overriding the
+HighVoltage controller as described [below](#override).
 
 ## Override
 
@@ -230,6 +218,15 @@ class PagesController < ApplicationController
 end
 ```
 
+To set up a different layout for all High Voltage static pages, use an initializer:
+
+```ruby
+# config/initializers/high_voltage.rb
+HighVoltage.configure do |config|
+  config.layout = 'your_layout'
+end
+```
+
 ## Custom finding
 
 You can further control the algorithm used to find pages by overriding
@@ -309,5 +306,5 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
 ## License
 
-High Voltage is Copyright © 2009-2013 thoughtbot. It is free software, and may
+High Voltage is Copyright © 2009-2014 thoughtbot. It is free software, and may
 be redistributed under the terms specified in the MIT-LICENSE file.

data/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+HighVoltage.parent_engine.routes.draw do
   if HighVoltage.home_page
     get "/#{HighVoltage.home_page}", to: redirect('/')
     root to: 'high_voltage/pages#show', id: HighVoltage.home_page

data/high_voltage.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("activesupport", ">= 3.1.0")
   s.add_development_dependency("appraisal")
-  s.add_development_dependency("capybara", "= 2.0.3")
   s.add_development_dependency("pry")
   s.add_development_dependency("rspec-rails")
 end

data/lib/high_voltage.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/attribute_accessors'
 
 require 'high_voltage/configuration'

data/lib/high_voltage/configuration.rb

@@ -1,16 +1,21 @@
 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(
-      :action_caching,
-      :action_caching_layout,
       :content_path,
       :home_page,
       :layout,
-      :page_caching,
+      :parent_engine,
       :route_drawer,
       :routes,
     )
 
+    attr_reader :action_caching, :action_caching_layout, :page_caching
+
     def configure
       yield self
     end
@@ -19,13 +24,29 @@ module HighVoltage
       base.set_default_configuration
     end
 
+    def action_caching=(value)
+      ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
+      @action_caching = value
+    end
+
+    def action_caching_layout=(value)
+      ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
+      @action_caching_layout = value
+    end
+
+    def page_caching=(value)
+      ActiveSupport::Deprecation.warn(CACHING_DEPRECATION_WARNING)
+      @page_caching = value
+    end
+
     def set_default_configuration
-      self.action_caching = false
-      self.action_caching_layout = true
+      @action_caching = false
+      @action_caching_layout = true
+      @page_caching = false
+
       self.content_path = 'pages/'
       self.home_page = nil
       self.layout = 'application'
-      self.page_caching = false
       self.route_drawer = HighVoltage::RouteDrawers::Default
       self.routes = true
     end

data/lib/high_voltage/engine.rb

@@ -1,13 +1,15 @@
 module HighVoltage
   class Engine < Rails::Engine
+    initializer 'Set up default parent engine' do |app|
+      HighVoltage.parent_engine ||= Rails.application
+    end
+
     initializer 'Require concerns path' do |app|
       concerns_path = 'app/controllers/concerns'
 
       unless app.paths.keys.include?(concerns_path)
         app.paths.add(concerns_path)
       end
-
-      require 'concerns/high_voltage/static_page'
     end
   end
 end

data/lib/high_voltage/version.rb

@@ -1,3 +1,3 @@
 module HighVoltage
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/spec/constraints/root_route_spec.rb

@@ -1,25 +1,21 @@
 require 'spec_helper'
 
 describe HighVoltage::Constraints::RootRoute, '.matches?' do
-  context 'view file exists' do
-    it 'should return true' do
-      request = double(path: 'index')
-      Dir.stub(:glob).and_return(['about.html.erb'])
+  it 'returns true when the view file exists' do
+    request = double(path: 'index')
+    Dir.stub(:glob).and_return(['about.html.erb'])
 
-      result = HighVoltage::Constraints::RootRoute.matches?(request)
+    result = HighVoltage::Constraints::RootRoute.matches?(request)
 
-      expect(result).to be_true
-    end
+    expect(result).to be_true
   end
 
-  context 'view file does not exist' do
-    it 'should return false' do
-      request = double(path: 'index')
-      File.stub(:glob).and_return([])
+  it 'returns false when the view files does not exist' do
+    request = double(path: 'index')
+    File.stub(:glob).and_return([])
 
-      result = HighVoltage::Constraints::RootRoute.matches?(request)
+    result = HighVoltage::Constraints::RootRoute.matches?(request)
 
-      expect(result).to be_false
-    end
+    expect(result).to be_false
   end
 end

data/spec/controllers/action_caching_controller_spec.rb

@@ -4,24 +4,35 @@ describe HighVoltage::PagesController, '#action_caching' do
   let(:page_name) { :exists }
 
   context 'action_caching set to true' do
-    it 'caches the action', enable_caching: true do
-      HighVoltage.action_caching = true
-      concern_reload
+    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 { get :show, id: page_name }.to change { action_cache_exists? }
+      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', enable_caching: true do
-      HighVoltage.action_caching = false
-      concern_reload
+    it 'does not cache the action' do
+      allow(controller).to receive(:_save_fragment)
+      set_action_caching_without_deprecation(false)
 
-      expect { get :show, id: page_name }.to_not change { action_cache_exists? }
+      get :show, id: page_name
+
+      expect(controller).not_to have_received(:_save_fragment)
     end
   end
 
-  def action_cache_exists?
-    ActionController::Base.cache_store.exist?("views/test.host#{page_path(page_name)}")
+  def set_action_caching_without_deprecation(value)
+    ActiveSupport::Deprecation.silence do
+      HighVoltage.action_caching = value
+    end
   end
 end

data/spec/controllers/alternative_finder_controller_spec.rb

@@ -6,7 +6,7 @@ describe AlternativeFinderController do
   it 'renders the file from the alternative directory' do
     get :show, :id => 'ebg13'
 
-    response.should be_success
-    response.should render_template('rot13')
+    expect(response).to be_success
+    expect(response).to render_template('rot13')
   end
 end

data/spec/controllers/page_caching_controller_spec.rb

@@ -4,25 +4,34 @@ describe HighVoltage::PagesController, '#cache_page' do
   let(:page_name) { :exists }
 
   context 'page_caching set to true' do
-    it 'caches the page', enable_caching: true do
-      HighVoltage.page_caching = true
-      concern_reload
+    after do
+      set_page_caching_without_deprecation(false)
+    end
 
-      controller.should_receive(:cache_page).at_least(:once)
+    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', enable_caching: true do
-      HighVoltage.page_caching = false
-      concern_reload
-
-      controller.should_receive(:cache_page).never
+    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
-end
 
+  def set_page_caching_without_deprecation(value)
+    ActiveSupport::Deprecation.silence do
+      HighVoltage.page_caching = value
+    end
+  end
+end

data/spec/controllers/pages_controller_spec.rb

@@ -7,44 +7,38 @@ describe HighVoltage::PagesController do
     describe 'on GET to /pages/exists' do
       before { get :show, :id => 'exists' }
 
-      it 'should respond with success and render template' do
-        response.should be_success
-        response.should render_template('exists')
+      it 'responds with success and render template' do
+        expect(response).to be_success
+        expect(response).to render_template('exists')
       end
 
-      it 'should use the default layout used by ApplicationController' do
-        response.should render_template('layouts/application')
+      it 'uses the default layout used by ApplicationController' do
+        expect(response).to render_template('layouts/application')
       end
     end
 
     describe 'on GET to /pages/dir/nested' do
       before { get :show, :id => 'dir/nested' }
 
-      it 'should respond with success and render template' do
-        response.should be_success
-        response.should render_template('pages/dir/nested')
+      it 'responds with success and render template' do
+        expect(response).to be_success
+        expect(response).to render_template('pages/dir/nested')
       end
     end
 
-    it 'should raise a routing error for an invalid page' do
-      lambda {
-        get :show,
-        :id => 'invalid'
-      }.should raise_error(ActionController::RoutingError)
+    it 'raises a routing error for an invalid page' do
+      expect { get :show, id: 'invalid' }
+        .to raise_error(ActionController::RoutingError)
     end
 
-    it 'should raise a routing error for a page in another directory' do
-      lambda {
-        get :show,
-        :id => '../other/wrong'
-      }.should raise_error(ActionController::RoutingError)
+    it 'raises a routing error for a page in another directory' do
+      expect { get :show, id: '../other/wrong' }
+        .to raise_error(ActionController::RoutingError)
     end
 
-    it 'should raise missing template error for valid page with invalid partial' do
-      lambda {
-        get :show,
-        :id => 'exists_but_references_nonexistent_partial'
-      }.should raise_error(ActionView::MissingTemplate)
+    it 'raises a missing template error for valid page with invalid partial' do
+      expect { get :show, id: 'exists_but_references_nonexistent_partial' }
+        .to raise_error(ActionView::MissingTemplate)
     end
   end
 
@@ -56,9 +50,9 @@ describe HighVoltage::PagesController do
     describe 'on GET to /pages/exists' do
       before { get :show, :id => 'exists' }
 
-      it 'should use the custom configured layout' do
-        response.should_not render_template('layouts/application')
-        response.should render_template('layouts/alternate')
+      it 'uses the custom configured layout' do
+        expect(response).not_to render_template('layouts/application')
+        expect(response).to render_template('layouts/alternate')
       end
     end
   end
@@ -72,47 +66,43 @@ describe HighVoltage::PagesController do
     describe 'on GET to /other_pages/also_exists' do
       before { get :show, :id => 'also_exists' }
 
-      it 'should respond with success and render template' do
-        response.should be_success
-        response.should render_template('other_pages/also_exists')
+      it 'responds with success and render template' do
+        expect(response).to be_success
+        expect(response).to render_template('other_pages/also_exists')
       end
     end
 
     describe 'on GET to /other_pages/also_dir/nested' do
       before { get :show, :id => 'also_dir/also_nested' }
 
-      it 'should respond with success and render template' do
-        response.should be_success
-        response.should render_template('other_pages/also_dir/also_nested')
+      it 'responds with success and render template' do
+        expect(response).to be_success
+        expect(response).to render_template('other_pages/also_dir/also_nested')
       end
     end
 
-    it 'should raise a routing error for an invalid page' do
-      lambda {
-        get :show,
-        :id => 'also_invalid'
-      }.should raise_error(ActionController::RoutingError)
+    it 'raises a routing error for an invalid page' do
+      expect { get :show, id: 'also_invalid' }
+        .to raise_error(ActionController::RoutingError)
     end
 
-    it 'should raise a routing error for a page in another directory' do
-      lambda {
-        get :show,
-        :id => '../other/wrong'
-      }.should raise_error(ActionController::RoutingError)
-    end
+    context 'page in another directory' do
+      it 'raises a routing error' do
+        expect { get :show, id: '../other_wrong' }
+          .to raise_error(ActionController::RoutingError)
+      end
 
-    it 'should raise a routing error for a page in another directory when using a Unicode exploit' do
-      lambda {
-        get :show,
-        :id => '/\\../other/wrong'
-      }.should raise_error(ActionController::RoutingError)
+      it 'raises a routing error when using a Unicode exploit' do
+        expect { get :show, id: '/\\../other/wrong' }
+          .to raise_error(ActionController::RoutingError)
+      end
     end
 
-    it 'should raise missing template error for valid page with invalid partial' do
-      lambda {
-        get :show,
-        :id => 'also_exists_but_references_nonexistent_partial'
-      }.should raise_error(ActionView::MissingTemplate)
+    it 'raises a missing template error for valid page with invalid partial' do
+      id = 'also_exists_but_references_nonexistent_partial'
+
+      expect { get :show, id: id }
+        .to raise_error(ActionView::MissingTemplate)
     end
   end
 end

data/spec/controllers/subclassed_pages_controller_spec.rb

@@ -6,35 +6,29 @@ describe SubclassedPagesController do
   describe 'on GET to /subclassed_pages/also_exists' do
     before { get :show, :id => 'also_exists' }
 
-    it 'should respond with success and render template' do
-      response.should be_success
-      response.should render_template('also_exists')
+    it 'responds with success and render template' do
+      expect(response).to be_succes
+      expect(response).to render_template('also_exists')
     end
 
-    it 'should use the custom configured layout' do
-      response.should_not render_template('layouts/application')
-      response.should render_template('layouts/alternate')
+    it 'uses the custom configured layout' do
+      expect(response).not_to render_template('layouts/application')
+      expect(response).to render_template('layouts/alternate')
     end
   end
 
-  it 'should raise a routing error for an invalid page' do
-    lambda {
-      get :show,
-      :id => 'invalid'
-    }.should raise_error(ActionController::RoutingError)
+  it 'raises a routing error for an invalid page' do
+    expect { get :show, id: 'invalid' }
+      .to raise_error(ActionController::RoutingError)
   end
 
-  it 'should raise a routing error for a page in another directory' do
-    lambda {
-      get :show,
-      :id => '../other/wrong'
-    }.should raise_error(ActionController::RoutingError)
+  it 'raises a routing error for a page in another directory' do
+    expect { get :show, id: '../other/wrong' }
+      .to raise_error(ActionController::RoutingError)
   end
 
-  it 'should raise missing template error for valid page with invalid partial' do
-    lambda {
-      get :show,
-      :id => 'also_exists_but_references_nonexistent_partial'
-    }.should raise_error(ActionView::MissingTemplate)
+  it 'raises a missing template error for valid page with invalid partial' do
+    expect { get :show, id: 'also_exists_but_references_nonexistent_partial' }
+      .to raise_error(ActionView::MissingTemplate)
   end
 end

data/spec/dummy/config/environments/test.rb

@@ -11,7 +11,8 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  config.action_controller.perform_caching = true
+  config.action_controller.cache_store = :memory_store
 
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false

data/spec/high_voltage/configuration_spec.rb

@@ -1,25 +1,88 @@
-require 'spec_helper'
+require 'minimal_spec_helper'
 
 describe HighVoltage::Configuration do
-  let(:config_value) { 'fake_config_value' }
-
-  before(:each) do
-    HighVoltage.configure do |config|
-      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.route_drawer = config_value
-      config.routes = config_value
+  describe 'basic config assignment' do
+    let(:config_value) { 'fake_config_value' }
+
+    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
+        end
+      end
+    end
+
+    after(:each) do
+      HighVoltage.configure do |config|
+        config.parent_engine = Rails.application
+      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
+    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
 
-  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.route_drawer).to eq config_value }
-  it { expect(HighVoltage.routes).to eq config_value }
+  describe '#action_caching_layout=' 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
+
+  describe '#page_caching=' 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
+
+  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/high_voltage/page_finder_spec.rb

@@ -2,22 +2,22 @@ require 'spec_helper'
 
 describe HighVoltage::PageFinder do
   it 'produces the name of an existing template' do
-    find('existing').should eq 'pages/existing'
+    expect(find('existing')).to eq 'pages/existing'
   end
 
   it 'produces the name of a nested template' do
-    find('dir/nested').should eq 'pages/dir/nested'
+    expect(find('dir/nested')).to eq 'pages/dir/nested'
   end
 
   it 'uses a custom content path' do
     with_content_path('other_pages/') do
-      find('also_exists').should eq 'other_pages/also_exists'
+      expect(find('also_exists')).to eq 'other_pages/also_exists'
     end
   end
 
   it 'exposes the content path' do
     with_content_path('another_thing/') do
-      page_finder.content_path.should eq 'another_thing/'
+      expect(page_finder.content_path).to eq 'another_thing/'
     end
   end
 
@@ -28,7 +28,7 @@ describe HighVoltage::PageFinder do
       end
     end
 
-    subclass.new('sweet page').page_name.should eq 'the page is sweet page'
+    expect(subclass.new('sweet page').page_name).to eq 'the page is sweet page'
   end
 
   private

data/spec/high_voltage_spec.rb

@@ -1,11 +1,11 @@
 require 'minimal_spec_helper'
 
 describe HighVoltage do
-  it 'should be valid' do
-    HighVoltage.should be_a(Module)
+  it 'is valid' do
+    expect(HighVoltage).to be_a(Module)
   end
 
-  it 'should be loadable without preloading rails' do
+  it 'is loadable without preloading rails' do
     expect { require 'high_voltage' }.not_to raise_error
   end
 end

data/spec/integration/navigation_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'Navigation' do
-  include Capybara::DSL
-
-  it 'should be a valid app' do
-    ::Rails.application.should be_a(Dummy::Application)
+  it 'is a valid app' do
+    expect(::Rails.application).to be_a(Dummy::Application)
   end
 end

data/spec/requests/home_page_spec.rb

@@ -8,6 +8,6 @@ describe 'Home page route' do
 
   it 'redirects the duplicate content to root' do
     get '/home'
-    expect(response).to redirect_to('/')
+    expect(response.headers['Location']).to eq 'http://www.example.com/'
   end
 end

data/spec/routing/routes_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe 'routes' do
   context 'default configuration' do
     it 'generates a route' do
-      page_path('one').should eq '/pages/one'
+      expect(page_path('one')).to eq '/pages/one'
     end
 
     it 'generates a nested route' do
-      page_path('one/two').should eq '/pages/one/two'
+      expect(page_path('one/two')).to eq '/pages/one/two'
     end
 
     it 'recognizes a route' do
@@ -51,11 +51,11 @@ describe 'routes' do
     end
 
     it 'generates a route' do
-      page_path('one').should eq '/one'
+      expect(page_path('one')).to eq '/one'
     end
 
     it 'generates  a nested route' do
-      page_path('one/two').should eq '/one/two'
+      expect(page_path('one/two')).to eq '/one/two'
     end
   end
 
@@ -66,11 +66,11 @@ describe 'routes' do
     end
 
     it 'generates a route' do
-      page_path('one').should eq '/other_pages/one'
+      expect(page_path('one')).to eq '/other_pages/one'
     end
 
     it 'generates a nested route' do
-      page_path('one/two').should eq '/other_pages/one/two'
+      expect(page_path('one/two')).to eq '/other_pages/one/two'
     end
 
     it 'recognizes a route' do
@@ -125,7 +125,7 @@ describe 'routes' do
 
   context 'no home page route' do
     it 'does generate a home page route' do
-      { :get => '/' }.should_not be_routable
+      expect(get: '/').not_to be_routable
     end
   end
 
@@ -134,7 +134,7 @@ describe 'routes' do
       HighVoltage.routes = false
       Rails.application.reload_routes!
 
-      { :get => '/pages/one/two' }.should_not be_routable
+      expect(get: '/pages/one/two').not_to be_routable
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,15 +2,12 @@ ENV['RAILS_ENV'] = 'test'
 
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 
-require 'capybara/rails'
 require 'pry'
 require 'rails/test_help'
 require 'rspec/expectations'
 require 'rspec/rails'
 
 Rails.backtrace_cleaner.remove_silencers!
-Capybara.default_driver = :rack_test
-Capybara.default_selector = :css
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
 
@@ -20,6 +17,10 @@ RSpec.configure do |config|
     Rails.application.reload_routes!
   end
 
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.include RSpec::Matchers
   config.mock_with :rspec
   config.order = 'random'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-06-24 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: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -177,8 +163,6 @@ files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/caching.rb
-- spec/support/concern_reload.rb
 homepage: http://github.com/thoughtbot/high_voltage
 licenses:
 - MIT
@@ -199,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller
@@ -264,5 +248,3 @@ test_files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-- spec/support/caching.rb
-- spec/support/concern_reload.rb

data/spec/support/caching.rb

@@ -1,15 +0,0 @@
-RSpec.configure do |config|
-  config.around(:each, enable_caching: true) do |example|
-    previous_cache_store = ActionController::Base.cache_store
-
-    ActionController::Base.perform_caching = true
-    ActionController::Base.cache_store = :memory_store
-    ActionController::Base.cache_store.clear
-
-    example.run
-
-    ActionController::Base.cache_store.clear
-    ActionController::Base.cache_store = previous_cache_store
-    ActionController::Base.perform_caching = false
-  end
-end

data/spec/support/concern_reload.rb

@@ -1,11 +0,0 @@
-def concern_reload
-  HighVoltage::PagesController.class_eval do
-    if respond_to?(:caches_action)
-      caches_action :show, if: -> { HighVoltage.action_caching }
-    end
-
-    if respond_to?(:caches_page)
-      caches_page :show, if: -> { HighVoltage.page_caching }
-    end
-  end
-end