rambulance 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 146d016881be5aa21f7d33de3bab927491c06160
-  data.tar.gz: d0ef5bc64965f81c3834865772875b399161a074
+  metadata.gz: 6b34e6b878ba63db8822a5fc882cfe096e0fa24d
+  data.tar.gz: be1dafb554fdad7ac32ad9c350ebde70dae19b95
 SHA512:
-  metadata.gz: f9459c8e769ae84353aac43085acb710c64fb94f469fe28530fe0797988592ae38eff50f3512e0ad15b36c300940013e441eed8c1f000cc714a046d52a887dfa
-  data.tar.gz: 0761811510d0c91d4efc7c6c4446dc2bd6e71f95a2f7876d046ec034a4d4ee052148a6ae4ce13f28b688c5ce278da3c75f65a5d666acb5f17338118d90146210
+  metadata.gz: 2654f7f3939613f5d17ff0a68b7fc02debc9c23e38b63bd5ce2ebaa6a92fea0184e41a31ec4f82a37a16fce12a4d7d094cb4e8177f0d3bbbf83996582fec3c2c
+  data.tar.gz: f930880f7303f539dc2d740efeac7d5f28929c1b3be4928678b1c4988489f7aa76245eec7faf4bc38d8c4898aa501db404ef4449f726850bc9f61702e1b9cecd

data/.travis.yml

@@ -12,6 +12,7 @@ gemfile:
   - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
   - gemfiles/rails_41.gemfile
+  - gemfiles/rails_42.gemfile
   - gemfiles/rails_edge.gemfile
 
 matrix:

data/Appraisals

@@ -16,6 +16,14 @@ appraise "rails_41" do
   gem "railties", "~> 4.1.0"
 end
 
+appraise "rails_42" do
+  gem "activesupport", "~> 4.2.0.beta1"
+  gem "actionpack", "~> 4.2.0.beta1"
+  gem "railties", "~> 4.2.0.beta1"
+
+  gem 'minitest', '~> 5.3.4'
+end
+
 appraise "rails_edge" do
   git 'git://github.com/rails/rails.git' do
     gem "activesupport", require: 'active_support'
@@ -24,5 +32,4 @@ appraise "rails_edge" do
   end
 
   gem 'minitest', '~> 5.3.4'
-  gem 'rspec-rails', '2.99.0.beta1'
 end

data/README.md

@@ -30,7 +30,7 @@ And then execute:
 $ rails g rambulance:install
 ```
 
-Now you can start editing templates like `app/views/errors/not_found.html.erb`. Edit, run `rails server` and open [`localhost:3000/rambulance/not_found`](http://localhost:3000/rambulance/404)!
+Now you can start editing templates like `app/views/errors/not_found.html.erb`. Edit, run `rails server` and open [`localhost:3000/rambulance/not_found`](http://localhost:3000/rambulance/not_found)!
 
 ## Setting Pairs of Exceptions and HTTP Statuses
 
@@ -67,8 +67,8 @@ This page tells all the error pages as well as all the pairs of exceptions/corre
 ### Open `localhost:3000/rambulance/***` in Your Browser
 
 Just go to one of the error pages via Rambulance:
- * [`localhost:3000/rambulance/not_found`](http://localhost:3000/rambulance/404) or
- * [`localhost:3000/rambulance/internal_server_error`](http://localhost:3000/rambulance/500)
+ * [`localhost:3000/rambulance/not_found`](http://localhost:3000/rambulance/not_found) or
+ * [`localhost:3000/rambulance/internal_server_error`](http://localhost:3000/rambulance/internal_server_error)
 
 This is useful when you want to edit templates without changing Rails configuration.
 

data/Rakefile

@@ -3,9 +3,7 @@ require "bundler/gem_tasks"
 require "rspec/core"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task default: "spec:all"
 

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0.beta1"
+gem "actionpack", "~> 4.2.0.beta1"
+gem "railties", "~> 4.2.0.beta1"
+gem "minitest", "~> 5.3.4"
+
+gemspec :path => "../"

data/gemfiles/rails_edge.gemfile

@@ -9,6 +9,5 @@ git "git://github.com/rails/rails.git" do
 end
 
 gem "minitest", "~> 5.3.4"
-gem "rspec-rails", "2.99.0.beta1"
 
 gemspec :path => "../"

data/lib/generators/rambulance/install_generator.rb

@@ -3,7 +3,15 @@ module Rambulance
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
-      class_option :template_engine, type: :string, aliases: '-e', desc: 'Template engine for the views. Available options are "erb" and "haml".'
+      class_option :template_engine,
+        type: :string,
+        aliases: '-e',
+        desc: 'Template engine for the views. Available options are "erb" and "haml".'
+
+      class_option :error_layout,
+        type: :string,
+        aliases: '-l',
+        desc: 'Copies app/views/layout/application.html.erb to the specified layout name'
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
@@ -28,13 +36,15 @@ BANNER
       end
 
       def copy_layout #:nodoc:
-        say "\ncopying app/views/layouts/application.html.#{template_engine} to app/views/layouts/error.html.#{template_engine}:"
-        copy_file Rails.root.join("app/views/layouts/application.html.#{template_engine}"), "app/views/layouts/error.html.#{template_engine}"
+        return if layout_name == "application"
+
+        say "\n" "copying app/views/layouts/application.html.#{template_engine} to app/views/layouts/#{layout_name}.html.#{template_engine}:"
+        copy_file Rails.root.join("app/views/layouts/application.html.#{template_engine}"), "app/views/layouts/#{layout_name}.html.#{template_engine}"
       end
 
       def copy_initializer #:nodoc:
-        say "\ngenerating initializer:"
-        copy_file "rambulance.rb", "config/initializers/rambulance.rb"
+        say "\n" "generating initializer:"
+        template "rambulance.rb", "config/initializers/rambulance.rb"
       end
 
       private
@@ -42,6 +52,14 @@ BANNER
       def template_engine
         options[:template_engine].try(:to_s).try(:downcase) || 'erb'
       end
+
+      def layout_name
+        options[:error_layout].try(:to_s).try(:downcase) || "application"
+      end
+
+      def longest_error_name_size
+        ActionDispatch::ExceptionWrapper.rescue_responses.keys.sort_by(&:size).last.size
+      end
     end
   end
 end

data/lib/generators/rambulance/templates/rambulance.rb

@@ -3,20 +3,11 @@ Rambulance.setup do |config|
   # List of pairs of exception/corresponding http status. In Rails, the default
   # mappings are below:
   #
-  #   "ActionController::RoutingError"             => :not_found,
-  #   "AbstractController::ActionNotFound"         => :not_found,
-  #   "ActionController::MethodNotAllowed"         => :method_not_allowed,
-  #   "ActionController::UnknownHttpMethod"        => :method_not_allowed,
-  #   "ActionController::NotImplemented"           => :not_implemented,
-  #   "ActionController::UnknownFormat"            => :not_acceptable,
-  #   "ActionController::InvalidAuthenticityToken" => :unprocessable_entity,
-  #   "ActionDispatch::ParamsParser::ParseError"   => :bad_request,
-  #   "ActionController::BadRequest"               => :bad_request,
-  #   "ActionController::ParameterMissing"         => :bad_request,
-  #   "ActiveRecord::RecordNotFound"               => :not_found,
-  #   "ActiveRecord::StaleObjectError"             => :conflict,
-  #   "ActiveRecord::RecordInvalid"                => :unprocessable_entity,
-  #   "ActiveRecord::RecordNotSaved"               => :unprocessable_entity
+<%=
+  ActionDispatch::ExceptionWrapper.rescue_responses.map do |error_class, status|
+    "  #   #{error_class.ljust(longest_error_name_size)} => :#{status}"
+  end.join(",\n")
+%>
   #
   # If you add exceptions in this config, Rambulance uses the pairs you defined
   # here *in addition* to the default maddings. You can also override the default
@@ -31,9 +22,9 @@ Rambulance.setup do |config|
   }
 
   # The template name for the layout of the error pages. The default value is
-  # 'error'. For exmaple, if this value is set to "error_page", Rambulance uses
+  # 'application'. For exmaple, if this value is set to "error_page", Rambulance uses
   # 'app/views/layout/error_page.html.erb' as a layout for all the error pages.
-  config.layout_name = "error"
+  config.layout_name = "<%= layout_name %>"
 
   # The directry name to organize error page templates. The default value is
   # 'errors'. For exmaple, if this value is set to "error_pages", Rambulance

data/lib/rambulance.rb

@@ -9,7 +9,7 @@ module Rambulance
 
   # The name of the layout file for the error pages.
   mattr_accessor :layout_name
-  @@layout_name = "error"
+  @@layout_name = "application"
 
   # The directry name to organize error page templates.
   mattr_accessor :view_path

data/lib/rambulance/exceptions_app.rb

@@ -23,6 +23,10 @@ module Rambulance
       action(status_in_words).call(env)
     end
 
+    def self.local_prefixes
+      [Rambulance.view_path]
+    end if ActionPack::VERSION::STRING >= "4.2.0"
+
     ERROR_HTTP_STATUSES.values.each do |status_in_words|
       eval <<-ACTION
         def #{status_in_words}
@@ -33,6 +37,16 @@ module Rambulance
 
     private
 
+    def process_action(*)
+      begin
+        request.GET
+      rescue bad_request_exception
+        env["MALFORMED_QUERY_STRING"], env["QUERY_STRING"] = env["QUERY_STRING"], ""
+      end
+
+      super
+    end
+
     def send_action(name, *args)
       @_status          = env["PATH_INFO"][1..-1].to_i
       @_response.status = @_status
@@ -60,5 +74,11 @@ module Rambulance
     def controller_path
       Rambulance.view_path
     end
+
+    def bad_request_exception
+      ActionController::BadRequest
+    rescue NameError
+      TypeError # Rails 3.2 doesn't know about ActionController::BadRequest
+    end
   end
 end

data/lib/rambulance/version.rb

@@ -1,3 +1,3 @@
 module Rambulance
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/rambulance.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "tzinfo"
   spec.add_development_dependency "jbuilder"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rspec-rails", '~> 2.14.1'
+  spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "appraisal"
 end

data/spec/fake_app/app/views/errors/bad_request.html.erb

@@ -0,0 +1 @@
+Bad request.

data/spec/fake_app/rails_app.rb

@@ -25,7 +25,9 @@ end
 class CustomException < StandardError; end
 
 Rambulance.setup do |config|
+  config.layout_name = "error"
   config.rescue_responses = {
+    'TypeError'       => :bad_request,
     'CustomException' => :not_found
   }
 end
@@ -53,6 +55,8 @@ class UsersController < ApplicationController
   def new
     raise ActionController::InvalidAuthenticityToken
   end
+
+  def create; end
 end
 
 # helpers

data/spec/requests/error_json_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-feature 'Error json responses', if: !ENV["CUSTOM_EXCEPTIONS_APP"] do
+feature 'Error json response', if: !ENV["CUSTOM_EXCEPTIONS_APP"], type: :request do
   def json_response
     JSON.parse(response.body)
   end
@@ -10,31 +10,31 @@ feature 'Error json responses', if: !ENV["CUSTOM_EXCEPTIONS_APP"] do
     super(path, nil, "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json")
   end
 
-  scenario 'Unprocessable entity due to ActionController:InvalidAuthenticityToken but without its template' do
+  scenario 'returns 422 json due to ActionController:InvalidAuthenticityToken but without its template' do
     get '/users/new'
 
-    response.status.should == 422
-    json_response['message'].should == "Something went wrong"
+    expect(response.status).to eq(422)
+    expect(json_response['message']).to eq("Something went wrong")
   end
 
-  scenario 'Internal server error due to RuntimeError' do
+  scenario 'returns 500 json due to RuntimeError' do
     get '/users/1.json'
 
-    response.status.should == 500
-    json_response['message'].should == "Something went wrong"
+    expect(response.status).to eq(500)
+    expect(json_response['message']).to eq("Something went wrong")
   end
 
-  scenario 'Not found due to CustomException' do
+  scenario 'returns 404 json due to CustomException' do
     get '/users.json'
 
-    response.status.should == 404
-    json_response['message'].should == "Page not found"
+    expect(response.status).to eq(404)
+    expect(json_response['message']).to eq("Page not found")
   end
 
-  scenario 'Not found due to ActinoController::RoutingError' do
+  scenario 'returns 404 json due to ActinoController::RoutingError' do
     get '/doesnt_exist.json'
 
-    response.status.should == 404
-    json_response['message'].should == "Page not found"
+    expect(response.status).to eq(404)
+    expect(json_response['message']).to eq("Page not found")
   end
 end

data/spec/requests/error_page_spec.rb

@@ -1,42 +1,58 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-feature 'Error pages' do
+feature 'Error page' do
   shared_examples_for "an action that renders 500 page if the template is missing" do
-    scenario 'Unprocessable entity due to ActionController:InvalidAuthenticityToken but without its template' do
+    scenario 'displays 500 page and return 422 Bad Request status' do
       visit '/users/new'
 
-      page.status_code.should == 422
-      page.body.should have_content "Error page"
-      page.body.should have_content "Something went wrong."
+      expect(page.status_code).to eq(422)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Something went wrong."
     end
   end
 
-  context 'with the default exceptions app', if: !ENV["CUSTOM_EXCEPTIONS_APP"] do
+  context 'generated by the default exceptions app', if: !ENV["CUSTOM_EXCEPTIONS_APP"] do
     it_behaves_like "an action that renders 500 page if the template is missing"
 
-    scenario 'Internal server error due to RuntimeError' do
+    scenario 'displays 500 page due to RuntimeError' do
       visit '/users/1'
 
-      page.status_code.should == 500
-      page.body.should have_content "Error page"
-      page.body.should have_content "Something went wrong."
+      expect(page.status_code).to eq(500)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Something went wrong."
     end
 
-    scenario 'Not found due to CustomException' do
+    scenario 'displays 404 page due to CustomException' do
       visit '/users'
 
-      page.status_code.should == 404
-      page.body.should have_content "Error page"
-      page.body.should have_content "Page not found."
+      expect(page.status_code).to eq(404)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Page not found."
     end
 
-    scenario 'Not found due to ActinoController::RoutingError' do
+    scenario 'displays 404 page due to ActionController::RoutingError' do
       visit '/doesnt_exist'
 
-      page.status_code.should == 404
-      page.body.should have_content "Error page"
-      page.body.should have_content "Page not found."
+      expect(page.status_code).to eq(404)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Page not found."
+    end
+
+    scenario 'displays 400 page when malformed parameters' do
+      page.driver.post '/users?x[y]=1&x[y][][w]=2'
+
+      expect(page.status_code).to eq(400)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Bad request."
+    end
+
+    scenario 'displays 404 page for non-existing page when malformed parameters' do
+      page.driver.post '/doesnt_exist?x[y]=1&x[y][][w]=2'
+
+      expect(page.status_code).to eq(404)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Page not found."
     end
 
     context "with a custom layout name" do
@@ -47,27 +63,27 @@ feature 'Error pages' do
 
       scenario 'uses the custom layout' do
         visit '/doesnt_exist'
-        page.body.should have_content "Application page"
+        expect(page.body).to have_content "Application page"
       end
     end
   end
 
-  context "With a custom exception app", if: ENV["CUSTOM_EXCEPTIONS_APP"] do
+  context "generated by a custom exception app", if: ENV["CUSTOM_EXCEPTIONS_APP"] do
     it_behaves_like "an action that renders 500 page if the template is missing"
 
-    scenario 'Not found due to ActinoController::RoutingError' do
+    scenario 'displays 404 page due to ActinoController::RoutingError' do
       visit '/doesnt_exist'
 
-      page.status_code.should == 404
-      page.body.should have_content "Error page"
-      page.body.should have_content "Page not found."
+      expect(page.status_code).to eq(404)
+      expect(page.body).to have_content "Error page"
+      expect(page.body).to have_content "Page not found."
     end
 
-    scenario 'Internal server error due to RuntimeError' do
+    scenario 'displays 500 page due to RuntimeError' do
       visit '/users/1'
 
-      page.status_code.should == 500
-      page.body.should have_content "Custom error page"
+      expect(page.status_code).to eq(500)
+      expect(page.body).to have_content "Custom error page"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rambulance
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,16 +126,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - gemfiles/rails_32.gemfile
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_41.gemfile
+- gemfiles/rails_42.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/generators/rambulance/exceptions_app_generator.rb
 - lib/generators/rambulance/install_generator.rb
@@ -208,6 +209,7 @@ files:
 - lib/rambulance/railtie.rb
 - lib/rambulance/version.rb
 - rambulance.gemspec
+- spec/fake_app/app/views/errors/bad_request.html.erb
 - spec/fake_app/app/views/errors/internal_server_error.html.erb
 - spec/fake_app/app/views/errors/internal_server_error.json.jbuilder
 - spec/fake_app/app/views/errors/not_found.html.erb
@@ -244,6 +246,7 @@ signing_key:
 specification_version: 4
 summary: Simple and safe way to dynamically generate error pages
 test_files:
+- spec/fake_app/app/views/errors/bad_request.html.erb
 - spec/fake_app/app/views/errors/internal_server_error.html.erb
 - spec/fake_app/app/views/errors/internal_server_error.json.jbuilder
 - spec/fake_app/app/views/errors/not_found.html.erb