high_voltage 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6fe8331cf7311ae941daea7a313a66e350a5565
-  data.tar.gz: d1f5bb5ec3984ce97f167a7e4b56c9936ff1a788
+  metadata.gz: 223b265a8f841aac5236e6a7f2e635785d1799c9
+  data.tar.gz: f38250b134ab9303a6c0b4b0b577b1a87a1fa629
 SHA512:
-  metadata.gz: 7b5f88d3c1b88243befa89c0e1c8e1640b9b1556ea070dcbb7eff8bfeab51c88d6907e6746730d9318c4a276f026f45695eefc800e9aba078bc4ee48714860a8
-  data.tar.gz: 949ae450736d58557bc15ecdcd6f33098ae2ada670563b9440e8b65e7883d12154ddc170d3f42d1147133d4452ccabe7d771707eef320779113e32bdccc636a7
+  metadata.gz: 0543bae3871a0087e610c70417c4c98158c265d9a9972336f990c7d30c2f1375ccf0cede3c068e57feee604985ce3c837e4948dedf35543f5cb4c454b3af0c2f
+  data.tar.gz: 44ee90083858b224de20a07b8e971a02a40aaa1018896679700eb90ed16c19eb10fbf0503d576c8de524b36e08c95054676e6ce32a870892baceda703625c62b

data/.travis.yml

@@ -1,16 +1,37 @@
+branches:
+  only:
+    - "master"
 gemfile:
-  - gemfiles/rails4.0.gemfile
-  - gemfiles/rails4.1.gemfile
   - gemfiles/rails4.2.gemfile
+  - gemfiles/rails5.0.gemfile
+  - gemfiles/rails5.1.gemfile
+  - gemfiles/rails5.2.gemfile
 install:
   - 'travis_retry bundle install'
 language:
   - ruby
 rvm:
   - 2.0.0-p648
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
+matrix:
+  exclude:
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/rails5.1.gemfile
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/rails5.2.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails5.1.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails5.2.gemfile
+
 script: 'bundle exec rake spec'
 notifications:
   email: false

data/Appraisals

@@ -1,13 +1,6 @@
-rails_versions = ['~> 4.0.0', '~> 4.1.0', '~> 4.2.0']
-
+rails_versions = ['~> 4.2.0', '~> 5.0.0', '~> 5.1.0', '~> 5.2.0']
 rails_versions.each do |rails_version|
   appraise "rails#{rails_version.slice(/\d+\.\d+/)}" do
     gem 'rails', rails_version
   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,6 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-gem "appraisal"
-gem "rspec-rails", "~> 3.2"

data/Gemfile.lock

@@ -1,90 +1,108 @@
 PATH
   remote: .
   specs:
-    high_voltage (3.0.0)
+    high_voltage (3.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    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)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (4.2.5.2)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.1.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
     appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    builder (3.2.2)
+    builder (3.2.3)
+    capybara (2.14.3)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     coderay (1.1.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubi (1.6.0)
+    i18n (0.8.4)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.3.0)
+    minitest (5.10.2)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    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.3)
-      loofah (~> 2.0)
-    railties (4.2.5.2)
-      actionpack (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (12.0.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      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.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
     slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
@@ -92,9 +110,11 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 3.1.0)
   appraisal
+  capybara
   high_voltage!
   pry
-  rspec-rails (~> 3.2)
+  rails-controller-testing
+  rspec-rails (~> 3.5)
 
 BUNDLED WITH
-   1.11.2
+   1.16.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2015 thoughtbot, inc.
+Copyright 2010-2018 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,12 @@
+New for 3.1.0
++ Fix bugs around finding pages via page_ids's that contain non-ASCII characters
++ Trailing slash is no longer required for finding pages
++ Some other improvements around page lookups
++ Don't require format in extension for looking up page id's HAML and Slim do
+  not require them.
++ Test against Rails 5, 5.1, 5.2
++ Test against Ruby 2.4, 2.5
+
 New for 3.0.0
 + HighVoltage now supports Rails 5.0.0.beta3 and up.
 + Properly handle extensions in root route constraint requests.

data/README.md

@@ -1,4 +1,4 @@
-# High Voltage [![Build Status](https://travis-ci.org/thoughtbot/high_voltage.png)](http://travis-ci.org/thoughtbot/high_voltage)
+# High Voltage [![Build Status](https://travis-ci.org/thoughtbot/high_voltage.svg?branch=master)](https://travis-ci.org/thoughtbot/high_voltage)
 
 Rails engine for static pages.
 
@@ -10,12 +10,16 @@ Yeah, like "About us", "Directions", marketing pages, etc.
 
 ## Installation
 
+There are two ways to install High Voltage. 
+
+You can run: 
+
     $ gem install high_voltage
 
-Include in your Gemfile:
+Or you can include in your Gemfile:
 
 ```ruby
-gem 'high_voltage', '~> 3.0.0'
+gem 'high_voltage', '~> 3.1'
 ```
 
 ## Usage
@@ -139,7 +143,7 @@ meta-data on High Voltage pages.
 
 ```ruby
 # app/views/pages/about.html.erb
-<%= content_for :page_title, 'About Us - Custom page title' %>
+<% content_for :page_title, 'About Us - Custom page title' %>
 ```
 
 Then print the contents of `:title` into the layout:
@@ -316,7 +320,7 @@ Make sure that there are corresponding locale files
 /config/locale/hi.yml
 ```
 
-One last note is there is a [know
+One last note is there is a [known
 issue](https://github.com/thoughtbot/high_voltage/issues/59) with High Voltage.
 
 You'll need to specify routes like this `<%= link_to "About Us", page_path(id:
@@ -358,14 +362,14 @@ Thank you, [contributors]!
 
 ## License
 
-High Voltage is copyright © 2009-2016 thoughtbot. It is free software, and may
+High Voltage is copyright © 2009-2018 thoughtbot. It is free software, and may
 be redistributed under the terms specified in the [`LICENSE`] file.
 
 [`LICENSE`]: /MIT-LICENSE
 
 ## About thoughtbot
 
-![thoughtbot](https://thoughtbot.com/logo.png)
+![thoughtbot](http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg)
 
 High Voltage is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.

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

@@ -16,7 +16,10 @@ module HighVoltage::StaticPage
   end
 
   def show
-    render template: current_page
+    render(
+      template: current_page,
+      locals: { current_page: current_page },
+    )
   end
 
   def invalid_page

data/gemfiles/rails4.2.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "rspec-rails", "~> 3.2"
 gem "rails", "~> 4.2.0"
 
 gemspec :path => "../"

data/gemfiles/{rails4.0.gemfile → rails5.0.gemfile}

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "rspec-rails", "~> 3.2"
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/{rails4.1.gemfile → rails5.1.gemfile}

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "rspec-rails", "~> 3.2"
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 5.1.0"
 
 gemspec :path => "../"

data/gemfiles/rails5.2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+gemspec :path => "../"

data/high_voltage.gemspec

@@ -16,6 +16,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency("activesupport", ">= 3.1.0")
-  s.add_development_dependency("pry")
+  s.add_development_dependency('activesupport', '>= 3.1.0')
+  s.add_development_dependency('appraisal')
+  s.add_development_dependency('capybara')
+  s.add_development_dependency('pry')
+  s.add_development_dependency('rails-controller-testing')
+  s.add_development_dependency('rspec-rails', '~> 3.5')
 end

data/lib/high_voltage/constraints/root_route.rb

@@ -2,27 +2,28 @@ module HighVoltage
   module Constraints
     # Routing constraint to validate request.path has a corresponding view
     class RootRoute
-      class << self
-        def matches?(request)
-          page_id = clean_page_path(request.path)
-          pattern = file_pattern(page_id)
+      def initialize
+        @lookup_context = ActionView::LookupContext.new(
+          Rails.configuration.paths["app/views"],
+        )
+      end
 
-          Dir.glob(pattern).any?
-        end
+      def matches?(request)
+        page_id = clean_page_path(request.path)
+        template = File.join(content_path, page_id)
+        lookup_context.exists? template
+      end
 
-        private
+      private
 
-        def clean_page_path(request_path)
-          request_path.sub(/\.html$/, "")
-        end
+      attr_reader :lookup_context
 
-        def file_pattern(page_id)
-          "#{content_path}#{page_id}.html*"
-        end
+      def clean_page_path(request_path)
+        request_path.sub(/\.html$/, "")
+      end
 
-        def content_path
-          Rails.root.join("app", "views", HighVoltage.content_path).to_s
-        end
+      def content_path
+        HighVoltage.content_path
       end
     end
   end

data/lib/high_voltage/page.rb

@@ -8,17 +8,21 @@ module HighVoltage
     end
 
     def id
-      file_path.gsub(content_path, "").gsub(html_file_pattern, "")
+      file_path.gsub(content_path, "").split(".").first
     end
 
     def valid?
-      exists? && file_in_content_path? && !directory? && !partial? && html?
+      exists? && file_in_content_path? && !directory? && !partial? && handled?
     end
 
     private
 
+    def handler_extension
+      File.extname(file_path).delete(".")
+    end
+
     def exists?
-      File.exists?(file_path)
+      File.exist?(file_path)
     end
 
     def file_in_content_path?
@@ -33,12 +37,12 @@ module HighVoltage
       File.basename(file_path).first == "_"
     end
 
-    def html?
-      !file_path.match(html_file_pattern).nil?
+    def handled?
+      available_handlers.include? handler_extension
     end
 
-    def html_file_pattern
-      /\.(html)(\.[a-z]+)?$/
+    def available_handlers
+      ActionView::Template.template_handler_extensions
     end
   end
 end

data/lib/high_voltage/page_finder.rb

@@ -2,8 +2,6 @@ module HighVoltage
   # A command for finding pages by id. This encapsulates the concepts of
   # mapping page names to file names.
   class PageFinder
-    VALID_CHARACTERS = "a-zA-Z0-9~!@$%^&*()#`_+-=<>\"{}|[];',?".freeze
-
     def initialize(page_id)
       @page_id = page_id
     end
@@ -11,7 +9,11 @@ module HighVoltage
     # Produce a template path to the page, in a format understood by
     # `render :template => find`
     def find
-      "#{content_path}#{clean_path}"
+      path = clean_content_pathname.join(page_id.tr("\\", "/")).cleanpath.to_s
+      if !path.start_with?("#{clean_content_pathname}/")
+        raise InvalidPageIdError.new "Invalid page id: #{page_id}"
+      end
+      path
     end
 
     def content_path
@@ -23,27 +25,8 @@ module HighVoltage
     # The raw page id passed in by the user
     attr_reader :page_id
 
-    private
-
-    def clean_path
-      path = Pathname.new("/#{clean_id}")
-      path.cleanpath.to_s[1..-1].tap do |p|
-        if p.blank?
-          raise InvalidPageIdError.new "Invalid page id: #{@page_id}"
-        end
-      end
-    end
-
-    def clean_id
-      @page_id.tr("^#{VALID_CHARACTERS}", "").tap do |id|
-        if invalid_page_id?(id)
-          raise InvalidPageIdError.new "Invalid page id: #{@page_id}"
-        end
-      end
-    end
-
-    def invalid_page_id?(id)
-      id.blank? || (id.first == ".")
+    def clean_content_pathname
+      Pathname.new(content_path).cleanpath
     end
   end
 

data/lib/high_voltage/route_drawers/root.rb

@@ -8,7 +8,7 @@ module HighVoltage
           "/*id" => 'high_voltage/pages#show',
           :as => :page,
           :format => false,
-          :constraints => HighVoltage::Constraints::RootRoute
+          :constraints => HighVoltage::Constraints::RootRoute.new,
         }
       end
     end

data/lib/high_voltage/version.rb

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

data/spec/constraints/root_route_spec.rb

@@ -1,36 +1,29 @@
 require "spec_helper"
 
-describe HighVoltage::Constraints::RootRoute, ".matches?" do
-  it "returns true when the view file exists" do
-    request = double(path: 'index')
-    file_path = Rails.root.join("app", "views", "pages", "index.html*").to_s
+describe HighVoltage::Constraints::RootRoute do
+  describe "#matches?" do
+    it "returns true when the view file exists" do
+      request = double(path: "exists")
 
-    allow(Dir).to receive(:glob).with(file_path).and_return(["about.html.erb"])
+      result = described_class.new.matches?(request)
 
-    result = HighVoltage::Constraints::RootRoute.matches?(request)
+      expect(result).to be true
+    end
 
-    expect(result).to be true
-  end
-
-  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"])
+    it "returns true when the view file exists and url ends with .html" do
+      request = double(path: "exists.html")
 
-    result = HighVoltage::Constraints::RootRoute.matches?(request)
-
-    expect(result).to be true
-  end
+      result = described_class.new.matches?(request)
 
-  it "returns false when the view files does not exist" do
-    request = double(path: 'index')
-    file_path = Rails.root.join("app", "views", "pages", "index", ".html*").to_s
+      expect(result).to be true
+    end
 
-    allow(File).to receive(:glob).with(file_path).and_return([])
+    it "returns false when the view files does not exist" do
+      request = double(path: "index")
 
-    result = HighVoltage::Constraints::RootRoute.matches?(request)
+      result = described_class.new.matches?(request)
 
-    expect(result).to be false
+      expect(result).to be false
+    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'
 
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(response).to render_template('rot13')
   end
 end

data/spec/controllers/pages_controller_spec.rb

@@ -10,7 +10,7 @@ describe HighVoltage::PagesController do
       before { get :show, id: "exists" }
 
       it "responds with success and render template" do
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(response).to render_template("exists")
       end
 
@@ -23,7 +23,7 @@ describe HighVoltage::PagesController do
       before { get :show, id: "dir/nested" }
 
       it "responds with success and render template" do
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(response).to render_template("pages/dir/nested")
       end
     end
@@ -69,7 +69,7 @@ describe HighVoltage::PagesController do
       before { get :show, id: "also_exists" }
 
       it "responds with success and render template" do
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(response).to render_template("other_pages/also_exists")
       end
     end
@@ -78,7 +78,7 @@ describe HighVoltage::PagesController do
       before { get :show, id: "also_dir/also_nested" }
 
       it "responds with success and render template" do
-        expect(response).to be_success
+        expect(response).to be_successful
         expect(response).to render_template("other_pages/also_dir/also_nested")
       end
     end

data/spec/controllers/subclassed_pages_controller_spec.rb

@@ -1,34 +1,34 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe SubclassedPagesController do
   render_views
 
-  describe 'on GET to /subclassed_pages/also_exists' do
-    before { get :show, :id => 'also_exists' }
+  describe "on GET to /subclassed_pages/also_exists" do
+    before { get :show, id: "also_exists" }
 
-    it 'responds with success and render template' do
-      expect(response).to be_succes
-      expect(response).to render_template('also_exists')
+    it "responds with success and render template" do
+      expect(response).to be_successful
+      expect(response).to render_template("also_exists")
     end
 
-    it 'uses the custom configured layout' do
-      expect(response).not_to render_template('layouts/application')
-      expect(response).to 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 'raises a routing error for an invalid page' do
-    expect { get :show, id: 'invalid' }
-      .to raise_error(ActionController::RoutingError)
+    expect { get :show, id: "invalid" }.
+      to raise_error(ActionController::RoutingError)
   end
 
   it 'raises a routing error for a page in another directory' do
-    expect { get :show, id: '../other/wrong' }
-      .to raise_error(ActionController::RoutingError)
+    expect { get :show, id: "../other/wrong" }.
+      to raise_error(ActionController::RoutingError)
   end
 
   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)
+    expect { get :show, id: "also_exists_but_references_nonexistent_partial" }.
+      to raise_error(ActionView::MissingTemplate)
   end
 end

data/spec/fake_app.rb

@@ -10,6 +10,7 @@ module Dummy
     config.action_controller.perform_caching = true
     config.action_controller.cache_store = :memory_store
     config.root = "spec/fixtures"
+    config.paths["app/views"] << "spec/fixtures/app/views"
   end
 end
 Dummy::Application.initialize!

data/spec/features/current_page_helper_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+feature "current page helper" do
+  scenario "is available in view" do
+    visit page_path(id: "current_page_helper")
+
+    expect(page).to have_content "Current Page: pages/current_page_helper"
+  end
+end

data/spec/features/view_page_spec.rb

@@ -0,0 +1,9 @@
+require "spec_helper"
+
+feature "view page" do
+  scenario "successfully" do
+    visit page_path(id: "about")
+
+    expect(page).to have_content "About Us"
+  end
+end

data/spec/fixtures/app/views/pages/about.html.erb

@@ -0,0 +1 @@
+<h1>About Us</h1>

data/spec/fixtures/app/views/pages/current_page_helper.html.erb

@@ -0,0 +1 @@
+<h1>Current Page: <%= current_page %></h1>

data/spec/fixtures/app/views/pages/exists_without_html_extension.erb

@@ -0,0 +1 @@
+<h1>Exists without html extension</h1>

data/spec/high_voltage/page_collector_spec.rb

@@ -2,14 +2,18 @@ require "spec_helper"
 
 describe HighVoltage::PageCollector do
   it "produces an array of all page_ids under pages/" do
-    expect(HighVoltage.page_ids).to eq [
+    expect(HighVoltage.page_ids).to match_array [
+      "about",
       "also_dir/also_nested",
       "also_exists",
       "also_exists_but_references_nonexistent_partial",
+      "current_page_helper",
       "dir/nested",
       "exists",
       "exists_but_references_nonexistent_partial",
-      "rot13"
+      "rot13",
+      "exists_without_html_extension",
+      "text",
     ]
   end
 

data/spec/high_voltage/page_finder_spec.rb

@@ -11,12 +11,26 @@ describe HighVoltage::PageFinder do
     expect(find("dir/nested")).to eq "pages/dir/nested"
   end
 
+  it "produces the name of a dotfile" do
+    expect(find(".file")).to eq "pages/.file"
+  end
+
+  it "supports non-ASCII characters" do
+    expect(find("résumé")).to eq "pages/résumé"
+  end
+
   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 "allows the trailing slash to be omitted from the content path" do
+    with_content_path("forgot_slash") do
+      expect(find("thing")).to eq "forgot_slash/thing"
+    end
+  end
+
   it "exposes the content path" do
     with_content_path("another_thing/") do
       expect(page_finder.content_path).to eq "another_thing/"
@@ -33,24 +47,31 @@ describe HighVoltage::PageFinder do
     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
+  context "bad page_id" do
+    it "throws an exception if page_id resolves to empty" do
+      expect { find("") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("/") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find(".") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("\\.") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("/\\.") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("dummy/..") }.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
+    it "throws an exception if page_id resolves to outside the content path" do
+      expect { find("..") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("\\..") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("/\\..") }.to raise_error HighVoltage::InvalidPageIdError
+      expect { find("../secret") }.
+        to raise_error HighVoltage::InvalidPageIdError
+      expect { find("\\../secret") }.
+        to raise_error HighVoltage::InvalidPageIdError
+      expect { find("/\\../secret") }.
+        to raise_error HighVoltage::InvalidPageIdError
+      expect { find("dummy/../../secret") }.
+        to raise_error HighVoltage::InvalidPageIdError
     end
   end
 
-  it "throws an exception if the path is empty" do
-    expect { find("關於我們/合作伙伴") }.to raise_error HighVoltage::InvalidPageIdError
-  end
-
   private
 
   def find(page_id)

data/spec/high_voltage/page_spec.rb

@@ -43,10 +43,10 @@ describe HighVoltage::Page do
     expect(page).to_not be_valid
   end
 
-  it "is invalid for a text page" do
-    page = page(full_file_path("text.txt.erb"))
+  it "is valid for files without a format present" do
+    page = page(full_file_path("exists_without_html_extension.erb"))
 
-    expect(page).to_not be_valid
+    expect(page).to be_valid
   end
 
   private

data/spec/spec_helper.rb

@@ -4,10 +4,9 @@ require "pry"
 require "active_model/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
-require "rspec/rails"
-
 require "high_voltage"
 require "fake_app"
+require "rspec/rails"
 
 Rails.backtrace_cleaner.remove_silencers!
 

data/spec/support/http_method_shim.rb

@@ -3,8 +3,12 @@
 # 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)
+  def get(path, params = nil, *args)
+    if args.any?
+      raise ArgumentError, "Unexpected arguments passed to shim: #{args.inspect}"
+    else
+      super(path, params: params)
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,6 +32,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -46,6 +74,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-controller-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !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.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: Fire in the disco. Fire in the ... taco bell.
 email:
 - support@thoughtbot.com
@@ -66,10 +122,10 @@ files:
 - app/controllers/concerns/high_voltage/static_page.rb
 - app/controllers/high_voltage/pages_controller.rb
 - config/routes.rb
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
 - gemfiles/rails4.2.gemfile
-- gemfiles/rails50.gemfile
+- gemfiles/rails5.0.gemfile
+- gemfiles/rails5.1.gemfile
+- gemfiles/rails5.2.gemfile
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/configuration.rb
@@ -86,6 +142,8 @@ files:
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
 - spec/fake_app.rb
+- spec/features/current_page_helper_spec.rb
+- spec/features/view_page_spec.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
@@ -93,12 +151,15 @@ files:
 - 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/_partial.html.erb
+- spec/fixtures/app/views/pages/about.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/current_page_helper.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/exists_without_html_extension.erb
 - spec/fixtures/app/views/pages/rot13.html.erb
 - spec/fixtures/app/views/pages/text.txt.erb
 - spec/fixtures/config/database.yml
@@ -137,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller
@@ -147,6 +208,8 @@ test_files:
 - spec/controllers/pages_controller_spec.rb
 - spec/controllers/subclassed_pages_controller_spec.rb
 - spec/fake_app.rb
+- spec/features/current_page_helper_spec.rb
+- spec/features/view_page_spec.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
@@ -154,12 +217,15 @@ test_files:
 - 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/_partial.html.erb
+- spec/fixtures/app/views/pages/about.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/current_page_helper.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/exists_without_html_extension.erb
 - spec/fixtures/app/views/pages/rot13.html.erb
 - spec/fixtures/app/views/pages/text.txt.erb
 - spec/fixtures/config/database.yml

data/gemfiles/rails50.gemfile

@@ -1,10 +0,0 @@
-# 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 => "../"