high_voltage 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6132908ee3ceb8d0bd92c7904926e07aa25d33fa
-  data.tar.gz: 7380d36e82d395f54ba6a360ec6bf22d3a6d1f61
+  metadata.gz: b872bfede94dc9cf0c80856bd435edd5c8014f65
+  data.tar.gz: 742e628313897b06f7579d4c3098c2eab2717440
 SHA512:
-  metadata.gz: 46412825479d480b85bb248ac95c08f8428b8b8e95f0c1365ff5430377d197cfcf9faf1a3ba83f94fccb34ee4bf5c9c19ee43d3d2b49a88ec53549096a148c9d
-  data.tar.gz: 012bbf16df86ae556196514c59c21b963d9300a82245663ec0ae2eee0c007e66ceac20e21dba0072d9abd3cfac81af36ee82dd109864883cca6af97f80b2a38a
+  metadata.gz: 181f409611c5c3e699f29d27416b55f5633fc1d1d9af772b5bbc2d8fc17a70fe1308c207698aba65aafc23d91ba515a599a7e95591a8ee4855a856db44374edc
+  data.tar.gz: 8197ebd00469a8e6d1e77b58b26bfa02f2bfa5a32fdffaa13cd441e06448c26fdcb3ca39d3799da7b85be07aa94f454fee0fb6108678385527c464b7a8380e36

data/.gitignore

@@ -5,5 +5,4 @@ spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
 *.swp
-gemfiles/
 *.gem

data/.travis.yml

@@ -1,8 +1,24 @@
+gemfile:
+  - gemfiles/rails3.1.gemfile
+  - gemfiles/rails3.2.gemfile
+  - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile
+install:
+  - 'travis_retry bundle install'
 language:
   - ruby
-install:
-  - 'bundle install'
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails4.0.gemfile
+    - rvm: 1.9.3
+      gemfile:  gemfiles/rails4.1.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails3.1.gemfile
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails3.1.gemfile
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.2
+script: 'bundle exec rake spec'

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

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
+gem 'appraisal'
+
 gemspec

data/Gemfile.lock

@@ -1,62 +1,71 @@
 PATH
   remote: .
   specs:
-    high_voltage (2.1.0)
+    high_voltage (2.2.1)
 
 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,14 @@
+New for 2.2.1:
++ Resolve issue with require statements for Rails 3.x projects
+
+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.1'
 ```
 
 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/Rakefile

@@ -11,9 +11,14 @@ require 'appraisal'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Default'
-task :default => [:all]
+task :default do
+  if ENV['BUNDLE_GEMFILE'] =~ /gemfiles/
+    Rake::Task['spec'].invoke
+  else
+    Rake::Task['appraise'].invoke
+  end
+end
 
-desc 'Test the engine under all supported Rails versions'
-task all: ['appraisal:install'] do |t|
-  exec 'rake appraisal spec'
+task :appraise do
+  exec 'appraisal install && appraisal rake'
 end

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/gemfiles/rails3.1.gemfile

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

data/gemfiles/rails3.1.gemfile.lock

@@ -0,0 +1,121 @@
+PATH
+  remote: ../
+  specs:
+    high_voltage (2.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.12)
+      actionpack (= 3.1.12)
+      mail (~> 2.4.4)
+    actionpack (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.12)
+      activesupport (= 3.1.12)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.12)
+      activemodel (= 3.1.12)
+      activesupport (= 3.1.12)
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (2.2.3)
+    builder (3.0.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    multi_json (1.9.0)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.1.12)
+      actionmailer (= 3.1.12)
+      actionpack (= 3.1.12)
+      activerecord (= 3.1.12)
+      activeresource (= 3.1.12)
+      activesupport (= 3.1.12)
+      bundler (~> 1.0)
+      railties (= 3.1.12)
+    railties (3.1.12)
+      actionpack (= 3.1.12)
+      activesupport (= 3.1.12)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    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.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.1.0)
+  appraisal
+  high_voltage!
+  pry
+  rails (~> 3.1.12)
+  rspec-rails

data/gemfiles/rails3.2.gemfile

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

data/gemfiles/rails3.2.gemfile.lock

@@ -0,0 +1,119 @@
+PATH
+  remote: ../
+  specs:
+    high_voltage (2.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.16)
+      actionpack (= 3.2.16)
+      mail (~> 2.5.4)
+    actionpack (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.16)
+      activesupport (= 3.2.16)
+      builder (~> 3.0.0)
+    activerecord (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.16)
+      activemodel (= 3.2.16)
+      activesupport (= 3.2.16)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.11)
+    journey (1.0.4)
+    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)
+    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.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.16)
+      actionmailer (= 3.2.16)
+      actionpack (= 3.2.16)
+      activerecord (= 3.2.16)
+      activeresource (= 3.2.16)
+      activesupport (= 3.2.16)
+      bundler (~> 1.0)
+      railties (= 3.2.16)
+    railties (3.2.16)
+      actionpack (= 3.2.16)
+      activesupport (= 3.2.16)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    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.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.1.0)
+  appraisal
+  high_voltage!
+  pry
+  rails (~> 3.2.13)
+  rspec-rails

data/gemfiles/rails4.0.gemfile

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