high_voltage 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f93b914b6966f7141851a562ce82ffe1e218e01
-  data.tar.gz: d6456e304488fec82214e584d9dbd8f261151d69
+  metadata.gz: dfdb165dc9944d13d14ccfcfab0358c2d575b688
+  data.tar.gz: 769e4a05d918743c86ce21f58b4ab2ea3d8bc838
 SHA512:
-  metadata.gz: eabead4dde04710b58c97047ca3d0b18af4694696b0e800af9ad0618d08d37c358071999f2fb4a56455857c501d1204a1df73c91c85f58e1fe4d9c71a915d93d
-  data.tar.gz: 8a0b9a4dabe052d01a1b2f4edc91cc7bd15a36eff75ab49d7db3e4c18fe9509203edc214fc2a5d2767022cdfac32c384b94af8023583a5e39944fd94830be8ba
+  metadata.gz: e036c73851faf23320d6b5fccbd8c65cacdb73e736422e0df062cdea64ea8c6a88d26bfc084403a979955eeb695e82d4bc89fdcdd6905516dd7adf85734425b7
+  data.tar.gz: 29b92c7a8e76d78f6084bfbc6987d5022af4a048461eaff10192d32e94bdd217b41ca27e9ac1c42a38e70fae0603519075cba4e7d2f0a9cc78dc5b4ddaf11206

data/.gitignore

@@ -1,9 +1,6 @@
 .bundle/
 log/*.log
 pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/log/*.log
-spec/dummy/tmp/
 *.swp
-gemfiles/
 *.gem
+gemfiles/*.lock

data/.travis.yml

@@ -1,8 +1,17 @@
-language:
-  - ruby
+gemfile:
+  - gemfiles/rails4.0.gemfile
+  - gemfiles/rails4.1.gemfile
+  - gemfiles/rails4.2.gemfile
 install:
   - 'travis_retry bundle install'
+language:
+  - ruby
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
+  - 2.2.0
+script: 'bundle exec rake spec'
+notifications:
+  email: false
+sudo: false
+cache: bundler

data/Appraisals

@@ -1,16 +1,9 @@
-if RUBY_VERSION >= '2.0'
-  rails_versions = ['~> 3.2.13', '~> 4.0.0', '~> 4.1.0']
-else
-  rails_versions = ['~> 3.1.12', '~> 3.2.13']
-end
+rails_versions = ['~> 4.0.0', '~> 4.1.0', '~> 4.2.0']
 
 rails_versions.each do |rails_version|
   appraise "rails#{rails_version.slice(/\d+\.\d+/)}" do
     gem 'rails', rails_version
-
-    if ['~> 4.0.0', '~> 4.1.0'].include? rails_version
-      gem 'actionpack-action_caching'
-      gem 'actionpack-page_caching'
-    end
+    gem 'actionpack-action_caching'
+    gem 'actionpack-page_caching'
   end
 end

data/CONTRIBUTING.md

@@ -1,4 +1,7 @@
-We love pull requests. Here's a quick guide:
+We love pull requests from everyone. By participating in this project, you
+agree to abide by the thoughtbot [code of conduct].
+
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
 
 1. Fork the repo.
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,30 +1,31 @@
 PATH
   remote: .
   specs:
-    high_voltage (2.2.0)
+    high_voltage (2.3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
-      rack (~> 1.5.2)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       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)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    appraisal (1.0.0)
+    appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
@@ -32,39 +33,57 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    i18n (0.6.9)
-    json (1.8.1)
+    i18n (0.7.0)
+    json (1.8.2)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
     method_source (0.8.2)
-    minitest (5.3.3)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       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)
+    rake (10.4.2)
+    rspec-core (3.2.1)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    slop (3.6.0)
     thor (0.19.1)
-    thread_safe (0.3.3)
-    tzinfo (1.1.0)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -75,4 +94,4 @@ DEPENDENCIES
   appraisal
   high_voltage!
   pry
-  rspec-rails
+  rspec-rails (~> 3.2.0)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010-2014 thoughtbot, inc.
+Copyright 2010-2015 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,11 @@
+New for 2.3.0:
++ 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:
++ 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.

data/README.md

@@ -15,7 +15,7 @@ Yeah, like "About us", "Directions", marketing pages, etc.
 Include in your Gemfile:
 
 ```ruby
-gem 'high_voltage', '~> 2.2.0'
+gem 'high_voltage', '~> 2.3.0`
 ```
 
 For Rails versions prior to 3.0, use the 0.9.2 tag of high_voltage:
@@ -263,6 +263,58 @@ end
 Use this to create a custom file mapping, clean filenames for your file
 system, A/B test, and so on.
 
+## Localization
+
+[Rails I18n guides](http://guides.rubyonrails.org/i18n.html).
+
+Add a before filter to the Application controller
+
+```ruby
+# app/controllers/application_controller.rb
+before_action :set_locale
+
+def set_locale
+  I18n.locale = params[:locale] || I18n.default_locale
+end
+```
+
+Disable the default High Voltage routes
+
+```ruby
+# config/initializers/high_voltage.rb
+HighVoltage.configure do |config|
+  config.routes = false
+end
+```
+
+```ruby
+# config/routes.rb
+scope "/:locale", locale: /en|bn|hi/ do
+  get "/pages/:id" => "high_voltage/pages#show", :as => :page, :format => false
+end
+```
+
+Add a static page to the project
+
+```
+# app/views/pages/about.html.erb
+<%= t "hello" %>
+```
+
+Make sure that there are corresponding locale files
+
+```
+/config/locale/bn.yml
+/config/locale/en.yml
+/config/locale/hi.yml
+```
+
+One last note is there is a [know
+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:
+"about") %>`
+
 ## Testing
 
 You can test your static pages using [RSpec](https://github.com/rspec/rspec-rails)
@@ -291,20 +343,29 @@ Enjoy!
 
 ## Contributing
 
-Please see [CONTRIBUTING.md](https://github.com/thoughtbot/high_voltage/blob/master/CONTRIBUTING.md)
-for details.
+Please see [CONTRIBUTING.md].
+Thank you, [contributors]!
 
-## Credits
+[CONTRIBUTING.md]: /CONTRIBUTING.md
+[contributors]: https://github.com/thoughtbot/high_voltage/graphs/contributors
 
-![thoughtbot](http://thoughtbot.com/images/tm/logo.png)
+## License
+
+High Voltage is copyright © 2009-2015 thoughtbot. It is free software, and may
+be redistributed under the terms specified in the [`LICENSE`] file.
 
-High Voltage is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
+[`LICENSE`]: /MIT-LICENSE
 
-Thank you to all [the contributors](https://github.com/thoughtbot/high_voltage/contributors)!
+## About thoughtbot
 
+![thoughtbot](https://thoughtbot.com/logo.png)
+
+High Voltage is maintained and funded by thoughtbot, inc.
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 
-## License
+We love open source software!
+See [our other projects][community].
+We are [available for hire][hire].
 
-High Voltage is Copyright © 2009-2014 thoughtbot. It is free software, and may
-be redistributed under the terms specified in the MIT-LICENSE file.
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com/hire-us?utm_source=github

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/app/controllers/concerns/high_voltage/static_page.rb

@@ -6,12 +6,14 @@ module HighVoltage::StaticPage
 
     rescue_from ActionView::MissingTemplate do |exception|
       if exception.message =~ %r{Missing template #{page_finder.content_path}}
-        raise ActionController::RoutingError, "No such page: #{params[:id]}"
+        invalid_page
       else
         raise exception
       end
     end
 
+    rescue_from HighVoltage::InvalidPageIdError, with: :invalid_page
+
     if respond_to?(:caches_action)
       caches_action :show, layout: HighVoltage.action_caching_layout,
         if: -> { HighVoltage.action_caching }
@@ -39,4 +41,8 @@ module HighVoltage::StaticPage
   def page_finder_factory
     HighVoltage::PageFinder
   end
+
+  def invalid_page
+    raise ActionController::RoutingError, "No such page: #{params[:id]}"
+  end
 end

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 => "../"

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.2.gemfile

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

data/high_voltage.gemspec

@@ -17,7 +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("pry")
-  s.add_development_dependency("rspec-rails")
+  s.add_development_dependency("rspec-rails", "~> 3.2.0")
 end

data/lib/high_voltage/engine.rb

@@ -1,15 +1,22 @@
 module HighVoltage
   class Engine < Rails::Engine
-    initializer 'Set up default parent engine' do |app|
+    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'
+    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
+
+    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/page_finder.rb

@@ -31,7 +31,17 @@ module HighVoltage
     end
 
     def clean_id
-      @page_id.tr("^#{VALID_CHARACTERS}", '')
+      @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 == ".")
     end
   end
+
+  class InvalidPageIdError < StandardError; end
 end

data/lib/high_voltage/version.rb

@@ -1,3 +1,3 @@
 module HighVoltage
-  VERSION = '2.2.0'.freeze
+  VERSION = "2.3.0".freeze
 end

data/spec/constraints/root_route_spec.rb

@@ -3,19 +3,19 @@ require 'spec_helper'
 describe HighVoltage::Constraints::RootRoute, '.matches?' do
   it 'returns true when the view file exists' do
     request = double(path: 'index')
-    Dir.stub(:glob).and_return(['about.html.erb'])
+    allow(Dir).to receive(:glob).and_return(["about.html.erb"])
 
     result = HighVoltage::Constraints::RootRoute.matches?(request)
 
-    expect(result).to be_true
+    expect(result).to be true
   end
 
   it 'returns false when the view files does not exist' do
     request = double(path: 'index')
-    File.stub(:glob).and_return([])
+    allow(File).to receive(:glob).and_return([])
 
     result = HighVoltage::Constraints::RootRoute.matches?(request)
 
-    expect(result).to be_false
+    expect(result).to be false
   end
 end