high_voltage 1.2.2 → 1.2.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWVlZTI0NjBiNWVhZTlhNzhkOWNiMzdiYTg3ZDBiYmFkM2M0NGJlZQ==
+  data.tar.gz: !binary |-
+    Y2YwZGEzMmI5ZGRkOGQ1MjYyMGU2ZDE0ZjFjYTJmNTM0ODllNGYwMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWFlZGU0YzFmOWE5Yzk0NDFhZmU4ZjhiODNlMjAxN2M5MzNjNTU2MWEyMDhi
+    ZThiNDlkNGFlYzBiMGYwMzU1MzNjYmQ4OTNkODBjYjg0OTI5YjQyZTQ4OTQz
+    Y2E5MGIwZDFhMjhhYWQyNTBiMzZhODIyZDlmZmY3MTFmYzNiMWE=
+  data.tar.gz: !binary |-
+    YjExZjI0Mzc2NTI5ZTJmNjc4OTdhZWZmZmY2Y2EwZTgxOTBkMDQyZDBmNTky
+    YmQ2NzA0NmJhM2Q3OTJhNDA1YTdjMjllYjQ1MTA5YjhhYjdjOGY5NTM4YjFk
+    MzEzYjIzMzdiOTcyYmMzZWFjNTRmYTRkZDk3ODA1ZWYyNjc0MzQ=

data/.travis.yml

@@ -4,6 +4,10 @@ rvm:
   - 1.9.2
   - 1.9.3
 gemfile:
-  - gemfiles/rails_3.0.18.gemfile
-  - gemfiles/rails_3.1.9.gemfile
-  - gemfiles/rails_3.2.10.gemfile
+  - gemfiles/rails_3.0.20.gemfile
+  - gemfiles/rails_3.1.12.gemfile
+  - gemfiles/rails_3.2.13.gemfile
+  - gemfiles/rails_4.0.0.rc1.gemfile
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails_4.0.0.rc1.gemfile

data/Appraisals

@@ -1,4 +1,4 @@
-['3.2.10', '3.1.9', '3.0.18'].each do |rails_version|
+['4.0.0.rc1', '3.2.13', '3.1.12', '3.0.20'].each do |rails_version|
   appraise "rails_#{rails_version}" do
     gem "rails", rails_version
   end

data/Gemfile.lock

@@ -26,24 +26,23 @@ GEM
       bundler
       rake
     builder (2.1.2)
-    capybara (1.1.0)
+    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 (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
+      xpath (~> 1.0.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.0.9)
+    ffi (1.8.1)
     i18n (0.5.0)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
-    mime-types (1.16)
-    nokogiri (1.5.0)
+    mime-types (1.23)
+    multi_json (1.7.3)
+    nokogiri (1.5.9)
     rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -70,17 +69,17 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+    rubyzip (0.9.9)
+    selenium-webdriver (2.32.1)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
       rubyzip
-    spruz (0.2.13)
+      websocket (~> 1.0.4)
     sqlite3 (1.3.4)
     thor (0.14.6)
     tzinfo (0.3.29)
-    xpath (0.1.4)
+    websocket (1.0.7)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -88,7 +87,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  capybara (>= 0.4.0)
+  capybara (= 2.0.3)
   high_voltage!
   rspec-rails
   sqlite3

data/NEWS.md

@@ -1,6 +1,12 @@
+New for 1.2.3:
++ Updates for Rails 4 compatibility.
++ Fix for Rails 4 circular dependency error.
++ Add ability to load HighVolage outside of rails. Require `attribute_accessors` 
+
 New for 1.2.2:
 + Bug fix for RootRoute constraint. Support haml, slim, etc.
 + README updated for root routes.
+
 New for 1.2.1:
 + Ability to disable HighVoltage routes.
 + New RootRoute constraint.

data/README.md

@@ -51,7 +51,7 @@ By default, the static page routes will be like /pages/:id (where :id is the vie
 
 If you want to route to a static page in another location (for example, a homepage), do this:
 
-    match 'pages/home' => 'high_voltage/pages#show', :id => 'home'
+    get 'pages/home' => 'high_voltage/pages#show', :id => 'home'
 
 In that case, you'd need an app/views/pages/home.html.erb file.
 
@@ -65,7 +65,7 @@ route generated by High Voltage itself.
 For example, this will work for top-level routes (we will
 get a named route called `static_path` which does not conflict with the generated `page_path` method):
 
-    match '/:id' => 'high_voltage/pages#show', :as => :static, :via => :get
+    get '/:id' => 'high_voltage/pages#show', :as => :static, :via => :get
 
 #### Specifying a root path
 
@@ -77,7 +77,7 @@ Which will render a homepage from app/views/pages/home.html.erb
 
 #### Enabling root domain routes
 
-You can remove the directory `pages` from the URL path and serve up routes from 
+You can remove the directory `pages` from the URL path and serve up routes from
 the root of the domain path:
 
     http://www.example.com/about
@@ -93,7 +93,7 @@ This is accomplished by changing the `HighVoltage.route_drawer` to `HighVoltage:
     # config/initializers/high_voltage.rb
     HighVoltage.route_drawer = HighVoltage::RouteDrawers::Root
 
-Note: This is not a catchall route. It will check the `HighVoltage.content_path` 
+Note: This is not a catchall route. It will check the `HighVoltage.content_path`
 (by default this is `app/views/pages`) and validate the view exists.
 
 #### Disabling routes
@@ -129,7 +129,7 @@ Create a PagesController of your own:
 Override the default route:
 
     # in config/routes.rb
-    match "/pages/*id" => 'pages#show', :as => :page, :format => false
+    get "/pages/*id" => 'pages#show', :as => :page, :format => false
 
     # if routing the root path, update for your controller
     root :to => 'pages#show', :id => 'home'
@@ -184,7 +184,7 @@ system, A/B test, and so on.
 Testing
 -------
 
-You can test your static pages using [RSpec](https://github.com/rspec/rspec-rails) 
+You can test your static pages using [RSpec](https://github.com/rspec/rspec-rails)
 and [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers):
 
     # spec/controllers/pages_controller_spec.rb

data/app/controllers/high_voltage/pages_controller.rb

@@ -1,5 +1,4 @@
 class HighVoltage::PagesController < ApplicationController
-  unloadable
   layout Proc.new { |_| HighVoltage.layout }
 
   rescue_from ActionView::MissingTemplate do |exception|

data/gemfiles/{rails_3.0.18.gemfile → rails_3.0.20.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.18"
+gem "rails", "3.0.20"
 
 gemspec :path=>"../"

data/gemfiles/{rails_3.1.9.gemfile → rails_3.1.12.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.1.9"
+gem "rails", "3.1.12"
 
 gemspec :path=>"../"

data/gemfiles/{rails_3.2.10.gemfile → rails_3.2.13.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.2.10"
+gem "rails", "3.2.13"
 
 gemspec :path=>"../"

data/gemfiles/rails_4.0.0.rc1.gemfile

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

data/high_voltage.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency("appraisal")
   s.add_development_dependency("rspec-rails")
-  s.add_development_dependency("capybara", ">= 0.4.0")
+  s.add_development_dependency("capybara", "= 2.0.3")
   s.add_development_dependency("sqlite3")
 end

data/lib/high_voltage.rb

@@ -3,6 +3,7 @@ require 'high_voltage/constraints/root_route'
 require 'high_voltage/page_finder'
 require 'high_voltage/route_drawers/default'
 require 'high_voltage/route_drawers/root'
+require 'active_support/core_ext/module/attribute_accessors'
 
 module HighVoltage
   mattr_accessor :layout

data/lib/high_voltage/version.rb

@@ -1,3 +1,3 @@
 module HighVoltage
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

data/spec/controllers/pages_controller_spec.rb

@@ -98,21 +98,21 @@ describe HighVoltage::PagesController do
     end
 
     it 'should raise a routing error for an invalid page' do
-      lambda { 
-        get :show, 
-        :id => 'also_invalid' 
+      lambda {
+        get :show,
+        :id => 'also_invalid'
       }.should raise_error(ActionController::RoutingError)
     end
 
     it 'should raise a routing error for a page in another directory' do
       lambda {
         get :show,
-        :id => '../other/wrong' 
+        :id => '../other/wrong'
       }.should raise_error(ActionController::RoutingError)
     end
 
     it 'should raise a routing error for a page in another directory when using a Unicode exploit' do
-      lambda { 
+      lambda {
         get :show,
         :id => '/\\../other/wrong'
       }.should raise_error(ActionController::RoutingError)

data/spec/dummy/config/environments/test.rb

@@ -7,8 +7,7 @@ Dummy::Application.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Dummy::Application.routes.draw do
-  match "/subclassed_pages/*id" => 'subclassed_pages#show', :format => false
-  match "/alternative_finder/*id" => 'alternative_finder#show', :format => false
+  get "/subclassed_pages/*id" => 'subclassed_pages#show', :format => false
+  get "/alternative_finder/*id" => 'alternative_finder#show', :format => false
 end

data/spec/high_voltage_spec.rb

@@ -1,7 +1,11 @@
-require 'spec_helper'
+require 'minimal_spec_helper'
 
 describe HighVoltage do
   it 'should be valid' do
     HighVoltage.should be_a(Module)
   end
+
+  it 'should be loadable without preloading rails' do
+    expect { require 'high_voltage' }.not_to raise_error
+  end
 end

data/spec/minimal_spec_helper.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  require 'rspec/expectations'
+  config.include RSpec::Matchers
+  config.mock_with :rspec
+end

data/spec/spec_helper.rb

@@ -9,8 +9,6 @@ Rails.backtrace_cleaner.remove_silencers!
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
 RSpec.configure do |config|
   require 'rspec/expectations'
   config.include RSpec::Matchers

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: high_voltage
 version: !ruby/object:Gem::Version
-  version: 1.2.2
-  prerelease: 
+  version: 1.2.3
 platform: ruby
 authors:
 - Matt Jankowski
@@ -17,12 +16,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +28,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +35,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +42,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,23 +49,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +70,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,9 +93,10 @@ files:
 - Rakefile
 - app/controllers/high_voltage/pages_controller.rb
 - config/routes.rb
-- gemfiles/rails_3.0.18.gemfile
-- gemfiles/rails_3.1.9.gemfile
-- gemfiles/rails_3.2.10.gemfile
+- gemfiles/rails_3.0.20.gemfile
+- gemfiles/rails_3.1.12.gemfile
+- gemfiles/rails_3.2.13.gemfile
+- gemfiles/rails_4.0.0.rc1.gemfile
 - high_voltage.gemspec
 - lib/high_voltage.rb
 - lib/high_voltage/constraints/root_route.rb
@@ -164,31 +156,31 @@ files:
 - spec/high_voltage/page_finder_spec.rb
 - spec/high_voltage_spec.rb
 - spec/integration/navigation_spec.rb
+- spec/minimal_spec_helper.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/high_voltage
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple static page rendering controller
 test_files:
 - spec/constraints/root_route_spec.rb
@@ -242,6 +234,6 @@ test_files:
 - spec/high_voltage/page_finder_spec.rb
 - spec/high_voltage_spec.rb
 - spec/integration/navigation_spec.rb
+- spec/minimal_spec_helper.rb
 - spec/routing/routes_spec.rb
 - spec/spec_helper.rb
-has_rdoc: