Merge branch 'master' into update-sentry-strategy-to-use-new-gem-version

Author: jamesstonehill

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
     - 'vendor/**/*'
     - 'rails_*/**/*'

.travis.yml

@@ -1,27 +1,36 @@
 ---
-sudo: false
 language: ruby
 before_install:
   - gem update --system
   - gem install bundler
+install: bundle install --jobs=3 --retry=3
 cache: bundler
 branches:
   only:
     - master
-matrix:
+jobs:
   include:
-  - rvm: 2.3.8
-    gemfile: ./rails_4_test_app/Gemfile
-    script: cd rails_4_test_app && bundle exec rspec
-  - rvm: 2.3.8
+  - rvm: 2.5.1
     gemfile: ./rails_5_test_app/Gemfile
     script: cd rails_5_test_app && bundle exec rspec
   - rvm: 2.5.1
     gemfile: ./rails_6_test_app/Gemfile
     script: cd rails_6_test_app && bundle exec rspec
-  - rvm: 2.3.8
+  - rvm: 2.7.2
+    gemfile: ./rails_6_test_app/Gemfile
+    script: cd rails_6_test_app && bundle exec rspec
+  - rvm: 3.0.0
+    gemfile: ./rails_6_test_app/Gemfile
+    script: cd rails_6_test_app && bundle exec rspec
+  - rvm: 2.7.2
+    gemfile: Gemfile
+    script: bundle exec rubocop
+  - rvm: 2.7.2
+    gemfile: Gemfile
+    script: bundle exec rspec
+  - rvm: 3.0.0
     gemfile: Gemfile
     script: bundle exec rubocop
-  - rvm: 2.3.8
+  - rvm: 3.0.0
     gemfile: Gemfile
     script: bundle exec rspec

api_error_handler.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.version       = ApiErrorHandler::VERSION
   spec.authors       = ["James Stonehill"]
   spec.email         = ["james.stonehill@gmail.com"]
-  spec.required_ruby_version = "~> 2.3"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.summary = <<~SUMMARY
     A gem that helps you easily handle exceptions in your Rails API and return
@@ -35,12 +35,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 4.0"
-  spec.add_dependency "actionpack", ">= 4.0"
+  spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "actionpack", ">= 5.0"
   spec.add_dependency "rack", ">= 1.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-rails", "~> 3.0"
-  spec.add_development_dependency "rubocop", "~> 0.74.0"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec-rails", "~> 3.9"
+  spec.add_development_dependency "rubocop", "~> 0.80.0"
+  spec.add_development_dependency "pry-byebug"
 end

lib/api_error_handler.rb

@@ -4,7 +4,7 @@
 require_relative "./api_error_handler/action_controller"
 require_relative "./api_error_handler/error_id_generator"
 require_relative "./api_error_handler/error_reporter"
-Dir[File.join(__dir__, "api_error_handler", "serializers", "*.rb")].each do |file|
+Dir[File.join(__dir__, "api_error_handler", "serializers", "*.rb")].sort.each do |file|
   require file
 end
 
@@ -33,25 +33,23 @@ def handle_api_errors(options = {})
     serializer_class = options[:serializer] || SERIALIZERS_BY_FORMAT.fetch(format)
     content_type = options[:content_type] || CONTENT_TYPE_BY_FORMAT[format]
     rescue_from StandardError do |error|
-      begin
-        status = ActionDispatch::ExceptionWrapper.rescue_responses[error.class.to_s]
-
-        error_id = ErrorIdGenerator.run(options[:error_id])
-        error_reporter.report(error, error_id: error_id)
-
-        serializer = serializer_class.new(error, status)
-        response_body = serializer.serialize(
-          serializer_options.merge(error_id: error_id)
-        )
-
-        render(
-          serializer.render_format => response_body,
-          content_type: content_type,
-          status: status
-        )
-      rescue
-        raise error
-      end
+      status = ActionDispatch::ExceptionWrapper.rescue_responses[error.class.to_s]
+
+      error_id = ErrorIdGenerator.run(options[:error_id])
+      error_reporter.report(error, error_id: error_id)
+
+      serializer = serializer_class.new(error, status)
+      response_body = serializer.serialize(
+        serializer_options.merge(error_id: error_id)
+      )
+
+      render(
+        serializer.render_format => response_body,
+        content_type: content_type,
+        status: status
+      )
+    rescue
+      raise error
     end
   end
 end

lib/api_error_handler/action_controller.rb

@@ -4,6 +4,6 @@
 require "action_controller"
 
 ActiveSupport.on_load :action_controller do
-  ::ActionController::Base.send :extend, ApiErrorHandler
-  ::ActionController::API.send :extend, ApiErrorHandler
+  ::ActionController::Base.extend ApiErrorHandler
+  ::ActionController::API.extend ApiErrorHandler
 end