rambulance 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e93097596c103ed91bc9ab7bab5a731320278a9
-  data.tar.gz: 8c00647c34dcef11d40880a653108b06783101eb
+  metadata.gz: 8cbab6ea7d38072ab9ddf4b8eaaa06fd46be2ee1
+  data.tar.gz: be1217d51c085bcc772d45deb9f64d3fdfd1415d
 SHA512:
-  metadata.gz: b42c61e3fb53638c22b8988aca6da3c080474c2b8804b10512eec7b302d21ab22cb65142f189a73999530fc4d0439757adec198f57cf9882b8b2dd274e45cd83
-  data.tar.gz: 930c7ed06d8dd0004ef566d80d8d076b69cc732013c2bf02caae649248ab63faadd10d110e9978d99921e808959bf7a134eb8bb3b09f98538ca6b3c1a214e99f
+  metadata.gz: caed478d2b08c895c525200c894d8d13ae623e1e0a9853702d719b36d845ce3eec3db92bee3bc0fdbaf4fafca40758c7f16ec3e18c525ff13af1826fbfa20846
+  data.tar.gz: f73c89f22c997e5adf807bf515b76221a0ef938e0f394add8da2a3cb7deb0a61fbf2556a35349f19ae25940b01859cc10a3fd50fa41f5054831cf16427d463b8

data/.travis.yml

@@ -7,11 +7,12 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
-  - 2.2
+  - 2.2.2
   - ruby-head
   - jruby
   - jruby-head
   - rbx-2.4.1
+  - rbx-2.5.3
 
 gemfile:
   - gemfiles/rails_32.gemfile
@@ -28,7 +29,7 @@ matrix:
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.2
+    - rvm: 2.2.2
       gemfile: gemfiles/rails_32.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_32.gemfile
@@ -37,5 +38,7 @@ matrix:
     - rvm: jruby
     - rvm: jruby-head
     - rvm: rbx-2.4.1
+    - rvm: rbx-2.5.3
     - gemfile: gemfiles/rails_edge.gemfile
+    - gemfile: gemfiles/rails_32.gem
   fast_finish: true

data/README.md

@@ -30,6 +30,13 @@ And then execute:
 $ rails g rambulance:install
 ```
 
+or specify the template engine by:
+```
+$ rails g rambulance:install -e slim
+```
+
+Rambulance now support `erb`, `haml`, `slim` template engines, if you don't specify the `-e` option, erb will be used as default.
+
 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
@@ -96,8 +103,8 @@ It'll generate your own custom exceptions app. You can use whatever techniques y
 
 ## Supported Versions
 
-* Ruby 1.9.3, 2.0.0, 2.1.2, JRuby 1.7.11, Rubinius 2.2.6
-* Rails 3.2, 4.0, 4.1
+* Ruby 1.9.3, 2.0.0, 2.1, 2.2, JRuby 1.7.19, JRuby head, Rubinius 2.4.1 and 2.5.3
+* Rails 3.2, 4.0, 4.1, 4.2 and edge
 
 Rambulance doesn't work with Rails 3.1 and below since they don't provide any way to use a custom exceptions app.
 
@@ -111,4 +118,4 @@ Rambulance doesn't work with Rails 3.1 and below since they don't provide any wa
 
 ## License
 
-Copyright (c) 2014 Yuki Nishijima. See LICENSE.txt for further details.
+Copyright (c) 2014-2015 Yuki Nishijima. See LICENSE.txt for further details.

data/gemfiles/rails_32.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "activesupport", "~> 3.2.0"
 gem "actionpack", "~> 3.2.0"
 gem "railties", "~> 3.2.0"
+gem 'jbuilder', '2.2.13'
 
 gemspec :path => "../"

data/lib/generators/rambulance/install_generator.rb

@@ -6,12 +6,7 @@ module Rambulance
       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'
+        desc: 'Template engine for the views. Available options are "erb", "slim" and "haml".'
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
@@ -29,17 +24,17 @@ BANNER
           copy_file "views/#{f}", "app/views/errors/#{f}"
         end
 
-        filename_pattern = File.join(self.class.source_root, "views", "*.json.jbuilder")
-        Dir.glob(filename_pattern).map {|f| File.basename f }.each do |f|
-          copy_file "views/#{f}", "app/views/errors/#{f}"
+        if defined?(Jbuilder)
+          filename_pattern = File.join(self.class.source_root, "views", "*.json.jbuilder")
+          Dir.glob(filename_pattern).map {|f| File.basename f }.each do |f|
+            copy_file "views/#{f}", "app/views/errors/#{f}"
+          end
         end
       end
 
       def copy_layout #:nodoc:
-        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}"
+        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}"
       end
 
       def copy_initializer #:nodoc:
@@ -53,10 +48,6 @@ BANNER
         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

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

@@ -22,9 +22,9 @@ Rambulance.setup do |config|
   }
 
   # The template name for the layout of the error pages. The default value is
-  # 'application'. For exmaple, if this value is set to "error_page", Rambulance uses
+  # 'error'. 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 = "<%= layout_name %>"
+  config.layout_name = "error"
 
   # 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/generators/rambulance/templates/views/bad_request.html.slim

@@ -0,0 +1,8 @@
+style
+  |  div.dialog { color: #2E2F30; text-align: center; font-family: arial, sans-serif; margin: 0; width: 95%; max-width: 33em; margin: 4em auto; } div.dialog > div { border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #BBB; border-top: #B00100 solid 4px; border-top-left-radius: 9px; border-top-right-radius: 9px; background-color: white; padding: 7px 12% 0; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } h1 { font-size: 100%; color: #730E15; line-height: 1.5em; margin: 10px 0; } div.dialog p { margin: 16px 0; } div.dialog > p { margin: 0 0 1em; padding: 1em; background-color: #F7F7F7; border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #999; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-color: #DADADA; color: #666; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } 
+.dialog
+  div
+    h1
+      | Bad request
+  p
+    | The service received a incomplete request.

data/lib/generators/rambulance/templates/views/forbidden.html.slim

@@ -0,0 +1,8 @@
+style
+  |  div.dialog { color: #2E2F30; text-align: center; font-family: arial, sans-serif; margin: 0; width: 95%; max-width: 33em; margin: 4em auto; } div.dialog > div { border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #BBB; border-top: #B00100 solid 4px; border-top-left-radius: 9px; border-top-right-radius: 9px; background-color: white; padding: 7px 12% 0; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } h1 { font-size: 100%; color: #730E15; line-height: 1.5em; margin: 10px 0; } div.dialog p { margin: 16px 0; } div.dialog > p { margin: 0 0 1em; padding: 1em; background-color: #F7F7F7; border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #999; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-color: #DADADA; color: #666; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } 
+.dialog
+  div
+    h1
+      | Forbidden.
+  p
+    | You are not authorized to access this page.

data/lib/generators/rambulance/templates/views/internal_server_error.html.slim

@@ -0,0 +1,8 @@
+style
+  |  div.dialog { color: #2E2F30; text-align: center; font-family: arial, sans-serif; margin: 0; width: 95%; max-width: 33em; margin: 4em auto; } div.dialog > div { border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #BBB; border-top: #B00100 solid 4px; border-top-left-radius: 9px; border-top-right-radius: 9px; background-color: white; padding: 7px 12% 0; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } h1 { font-size: 100%; color: #730E15; line-height: 1.5em; margin: 10px 0; } div.dialog p { margin: 16px 0; } div.dialog > p { margin: 0 0 1em; padding: 1em; background-color: #F7F7F7; border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #999; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-color: #DADADA; color: #666; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } 
+.dialog
+  div
+    h1
+      | We're sorry, but something went wrong.
+  p
+    | If you are the application owner check the logs for more information.

data/lib/generators/rambulance/templates/views/not_found.html.slim

@@ -0,0 +1,10 @@
+style
+  |  div.dialog { color: #2E2F30; text-align: center; font-family: arial, sans-serif; margin: 0; width: 95%; max-width: 33em; margin: 4em auto; } div.dialog > div { border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #BBB; border-top: #B00100 solid 4px; border-top-left-radius: 9px; border-top-right-radius: 9px; background-color: white; padding: 7px 12% 0; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } h1 { font-size: 100%; color: #730E15; line-height: 1.5em; margin: 10px 0; } div.dialog p { margin: 16px 0; } div.dialog > p { margin: 0 0 1em; padding: 1em; background-color: #F7F7F7; border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #999; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-color: #DADADA; color: #666; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } 
+.dialog
+  div
+    h1
+      | The page you were looking for doesn't exist.
+    p
+      | You may have mistyped the address or the page may have moved.
+  p
+    | If you are the application owner check the logs for more information.

data/lib/generators/rambulance/templates/views/unprocessable_entity.html.slim

@@ -0,0 +1,10 @@
+style
+  |  div.dialog { color: #2E2F30; text-align: center; font-family: arial, sans-serif; margin: 0; width: 95%; max-width: 33em; margin: 4em auto; } div.dialog > div { border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #BBB; border-top: #B00100 solid 4px; border-top-left-radius: 9px; border-top-right-radius: 9px; background-color: white; padding: 7px 12% 0; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } h1 { font-size: 100%; color: #730E15; line-height: 1.5em; margin: 10px 0; } div.dialog p { margin: 16px 0; } div.dialog > p { margin: 0 0 1em; padding: 1em; background-color: #F7F7F7; border: 1px solid #CCC; border-right-color: #999; border-left-color: #999; border-bottom-color: #999; border-bottom-left-radius: 4px; border-bottom-right-radius: 4px; border-top-color: #DADADA; color: #666; box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17); } 
+.dialog
+  div
+    h1
+      | The change you wanted was rejected.
+    p
+      | Maybe you tried to change something you didn't have access to.
+  p
+    | If you are the application owner check the logs for more information.

data/lib/rambulance/exceptions_app.rb

@@ -10,6 +10,12 @@ module Rambulance
   class ExceptionsApp < ActionController::Base
     layout :layout_name
 
+    BAD_REQUEST_EXCEPTION = begin
+                              ActionController::BadRequest
+                            rescue NameError
+                              TypeError # Rails 3.2 doesn't know about ActionController::BadRequest
+                            end
+
     def self.call(env)
       exception       = env["action_dispatch.exception"]
       status_in_words = if exception
@@ -40,7 +46,7 @@ module Rambulance
     def process_action(*)
       begin
         request.GET
-      rescue bad_request_exception
+      rescue BAD_REQUEST_EXCEPTION
         env["MALFORMED_QUERY_STRING"], env["QUERY_STRING"] = env["QUERY_STRING"], ""
       end
 
@@ -68,19 +74,13 @@ module Rambulance
     end
 
     def layout_name
-      Rambulance.layout_name
+      request.format.json? ? false : Rambulance.layout_name
     end
 
     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
-
     helper_method :status_in_words, :exception
   end
 end

data/lib/rambulance/railtie.rb

@@ -1,25 +1,20 @@
 module Rambulance
   class Railtie < Rails::Railtie
-    initializer "action_controller" do |app|
+    initializer 'rambulance' do |app|
       require "rambulance/exceptions_app"
-    end
 
-    initializer "activesupport.dependencies" do |app|
-      begin
-        ActiveSupport::Dependencies.load_missing_constant(Object, :ExceptionsApp)
-        app.config.exceptions_app = ->(env){ ::ExceptionsApp.call(env) }
-      rescue NameError
-        app.config.exceptions_app = ::Rambulance::ExceptionsApp
-      end
-    end
+      app.config.exceptions_app =
+        begin
+          ActiveSupport::Dependencies.load_missing_constant(Object, :ExceptionsApp)
+          ->(env){ ::ExceptionsApp.call(env) }
+        rescue NameError
+          ::Rambulance::ExceptionsApp
+        end
 
-    initializer 'rambulance' do |app|
       ActiveSupport.on_load(:after_initialize) do
-        if Rails.env.development?
-          Rails.application.routes.append do
-            mount app.config.exceptions_app, at: '/rambulance'
-          end
-        end
+        Rails.application.routes.append do
+          mount app.config.exceptions_app, at: '/rambulance'
+        end if Rails.env.development?
       end
     end
   end

data/lib/rambulance/version.rb

@@ -1,3 +1,3 @@
 module Rambulance
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/fake_app/rails_app.rb

@@ -1,4 +1,3 @@
-# require 'rails/all'
 require 'action_controller/railtie'
 require 'action_view/railtie'
 require 'jbuilder'

data/spec/requests/error_json_spec.rb

@@ -7,7 +7,19 @@ feature 'Error json response', if: !ENV["CUSTOM_EXCEPTIONS_APP"], type: :request
   end
 
   def get(path)
-    super(path, nil, "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json")
+    without_layouts do
+      super(path, nil, "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json")
+    end
+  end
+
+  def without_layouts
+    `mv spec/fake_app/app/views/layouts/application.html.erb .`
+    `mv spec/fake_app/app/views/layouts/error.html.erb .`
+
+    yield
+  ensure
+    `mv application.html.erb spec/fake_app/app/views/layouts/`
+    `mv error.html.erb spec/fake_app/app/views/layouts/`
   end
 
   scenario 'returns 422 json due to ActionController:InvalidAuthenticityToken but without its template' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rambulance
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuki Nishijima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,18 +191,23 @@ files:
 - lib/generators/rambulance/templates/rambulance.rb
 - lib/generators/rambulance/templates/views/bad_request.html.erb
 - lib/generators/rambulance/templates/views/bad_request.html.haml
+- lib/generators/rambulance/templates/views/bad_request.html.slim
 - lib/generators/rambulance/templates/views/bad_request.json.jbuilder
 - lib/generators/rambulance/templates/views/forbidden.html.erb
 - lib/generators/rambulance/templates/views/forbidden.html.haml
+- lib/generators/rambulance/templates/views/forbidden.html.slim
 - lib/generators/rambulance/templates/views/forbidden.json.jbuilder
 - lib/generators/rambulance/templates/views/internal_server_error.html.erb
 - lib/generators/rambulance/templates/views/internal_server_error.html.haml
+- lib/generators/rambulance/templates/views/internal_server_error.html.slim
 - lib/generators/rambulance/templates/views/internal_server_error.json.jbuilder
 - lib/generators/rambulance/templates/views/not_found.html.erb
 - lib/generators/rambulance/templates/views/not_found.html.haml
+- lib/generators/rambulance/templates/views/not_found.html.slim
 - lib/generators/rambulance/templates/views/not_found.json.jbuilder
 - lib/generators/rambulance/templates/views/unprocessable_entity.html.erb
 - lib/generators/rambulance/templates/views/unprocessable_entity.html.haml
+- lib/generators/rambulance/templates/views/unprocessable_entity.html.slim
 - lib/generators/rambulance/templates/views/unprocessable_entity.json.jbuilder
 - lib/rambulance.rb
 - lib/rambulance/exceptions_app.rb
@@ -241,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Simple and safe way to dynamically generate error pages