high_voltage 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 223b265a8f841aac5236e6a7f2e635785d1799c9
-  data.tar.gz: f38250b134ab9303a6c0b4b0b577b1a87a1fa629
+SHA256:
+  metadata.gz: 5e5d4547d14d7066412de89e823fa98c24ba45337470092ee05873cbc7920dde
+  data.tar.gz: 73e4c7f5894e6b96994a41fcfe3cb8473341619205189fa37045f157815a6cc8
 SHA512:
-  metadata.gz: 0543bae3871a0087e610c70417c4c98158c265d9a9972336f990c7d30c2f1375ccf0cede3c068e57feee604985ce3c837e4948dedf35543f5cb4c454b3af0c2f
-  data.tar.gz: 44ee90083858b224de20a07b8e971a02a40aaa1018896679700eb90ed16c19eb10fbf0503d576c8de524b36e08c95054676e6ce32a870892baceda703625c62b
+  metadata.gz: cd3907451f6c54304d5f26715a4ac2c547fe69d38e76a9d79ceceb9bfa24245b21e7ea3aace18416b8642db1c4b960cb4437a8606aa3829f1440bc91d8be64f6
+  data.tar.gz: aab4d1361c88d8fc98800ea57ce684711b1a16f0a61597c44d2c3c96efeac773fa2a025335c27341a2c3920855c30d867913eb6a664f9a365c25b341676044e2

data/.travis.yml

@@ -2,38 +2,24 @@ branches:
   only:
     - "master"
 gemfile:
-  - gemfiles/rails4.2.gemfile
-  - gemfiles/rails5.0.gemfile
-  - gemfiles/rails5.1.gemfile
-  - gemfiles/rails5.2.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile
 install:
-  - 'travis_retry bundle install'
+  - "bin/setup"
 language:
   - ruby
 rvm:
-  - 2.0.0-p648
-  - 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
-
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 script: 'bundle exec rake spec'
 notifications:
   email: false
 sudo: false
 cache: bundler
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails_4.2.gemfile
+      rvm: 2.6.3

data/Appraisals

@@ -1,6 +1,15 @@
-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
+rails_versions = %w(
+  4.2
+  5.0
+  5.1
+  5.2
+)
+
+rails_versions.each do |version|
+  appraise "rails_#{version}" do
+    gem "rails", "~> #{version}.0"
+    if Gem::Version.new(version) >= Gem::Version.new("5.0")
+      gem "rails-controller-testing"
+    end
   end
 end

data/{NEWS.md → CHANGELOG.md}

@@ -1,4 +1,13 @@
-New for 3.1.0
+# Changelog
+
+## [3.1.1] - 2019-05-13
+
+### Fixed
+
++ Fix UTF-8 encoding error being raised on page requests - [#273]
+
+## [3.1.0] - 2018-05-04
+
 + 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
@@ -7,25 +16,30 @@ New for 3.1.0
 + Test against Rails 5, 5.1, 5.2
 + Test against Ruby 2.4, 2.5
 
-New for 3.0.0
+## [3.0.0] - 2016-04-15
+
 + HighVoltage now supports Rails 5.0.0.beta3 and up.
 + Properly handle extensions in root route constraint requests.
 + Removes caching in preparation for Rails 5.
 
-New for 2.4.0
+## [2.4.0] - 2015-07-17
+
 + Retrieve a list of available static pages via `HighVoltage.page_ids`.
 + Properly handle page ids which are blank when being sanitized.
 + Only provide deprecation warnings around caching when caching is enabled.
 
-New for 2.3.0:
+## [2.3.0] - 2015-04-17
+
 + Ruby 2.2 and Rails 4.2 testing
 + Raise InvalidPageIdError when visiting a page with invalid characters
 + Code of Conduct added to Contributing guide
 
-New for 2.2.1:
+## [2.2.1] - 2014-07-23
+
 + Resolve issue with require statements for Rails 3.x projects
 
-New for 2.2.0:
+## [2.2.0] - 2014-06-24
+
 + 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.
@@ -33,32 +47,54 @@ New for 2.2.0:
 + Remove Capybara from test suite.
 + Support dependency injection for Rails engine to define routes on
 
-New for 2.1.0:
+## [2.1.0] - 2013-12-30
+
 + Extract configuration options into a module
 + Add ability to configure whether layout is cached with action_caching
 + Add ability to configure a `home_page` for root routing to High Voltage
 + Update README with new block style config
 
-New for 2.0.0:
+## [2.0.0] - 2013-10-05
+
 + Extract PagesController into a module
 + Update README with module usage instructions
 
-New for 1.2.4:
+## [1.2.4] - 2013-07-19
+
 + Add page and action caching
 + Remove redundant link style `page_path(id: 'about')` from README
 + Clean up Appraisals for Travis-CI
 + Remove Ruby 1.8.7 from test suite
 
-New for 1.2.3:
+## [1.2.3] - 2013-07-04
+
 + Updates for Rails 4 compatibility.
 + Fix for Rails 4 circular dependency error.
 + Add ability to load High Voltage outside of rails. Require `attribute_accessors`
 
-New for 1.2.2:
+## [1.2.2] - 2013-07-04
+
 + Bug fix for RootRoute constraint. Support haml, slim, etc.
 + README updated for root routes.
 
-New for 1.2.1:
+## [1.2.1] - 2013-10-30
+
 + Ability to disable HighVoltage routes.
 + New RootRoute constraint.
 + Updated README, with new TravisCI url.
+
+[3.1.1]: https://github.com/thoughtbot/high_voltage/compare/v3.1.0...v3.1.1
+[3.1.0]: https://github.com/thoughtbot/high_voltage/compare/v3.0.0...v3.1.0
+[3.0.0]: https://github.com/thoughtbot/high_voltage/compare/v2.4.0...v3.0.0
+[2.4.0]: https://github.com/thoughtbot/high_voltage/compare/v2.3.0...v2.4.0
+[2.3.0]: https://github.com/thoughtbot/high_voltage/compare/v2.2.1...v2.3.0
+[2.2.1]: https://github.com/thoughtbot/high_voltage/compare/v2.2.0...v2.2.1
+[2.2.0]: https://github.com/thoughtbot/high_voltage/compare/v2.1.0...v2.2.0
+[2.1.0]: https://github.com/thoughtbot/high_voltage/compare/v2.0.0...v2.1.0
+[2.0.0]: https://github.com/thoughtbot/high_voltage/compare/v1.2.4...v2.0.0
+[1.2.4]: https://github.com/thoughtbot/high_voltage/compare/v1.2.3...v1.2.4
+[1.2.3]: https://github.com/thoughtbot/high_voltage/compare/v1.2.2...v1.2.3
+[1.2.2]: https://github.com/thoughtbot/high_voltage/compare/v1.2.1...v1.2.2
+[1.2.1]: https://github.com/thoughtbot/high_voltage/compare/v1.2.0...v1.2.1
+
+[#273]: https://github.com/thoughtbot/high_voltage/pull/273

data/Gemfile.lock

@@ -1,108 +1,103 @@
 PATH
   remote: .
   specs:
-    high_voltage (3.1.0)
+    high_voltage (3.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.2.3)
+      actionview (= 5.2.3)
+      activesupport (= 5.2.3)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.1.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    appraisal (1.0.2)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
     builder (3.2.3)
-    capybara (2.14.3)
+    capybara (3.19.1)
       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)
-    concurrent-ruby (1.0.5)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     diff-lcs (1.3)
-    erubi (1.6.0)
-    i18n (0.8.4)
-    loofah (2.2.2)
+    erubi (1.8.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    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)
+    method_source (0.9.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rack (2.0.3)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.3)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     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)
+    railties (5.2.3)
+      actionpack (= 5.2.3)
+      activesupport (= 5.2.3)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    regexp_parser (1.4.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.2)
       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.4)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -113,8 +108,7 @@ DEPENDENCIES
   capybara
   high_voltage!
   pry
-  rails-controller-testing
   rspec-rails (~> 3.5)
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

data/README.md

@@ -1,8 +1,8 @@
-# High Voltage [![Build Status](https://travis-ci.org/thoughtbot/high_voltage.svg?branch=master)](https://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) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 Rails engine for static pages.
 
-... but be careful. [Danger!](http://www.youtube.com/watch?v=HD5tnb2RBYg)
+... but be careful. [Danger!](https://www.youtube.com/watch?v=R-FxmoVM7X4)
 
 ## Static pages?
 
@@ -182,6 +182,7 @@ Most common reasons to override?
   * You need authentication around the pages to make sure a user is signed in.
   * You need to render different layouts for different pages.
   * You need to render a partial from the `app/views/pages` directory.
+  * You need to use your own Page resource and would like to use StaticPage resource for high voltage
 
 Create a `PagesController` of your own:
 
@@ -238,6 +239,12 @@ HighVoltage.configure do |config|
 end
 ```
 
+To use StaticPage resource, turn off routing and use this route:
+
+```ruby
+get "/static_pages/*id" => 'high_voltage/pages#show', as: :static_page, format: false
+```
+
 ## Custom finding
 
 You can further control the algorithm used to find pages by overriding

data/bin/setup

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+# Install required gems, including Appraisal, which helps us test against
+# multiple Rails versions
+gem install bundler --version 1.17.3
+bundle _1.17.3_ check || bundle _1.17.3_ install
+
+if [ -z "$CI" ]; then
+  bundle exec appraisal install
+fi

data/gemfiles/{rails4.2.gemfile → rails_4.2.gemfile}

@@ -4,4 +4,4 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

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

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.0.0"
+gem "rails-controller-testing"
 
-gemspec :path => "../"
+gemspec path: "../"

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

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.1.0"
+gem "rails-controller-testing"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails5.2.gemfile → rails_5.2.gemfile}

@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2.0"
+gem "rails-controller-testing"
 
-gemspec :path => "../"
+gemspec path: "../"

data/high_voltage.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
   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/page_finder.rb

@@ -14,6 +14,8 @@ module HighVoltage
         raise InvalidPageIdError.new "Invalid page id: #{page_id}"
       end
       path
+    rescue ArgumentError
+      raise InvalidPageIdError.new "Invalid page id: #{page_id}"
     end
 
     def content_path

data/lib/high_voltage/version.rb

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

data/spec/high_voltage/page_finder_spec.rb

@@ -70,6 +70,11 @@ describe HighVoltage::PageFinder do
       expect { find("dummy/../../secret") }.
         to raise_error HighVoltage::InvalidPageIdError
     end
+
+    it "throws an exception if invalid byte sequence in page_id" do
+      expect { find("\xD0½\xA8\xCEļ\xFE\xBC\xD0.zip") }.
+        to raise_error HighVoltage::InvalidPageIdError
+    end
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Matt Jankowski
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -74,20 +74,6 @@ 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
@@ -105,27 +91,29 @@ dependencies:
 description: Fire in the disco. Fire in the ... taco bell.
 email:
 - support@thoughtbot.com
-executables: []
+executables:
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- NEWS.md
 - README.md
 - Rakefile
 - app/controllers/concerns/high_voltage/static_page.rb
 - app/controllers/high_voltage/pages_controller.rb
+- bin/setup
 - config/routes.rb
-- gemfiles/rails4.2.gemfile
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
-- gemfiles/rails5.2.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/configuration.rb
@@ -198,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Simple static page rendering controller