high_voltage 2.2.1 → 2.3.0

data/spec/fixtures/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter: sqlite3
+  database: ":memory:"

data/spec/high_voltage/page_finder_spec.rb

@@ -1,34 +1,50 @@
-require 'spec_helper'
+# encoding: utf-8
+
+require "spec_helper"
 
 describe HighVoltage::PageFinder do
-  it 'produces the name of an existing template' do
-    expect(find('existing')).to eq 'pages/existing'
+  it "produces the name of an existing template" do
+    expect(find("existing")).to eq "pages/existing"
   end
 
-  it 'produces the name of a nested template' do
-    expect(find('dir/nested')).to eq 'pages/dir/nested'
+  it "produces the name of a nested template" do
+    expect(find("dir/nested")).to eq "pages/dir/nested"
   end
 
-  it 'uses a custom content path' do
-    with_content_path('other_pages/') do
-      expect(find('also_exists')).to eq 'other_pages/also_exists'
+  it "uses a custom content path" do
+    with_content_path("other_pages/") do
+      expect(find("also_exists")).to eq "other_pages/also_exists"
     end
   end
 
-  it 'exposes the content path' do
-    with_content_path('another_thing/') do
-      expect(page_finder.content_path).to eq 'another_thing/'
+  it "exposes the content path" do
+    with_content_path("another_thing/") do
+      expect(page_finder.content_path).to eq "another_thing/"
     end
   end
 
-  it 'provides the page_id' do
+  it "provides the page_id" do
     subclass = Class.new(HighVoltage::PageFinder) do
       def page_name
         "the page is #{page_id}"
       end
     end
 
-    expect(subclass.new('sweet page').page_name).to eq 'the page is sweet page'
+    expect(subclass.new("sweet page").page_name).to eq "the page is sweet page"
+  end
+
+  it "removes invalid characters from the page_id" do
+    expect(find("b\\a…d√")).to eq "pages/bad"
+  end
+
+  context "sanitized page_id" do
+    it "throws an exception if the page_id is empty" do
+      expect { find("\\…√") }.to raise_error HighVoltage::InvalidPageIdError
+    end
+
+    it "throws an exception if the page_id is just a file extension" do
+      expect { find("\\√.zip") }.to raise_error HighVoltage::InvalidPageIdError
+    end
   end
 
   private
@@ -37,7 +53,7 @@ describe HighVoltage::PageFinder do
     page_finder(page_id).find
   end
 
-  def page_finder(page_id = 'whatever')
+  def page_finder(page_id = "whatever")
     HighVoltage::PageFinder.new(page_id)
   end
 

data/spec/spec_helper.rb

@@ -1,17 +1,23 @@
-ENV['RAILS_ENV'] = 'test'
+ENV["RAILS_ENV"] = "test"
 
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
+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 'pry'
-require 'rails/test_help'
-require 'rspec/expectations'
-require 'rspec/rails'
+require "high_voltage"
+require "fake_app"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |file| require file }
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+
   config.after(:each) do
     HighVoltage.set_default_configuration
     Rails.application.reload_routes!
@@ -23,5 +29,5 @@ RSpec.configure do |config|
 
   config.include RSpec::Matchers
   config.mock_with :rspec
-  config.order = 'random'
+  config.order = "random"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -50,16 +50,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 description: Fire in the disco. Fire in the ... taco bell.
 email:
 - support@thoughtbot.com
@@ -80,14 +80,9 @@ files:
 - app/controllers/concerns/high_voltage/static_page.rb
 - app/controllers/high_voltage/pages_controller.rb
 - config/routes.rb
-- gemfiles/rails3.1.gemfile
-- gemfiles/rails3.1.gemfile.lock
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails3.2.gemfile.lock
 - gemfiles/rails4.0.gemfile
-- gemfiles/rails4.0.gemfile.lock
 - gemfiles/rails4.1.gemfile
-- gemfiles/rails4.1.gemfile.lock
+- gemfiles/rails4.2.gemfile
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/configuration.rb
@@ -103,52 +98,23 @@ files:
 - spec/controllers/page_caching_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/controllers/alternative_finder_controller.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/subclassed_pages_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/alternate.html.erb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/other/wrong.html.erb
-- spec/dummy/app/views/other_pages/also_dir/also_nested.html.erb
-- spec/dummy/app/views/other_pages/also_exists.html.erb
-- spec/dummy/app/views/other_pages/also_exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/also_dir/also_nested.html.erb
-- spec/dummy/app/views/pages/also_exists.html.erb
-- spec/dummy/app/views/pages/also_exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/dir/nested.html.erb
-- spec/dummy/app/views/pages/exists.html.erb
-- spec/dummy/app/views/pages/exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/rot13.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_key_base.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/pages/exists.html
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
+- spec/fake_app.rb
+- spec/fixtures/app/views/layouts/alternate.html.erb
+- spec/fixtures/app/views/layouts/application.html.erb
+- spec/fixtures/app/views/other/wrong.html.erb
+- spec/fixtures/app/views/other_pages/also_dir/also_nested.html.erb
+- spec/fixtures/app/views/other_pages/also_exists.html.erb
+- spec/fixtures/app/views/other_pages/also_exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/also_dir/also_nested.html.erb
+- spec/fixtures/app/views/pages/also_exists.html.erb
+- spec/fixtures/app/views/pages/also_exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/dir/nested.html.erb
+- spec/fixtures/app/views/pages/exists.html.erb
+- spec/fixtures/app/views/pages/exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/rot13.html.erb
+- spec/fixtures/config/database.yml
+- spec/fixtures/config/routes.rb
+- spec/fixtures/public/pages/exists.html
 - spec/high_voltage/configuration_spec.rb
 - spec/high_voltage/page_finder_spec.rb
 - spec/high_voltage_spec.rb
@@ -157,6 +123,8 @@ files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/support/app/controllers/alternative_finder_controller.rb
+- spec/support/app/controllers/subclassed_pages_controller.rb
 homepage: http://github.com/thoughtbot/high_voltage
 licenses:
 - MIT
@@ -177,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller
@@ -188,52 +156,23 @@ test_files:
 - spec/controllers/page_caching_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/controllers/alternative_finder_controller.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/subclassed_pages_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/alternate.html.erb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/other/wrong.html.erb
-- spec/dummy/app/views/other_pages/also_dir/also_nested.html.erb
-- spec/dummy/app/views/other_pages/also_exists.html.erb
-- spec/dummy/app/views/other_pages/also_exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/also_dir/also_nested.html.erb
-- spec/dummy/app/views/pages/also_exists.html.erb
-- spec/dummy/app/views/pages/also_exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/dir/nested.html.erb
-- spec/dummy/app/views/pages/exists.html.erb
-- spec/dummy/app/views/pages/exists_but_references_nonexistent_partial.html.erb
-- spec/dummy/app/views/pages/rot13.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_key_base.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/javascripts/application.js
-- spec/dummy/public/javascripts/controls.js
-- spec/dummy/public/javascripts/dragdrop.js
-- spec/dummy/public/javascripts/effects.js
-- spec/dummy/public/javascripts/prototype.js
-- spec/dummy/public/javascripts/rails.js
-- spec/dummy/public/pages/exists.html
-- spec/dummy/public/stylesheets/.gitkeep
-- spec/dummy/script/rails
+- spec/fake_app.rb
+- spec/fixtures/app/views/layouts/alternate.html.erb
+- spec/fixtures/app/views/layouts/application.html.erb
+- spec/fixtures/app/views/other/wrong.html.erb
+- spec/fixtures/app/views/other_pages/also_dir/also_nested.html.erb
+- spec/fixtures/app/views/other_pages/also_exists.html.erb
+- spec/fixtures/app/views/other_pages/also_exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/also_dir/also_nested.html.erb
+- spec/fixtures/app/views/pages/also_exists.html.erb
+- spec/fixtures/app/views/pages/also_exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/dir/nested.html.erb
+- spec/fixtures/app/views/pages/exists.html.erb
+- spec/fixtures/app/views/pages/exists_but_references_nonexistent_partial.html.erb
+- spec/fixtures/app/views/pages/rot13.html.erb
+- spec/fixtures/config/database.yml
+- spec/fixtures/config/routes.rb
+- spec/fixtures/public/pages/exists.html
 - spec/high_voltage/configuration_spec.rb
 - spec/high_voltage/page_finder_spec.rb
 - spec/high_voltage_spec.rb
@@ -242,3 +181,5 @@ test_files:
 - spec/requests/home_page_spec.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/support/app/controllers/alternative_finder_controller.rb
+- spec/support/app/controllers/subclassed_pages_controller.rb

data/gemfiles/rails3.1.gemfile.lock

@@ -1,121 +0,0 @@
-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

@@ -1,8 +0,0 @@
-# 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

@@ -1,119 +0,0 @@
-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