rambulance 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88ab78d4adf6b58a2a0206350009d9cf58577837d3a7dc9fc5bef1ca25fe23d5
-  data.tar.gz: 6f24e7cbf7a825b5e762e626e2799ad0491fcb46f0c3ea7cbbb72e397ee43e9f
+  metadata.gz: 6572a6a2e77dbc135e1fb9bb830b6ef43af6e302b7ec0db304577f74a0cef088
+  data.tar.gz: 9f1fc8a6204ef86c00525f4cfb9e71a80285a89e2f7b1b4aa82e6c10b56496b4
 SHA512:
-  metadata.gz: 82ae05f28f01beb391c7988a6f993d76b1a81596d5da73645284e22f5328a78cc1294bd4e5f96c5603cb82872e69a057f6e620ed44221ee4a18e68d313b5016a
-  data.tar.gz: 432400598a5d82a59f7f1613d2443b320c1ab7943465183bd70258df9581d5ddd77b06117f98d54e452a990c05277100195fd584f15c086c6fd40598776a02aa
+  metadata.gz: cdd6de274dbe0607bba3a0c63bd24ca733bde12cc1cfde13f7eccc2cfa560d6dee2efca1ff444cd9e6445d9a15ba17234683c7a3ef7c7a957245fd40f80af8ed
+  data.tar.gz: 660ce18b77d8e10a3d042cc34768c802e4069633e966d32f7e240162eddb5a359d1a533e06d78cbaf28e288f92a8b5e2c88055da0b947fc9c4d6bbcf42c0a32a

data/.github/workflows/tests.yml

@@ -14,8 +14,6 @@ jobs:
           - '2.7'
           - '2.6'
           - '2.5'
-          - '2.4'
-          - '2.3'
           - 'jruby-9.3'
           - 'jruby-9.4'
         gemfile:
@@ -73,18 +71,6 @@ jobs:
             gemfile: gemfiles/rails_42.gemfile
           - ruby_version: '2.5'
             gemfile: gemfiles/rails_70.gemfile
-          - ruby_version: '2.4'
-            gemfile: gemfiles/rails_70.gemfile
-          - ruby_version: '2.4'
-            gemfile: gemfiles/rails_61.gemfile
-          - ruby_version: '2.4'
-            gemfile: gemfiles/rails_60.gemfile
-          - ruby_version: '2.3'
-            gemfile: gemfiles/rails_70.gemfile
-          - ruby_version: '2.3'
-            gemfile: gemfiles/rails_61.gemfile
-          - ruby_version: '2.3'
-            gemfile: gemfiles/rails_60.gemfile
           - ruby_version: 'jruby-9.3'
             gemfile: gemfiles/rails_70.gemfile
           - ruby_version: 'jruby-9.3'

data/Appraisals

@@ -43,6 +43,12 @@ appraise "rails_70" do
   gem "railties", "~> 7.0.0"
 end
 
+appraise "rails_71" do
+  gem "activesupport", "~> 7.1.0.beta1"
+  gem "actionpack", "~> 7.1.0.beta1"
+  gem "railties", "~> 7.1.0.beta1"
+end
+
 appraise "rails_edge" do
   git 'https://github.com/rails/rails.git' do
     gem "activesupport", require: 'active_support'

data/CHANGELOG.md

@@ -1,6 +1,26 @@
-## v2.2.0
+## v3.0.0
 
-_<sup>released at 2022-02-22 07:52:27 UTC</sup>_
+#### New Features
+
+- Add support for Rails 7.1 (`be6f129d`)
+
+#### Breaking Changes
+
+- Drop support for Ruby 2.3 and 2.4 (`c0d3439d`)
+
+## [v2.3.0](https://github.com/yuki24/rambulance/tree/v2.3.0)
+
+_<sup>released at 2023-01-05 05:33:36 UTC</sup>_
+
+#### New Features
+
+- Ruby 3.2 is now officially supported.
+
+## [v2.2.0](https://github.com/yuki24/rambulance/tree/v2.2.0)
+
+_<sup>released at 2022-02-13 07:56:32 UTC</sup>_
+
+#### Features
 
 - Add support for Ruby 3.1, Rails 7.0 and JRuby 9.3.3.0
 

data/gemfiles/rails_71.gemfile

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

data/lib/rambulance/exceptions_app.rb

@@ -11,12 +11,12 @@ module Rambulance
 
   BAD_REQUEST_ERRORS = [
     ActionController::BadRequest,
-    begin
-      ActionDispatch::Http::Parameters::ParseError # Rails >= 5.2.0
-    rescue NameError; end,
-    begin
-      ActionDispatch::ParamsParser::ParseError # Rails < 5.2.0
-    rescue NameError; end,
+    # Rails >= 7.1.0
+    defined?(ActionDispatch::Http::MimeNegotiation::InvalidType) ? ActionDispatch::Http::MimeNegotiation::InvalidType : nil,
+    # Rails >= 5.2.0
+    defined?(ActionDispatch::Http::Parameters::ParseError) ? ActionDispatch::Http::Parameters::ParseError : nil,
+    # Rails < 5.2.0
+    defined?(ActionDispatch::ParamsParser::ParseError) ? ActionDispatch::ParamsParser::ParseError : nil
   ].compact.freeze
 
   class ExceptionsApp < ActionController::Base
@@ -89,6 +89,10 @@ module Rambulance
         request.env["MALFORMED_HTTP_ACCEPT"], request.env["HTTP_ACCEPT"] = request.env["HTTP_ACCEPT"], "*/*"
       end
 
+      if defined?(Rack::RACK_REQUEST_FORM_ERROR) && request.env.include?(Rack::RACK_REQUEST_FORM_ERROR)
+        request.env.delete(Rack::RACK_REQUEST_FORM_ERROR)
+      end
+
       # The #formats method needs to be called after the sanitization above.
       request.formats << Mime::Type.lookup('text/plain')
 

data/lib/rambulance/version.rb

@@ -1,3 +1,3 @@
 module Rambulance
-  VERSION = "2.3.0"
+  VERSION = "3.0.0"
 end

data/test/exceptions_app_test.rb

@@ -7,4 +7,3 @@ class ExeptionsAppTest < ActionDispatch::IntegrationTest
     assert_equal 404, response.status
   end
 end
-

data/test/fake_app/rails_app.rb

@@ -4,6 +4,7 @@ require 'jbuilder'
 class TestApp < Rails::Application
   config.secret_token = '964ab2f0fbbb68bc36f3cc487ca296bb8555fac50627924024c245a1599e5265'
   config.session_store :cookie_store, :key => '_myapp_session'
+  config.active_support.cache_format_version = 7.1 if Rails::VERSION::STRING >= "7.1"
   config.active_support.deprecation = :log
   config.eager_load = false
   config.root = File.dirname(__FILE__)

data/test/requests/error_json_test.rb

@@ -2,28 +2,28 @@ require 'test_helper'
 
 class ErrorJsonTest < ActionDispatch::IntegrationTest
   test 'returns the 422 json for ActionController:InvalidAuthenticityToken but without its template' do
-    get '/users/new'
+    get_json '/users/new'
 
     assert_equal 422, response.status
     assert_equal "Something went wrong", json_response['message']
   end
 
   test 'returns the 500 json for RuntimeError' do
-    get '/users/1.json'
+    get_json '/users/1.json'
 
     assert_equal 500, response.status
     assert_equal "Something went wrong", json_response['message']
   end
 
   test 'returns the 404 json for CustomException' do
-    get '/users.json'
+    get_json '/users.json'
 
     assert_equal 404, response.status
     assert_equal "Page not found", json_response['message']
   end
 
   test 'returns the 404 json for ActinoController::RoutingError' do
-    get '/doesnt_exist.json'
+    get_json '/doesnt_exist.json'
 
     assert_equal 404, response.status
     assert_equal "Page not found", json_response['message']
@@ -92,21 +92,27 @@ class ErrorJsonTest < ActionDispatch::IntegrationTest
   private
 
   def without_layouts
-    `mv test/fake_app/app/views/layouts/application.html.erb .`
-    `mv test/fake_app/app/views/layouts/error.html.erb .`
-
-    yield
-  ensure
-    `mv application.html.erb test/fake_app/app/views/layouts/`
-    `mv error.html.erb test/fake_app/app/views/layouts/`
+    if Rails::VERSION::STRING >= '7.1.0'
+      yield
+    else
+      begin
+        `mv test/fake_app/app/views/layouts/application.html.erb .`
+        `mv test/fake_app/app/views/layouts/error.html.erb .`
+
+        yield
+      ensure
+        `mv application.html.erb test/fake_app/app/views/layouts/`
+        `mv error.html.erb test/fake_app/app/views/layouts/`
+      end
+    end
   end
 
-  def get(path, params: {}, headers: {})
+  def get_json(path, params: {}, headers: {})
     without_layouts do
       if Rails::VERSION::STRING >= '5.1.0'
-        super path, params: params, headers: { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json" }.merge(headers)
+        get path, params: params, headers: { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json" }.merge(headers)
       else
-        super path, params, { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json" }.merge(headers)
+        get path, params, { "CONTENT_TYPE" => "application/json", "HTTP_ACCEPT" => "application/json" }.merge(headers)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambulance
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Yuki Nishijima
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,6 +163,7 @@ files:
 - gemfiles/rails_60.gemfile
 - gemfiles/rails_61.gemfile
 - gemfiles/rails_70.gemfile
+- gemfiles/rails_71.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/generators/rambulance/exceptions_app_generator.rb
 - lib/generators/rambulance/install_generator.rb
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Simple and safe way to dynamically generate error pages