high_voltage 2.1.0 → 2.2.1

data/gemfiles/rails4.0.gemfile.lock

@@ -0,0 +1,118 @@
+PATH
+  remote: ../
+  specs:
+    high_voltage (2.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.5)
+      actionpack (= 4.0.5)
+      mail (~> 2.5.4)
+    actionpack (4.0.5)
+      activesupport (= 4.0.5)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-action_caching (1.1.1)
+      actionpack (>= 4.0.0, < 5.0)
+    actionpack-page_caching (1.0.2)
+      actionpack (>= 4.0.0, < 5)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
+      builder (~> 3.1.0)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.5)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (4.0.2)
+    builder (3.1.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.0.5)
+      actionmailer (= 4.0.5)
+      actionpack (= 4.0.5)
+      activerecord (= 4.0.5)
+      activesupport (= 4.0.5)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.5)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.5)
+      actionpack (= 4.0.5)
+      activesupport (= 4.0.5)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    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)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack-action_caching
+  actionpack-page_caching
+  activesupport (>= 3.1.0)
+  appraisal
+  high_voltage!
+  pry
+  rails (~> 4.0.0)
+  rspec-rails

data/gemfiles/rails4.1.gemfile

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

data/gemfiles/rails4.1.gemfile.lock

@@ -0,0 +1,124 @@
+PATH
+  remote: ../
+  specs:
+    high_voltage (2.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      mail (~> 2.5.4)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionpack-action_caching (1.1.1)
+      actionpack (>= 4.0.0, < 5.0)
+    actionpack-page_caching (1.0.2)
+      actionpack (>= 4.0.0, < 5)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
+      builder (~> 3.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
+      arel (~> 5.0.0)
+    activesupport (4.1.4)
+      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
+      thor (>= 0.14.0)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (4.1.4)
+      actionmailer (= 4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
+      activemodel (= 4.1.4)
+      activerecord (= 4.1.4)
+      activesupport (= 4.1.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.4)
+      sprockets-rails (~> 2.0)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.3.2)
+    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)
+    sprockets (2.12.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (1.2.1)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack-action_caching
+  actionpack-page_caching
+  activesupport (>= 3.1.0)
+  appraisal
+  high_voltage!
+  pry
+  rails (~> 4.1.0)
+  rspec-rails

data/high_voltage.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   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/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,22 @@
 module HighVoltage
   class Engine < Rails::Engine
-    initializer 'Require concerns path' do |app|
-      concerns_path = 'app/controllers/concerns'
+    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
+    end
 
-      require 'concerns/high_voltage/static_page'
+    initializer "Require for Rails 3" do |app|
+      if defined?(Rails) && Rails::VERSION::MAJOR == 3
+        require "concerns/high_voltage/static_page"
+        require "high_voltage/pages_controller"
+      end
     end
   end
 end

data/lib/high_voltage/version.rb

@@ -1,3 +1,3 @@
 module HighVoltage
-  VERSION = '2.1.0'.freeze
+  VERSION = "2.2.1".freeze
 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/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