rapporteur 3.6.4 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb4afdc76415881f0def9f10d37e5ad82886503325d773736aad1244a33c19ee
-  data.tar.gz: 8b3fc5902d1ef2b0d31d3149a226be718a29ef43b67fce2fa31d092ba63ae98d
+  metadata.gz: 3db69d5d73dbfafab08c22edd81d3820e56fed93d28432b53fa7be3887cc406c
+  data.tar.gz: 0aa510c74dafa83f2134ffe676f2890ae3f86c94952511d201a65704fabcadbc
 SHA512:
-  metadata.gz: d0130f7543054e2e74dd9c9932aebd72a2c0b346b6b1713acca29d87ef1c475fe908a35edcf7b7e20324dce4433fbe18548f0ee4350a134dda5dacc93e9d1efd
-  data.tar.gz: 39a74b306b2a73a5b0b0126b346f611735b3825eb88f6fe9efa8fd0393ff64a2e775071be8eb80f3107359366c9e143804d47ec5e26081dc254075dc22e877de
+  metadata.gz: af872ea5073a9cb0f80d915e73ba6f36dd5d68acc9c143717a1f7f3d259d974b79852060850e84398c9bfb67e306de97b95702bae0501244974a2b0f54ff66eb
+  data.tar.gz: 713bd749716b99c5d1a9eeb53bba570564acffc6b7933adf7006b2f6c20d5671925aeb1be7b8efc6099749d6c5db49942a352a8164878335d2556bcb3f887de0

data/.rubocop.yml

@@ -1,37 +1,30 @@
+---
+
 inherit_gem:
   rubocop-rails_config:
     - "config/rails.yml"
 
 AllCops:
-  TargetRubyVersion: 2.3
   Exclude:
     - 'gemfiles/*'
+    - 'gemfiles/**/*'
+    - 'vendor/**/*'
+  TargetRubyVersion: 2.5
 
 Layout/CaseIndentation:
-  Enabled: true
-  EnforcedStyle: end
+  EnforcedStyle: "end"
+
+Layout/EmptyLinesAroundAccessModifier:
+  EnforcedStyle: "around"
 
 Layout/EndOfLine:
   EnforcedStyle: "lf"
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   EnforcedStyle: "squiggly"
 
 Layout/IndentationConsistency:
   EnforcedStyle: "normal"
 
-Metrics/BlockLength:
-  Exclude:
-    - 'Rakefile'
-    - '**/*.rake'
-    - 'spec/**/*.rb'
-
-Metrics/ModuleLength:
-  Exclude:
-    - 'spec/**/*.rb'
-
-Style/SafeNavigation:
-  Enabled: false
-
 Style/StringLiterals:
   EnforcedStyle: "single_quotes"

data/.travis.yml

@@ -1,55 +1,58 @@
+---
+
 before_install:
-  - gem install bundler -v 2.0.1
+  - "gem install bundler -v 2.1.3"
+install:
+  - "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
 branches:
   only:
-    - master
-    - /^v\d+\.\d+\.\d+/
+    - "master"
+    - '/^v\d+\.\d+\.\d+/'
 cache:
   bundler: true
-dist: xenial
+dist: "xenial"
 jobs:
   fail_fast: true
   include:
-    - stage: "Test"
-      script: bundle exec rake
-      rvm: 2.6.2
+    - rvm: "2.7.0"
+      stage: "Test"
 
-    - stage: "Latest Rails Release"
-      env: BUNDLE_GEMFILE=$PWD/gemfiles/rails_latest.gemfile
-      rvm: 2.6.2
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails_latest.gemfile
-      rvm: 2.5.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails_latest.gemfile
-      rvm: 2.4.5
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.7.0"
+      stage: "Latest Rails Release"
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.6.5"
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.5.7"
 
-    - stage: "Additinal Rails Tests"
-      env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.2.gemfile
-      rvm: 2.6.2
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.2.gemfile
-      rvm: 2.5.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.2.gemfile
-      rvm: 2.4.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.1.gemfile
-      rvm: 2.6.2
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.1.gemfile
-      rvm: 2.5.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.1.gemfile
-      rvm: 2.4.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.0.gemfile
-      rvm: 2.6.2
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.0.gemfile
-      rvm: 2.5.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/rails5.0.gemfile
-      rvm: 2.4.5
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.7.0"
+      stage: "Additinal Rails Tests"
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.6.5"
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.5.7"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.7.0"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.6.5"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.5.7"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.4.9"
 
-    - stage: "Sinatra 2.x Release"
-      env: BUNDLE_GEMFILE=$PWD/gemfiles/sinatra2.x.gemfile
-      rvm: 2.6.2
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/sinatra2.x.gemfile
-      rvm: 2.5.5
-    - env: BUNDLE_GEMFILE=$PWD/gemfiles/sinatra2.x.gemfile
-      rvm: 2.4.5
-language: ruby
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.7.0"
+      stage: "Sinatra 2.x Release"
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.6.5"
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.5.7"
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.4.9"
+language: "ruby"
 notifications:
   email: false
-sudo: false
+script:
+  - "bundle exec rubocop -fs"
+  - "bundle exec rake"

data/.yamllint

@@ -0,0 +1,7 @@
+---
+
+extends: default
+
+rules:
+  key-ordering: "enable"
+  quoted-strings: "enable"

data/Appraisals

@@ -1,20 +1,14 @@
 # frozen_string_literal: true
 
-appraise 'rails5.0' do
-  gem 'rails', '~> 5.0.0'
-  gem 'sqlite3', '< 1.4', platforms: :ruby
-end
-
-appraise 'rails5.1' do
-  gem 'rails', '~> 5.1.0'
-  gem 'sqlite3', '< 1.4', platforms: :ruby
-end
-
 appraise 'rails5.2' do
   gem 'rails', '~> 5.2.0'
   gem 'sqlite3', '< 1.4', platforms: :ruby
 end
 
+appraise 'rails6.0' do
+  gem 'rails', '~> 6.0.0'
+end
+
 appraise 'rails-latest' do
   gem 'rails'
 end

data/CHANGELOG.md

@@ -9,6 +9,11 @@
 
 * No significant changes.
 
+## [3.7.0][] / 2020-01-02
+
+* Add and test support for Rails 6.0. This also drops explicit testing of Rails
+  5.0 and 5.1 as they are no longer officially maintained.
+
 ## [3.6.4][] / 2019-04-04
 
 * Maintenance release, no functional changes.
@@ -187,4 +192,5 @@
 [3.6.2]: https://github.com/envylabs/rapporteur/compare/v3.6.1...v3.6.2
 [3.6.3]: https://github.com/envylabs/rapporteur/compare/v3.6.2...v3.6.3
 [3.6.4]: https://github.com/envylabs/rapporteur/compare/v3.6.3...v3.6.4
-[HEAD]: https://github.com/envylabs/rapporteur/compare/v3.6.4...master
+[3.7.0]: https://github.com/envylabs/rapporteur/compare/v3.6.4...v3.7.0
+[HEAD]: https://github.com/envylabs/rapporteur/compare/v3.7.0...master

data/Gemfile.lock

@@ -1,82 +1,94 @@
 PATH
   remote: .
   specs:
-    rapporteur (3.6.4)
+    rapporteur (3.7.0)
       i18n (>= 0.6, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activerecord-jdbc-adapter (52.1-java)
-      activerecord (~> 5.2.0)
-    activerecord-jdbcsqlite3-adapter (52.1-java)
-      activerecord-jdbc-adapter (= 52.1)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-jdbc-adapter (60.1-java)
+      activerecord (~> 6.0.0)
+    activerecord-jdbcsqlite3-adapter (60.1-java)
+      activerecord-jdbc-adapter (= 60.1)
       jdbc-sqlite3 (~> 3.8, < 3.30)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
     ast (2.4.0)
-    builder (3.2.3)
-    combustion (1.1.0)
+    builder (3.2.4)
+    combustion (1.1.2)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
     concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    crass (1.0.5)
     diff-lcs (1.3)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jar-dependencies (0.4.0)
-    jaro_winkler (1.5.2)
-    jaro_winkler (1.5.2-java)
-    jdbc-sqlite3 (3.20.1)
-    loofah (2.2.3)
+    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.4-java)
+    jdbc-sqlite3 (3.28.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -85,99 +97,105 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
     mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nio4r (2.3.1-java)
-    nokogiri (1.10.2)
+    minitest (5.13.0)
+    nio4r (2.5.2)
+    nio4r (2.5.2-java)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.2-java)
-    parallel (1.17.0)
-    parser (2.6.2.0)
+    nokogiri (1.10.7-java)
+    parallel (1.19.1)
+    parser (2.7.0.1)
       ast (~> 2.4.0)
-    psych (3.1.0)
-    psych (3.1.0-java)
-      jar-dependencies (>= 0.1.7)
-    rack (2.0.7)
+    rack (2.0.8)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 6.0.2.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
-    rake (12.3.2)
-    rspec-collection_matchers (1.1.3)
+    rake (13.0.1)
+    rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.66.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.78.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-rails_config (0.5.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    rubocop-rails (2.4.1)
+      rack (>= 1.1)
+      rubocop (>= 0.72.0)
+    rubocop-rails_config (0.9.0)
       railties (>= 3.0)
-      rubocop (~> 0.60)
-    ruby-progressbar (1.10.0)
-    sprockets (3.7.2)
+      rubocop (~> 0.77)
+      rubocop-performance (~> 1.3)
+      rubocop-rails (~> 2.0)
+    ruby-progressbar (1.10.1)
+    sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.0)
-    thor (0.20.3)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
-    websocket-driver (0.7.0)
+    unicode-display_width (1.6.0)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-driver (0.7.0-java)
+    websocket-driver (0.7.1-java)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   java
@@ -188,14 +206,14 @@ DEPENDENCIES
   appraisal (~> 2.1)
   bundler (~> 2.0)
   combustion (~> 1.0)
-  rails (>= 3.1, < 6)
-  rake (~> 12.0)
+  rails (>= 3.1, < 7)
+  rake (~> 13.0)
   rapporteur!
   rspec-collection_matchers (~> 1.0)
   rspec-rails (~> 3.2)
-  rubocop (~> 0.66.0)
-  rubocop-rails_config (~> 0.5.0)
+  rubocop (~> 0.78.0)
+  rubocop-rails_config (~> 0.9.0)
   sqlite3
 
 BUNDLED WITH
-   2.0.1
+   2.1.3

data/README.md

@@ -50,14 +50,15 @@ $ bundle install
 
 Supported Ruby versions:
 
+* MRI 2.7
 * MRI 2.6
 * MRI 2.5
 * MRI 2.4
 
 Supported frameworks:
 
-* Rails 5.x.
-* Rails 4.2+.
+* Rails 6.0.
+* Rails 5.2.
 * Sinatra 2.x.
 * Sinatra 1.x.
 

data/config/locales/en.yml

@@ -1,3 +1,5 @@
+---
+
 en:
   rapporteur:
     errors:

data/config/routes.rb

@@ -4,8 +4,12 @@ Rapporteur::Engine.routes.draw do
   get '/(.:format)', to: 'statuses#show', as: :status
 end
 
-unless Rails.application.routes.routes.any? { |r| (Rapporteur::Engine == r.app) || (r.app.respond_to?(:app) && Rapporteur::Engine == r.app.app) }
-  ActiveSupport::Deprecation.warn('Rapporteur was not explicitly mounted in your application. Please add an explicit mount call to your /config/routes.rb. Automatically mounted Rapporteur::Engine to /status for backward compatibility. This will be no longer automatically mount in Rapporteur 4.')
+explicitly_mounted = Rails.application.routes.routes.any? { |r|
+  (Rapporteur::Engine == r.app) || (r.app.respond_to?(:app) && Rapporteur::Engine == r.app.app)
+}
+
+unless explicitly_mounted
+  ActiveSupport::Deprecation.warn('Rapporteur was not explicitly mounted in your application. Please add an explicit mount call to your /config/routes.rb. Automatically mounted Rapporteur::Engine to /status for backward compatibility. This will be no longer automatically mount in Rapporteur 4.') # rubocop:disable Layout/LineLength
   Rails.application.routes.draw do
     mount Rapporteur::Engine, at: '/status'
   end

data/gemfiles/{rails5.0.gemfile → rails6.0.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-gem "sqlite3", "< 1.4", platforms: :ruby
-gem "rails", "~> 5.0.0"
+gem "sqlite3", platforms: :ruby
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/lib/rapporteur/checks/active_record_check.rb

@@ -5,7 +5,7 @@ module Rapporteur
     class ActiveRecordCheck
       def self.call(checker)
         ActiveRecord::Base.connection.select_value('SELECT current_time AS time')
-      rescue
+      rescue StandardError
         checker.add_error(:database, :unavailable)
       end
     end

data/lib/rapporteur/message_list.rb

@@ -75,9 +75,9 @@ module Rapporteur
     # Returns an Array containing Strings of messages.
     #
     def full_messages
-      @messages.map do |attribute, attribute_messages|
-        attribute_messages.collect { |message| "#{attribute} #{message}" }
-      end.flatten
+      @messages.map { |attribute, attribute_messages|
+        attribute_messages.map { |message| "#{attribute} #{message}" }
+      }.flatten
     end
 
     # Public: Returns the added attributes and their messages as a Hash, keyed
@@ -109,8 +109,9 @@ module Rapporteur
     private
 
     def generate_message(key, type, i18n_options)
-      I18n.translate(type, i18n_options.merge(default: [type, type.to_s],
-                                              scope: [:rapporteur, @list_type, key]))
+      I18n.translate(type,
+                     i18n_options.merge(default: [type, type.to_s],
+                                        scope:   [:rapporteur, @list_type, key]))
     end
 
     def normalize_message(attribute, message, i18n_options)

data/lib/rapporteur/revision.rb

@@ -36,7 +36,7 @@ module Rapporteur
     #
     def self.default_revision_source
       `git rev-parse HEAD 2>/dev/null`.strip
-    rescue
+    rescue StandardError
     end
 
     # Internal: Calculates the current revision from the configured revision

data/lib/rapporteur/rspec.rb

@@ -11,7 +11,7 @@ shared_examples_for 'a successful status response' do
 
   context 'the response headers' do
     it 'contains a Content-Type JSON header' do
-      expect(response.content_type).to(eq(Mime[:json]))
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'does not contain an ETag header' do
@@ -39,7 +39,7 @@ shared_examples_for 'an erred status response' do
 
   context 'the response headers' do
     it 'contains a Content-Type JSON header' do
-      expect(response.content_type).to(eq(Mime[:json]))
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'does not contain an ETag header' do
@@ -77,7 +77,7 @@ end
 RSpec::Matchers.define :include_status_message do |name, message|
   match do |response|
     @body = JSON.parse(response.body)
-    @body.key?(name) && @body.fetch(name).match(message)
+    @body.has_key?(name) && @body.fetch(name).match(message)
   end
 
   failure_message_for_should do |_actual|

data/lib/rapporteur/rspec3.rb

@@ -11,7 +11,7 @@ shared_examples_for 'a successful status response' do
 
   context 'the response headers' do
     it 'contains a Content-Type JSON header' do
-      expect(response.content_type).to(eq(Mime[:json]))
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'does not contain an ETag header' do
@@ -39,7 +39,7 @@ shared_examples_for 'an erred status response' do
 
   context 'the response headers' do
     it 'contains a Content-Type JSON header' do
-      expect(response.content_type).to(eq(Mime[:json]))
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'does not contain an ETag header' do
@@ -74,7 +74,7 @@ RSpec::Matchers.define :include_status_message do |name, message|
   match do |response|
     @body = JSON.parse(response.body)
 
-    @body.key?(name) && @body.fetch(name).match(message)
+    @body.has_key?(name) && @body.fetch(name).match(message)
   end
 
   failure_message do |_actual|

data/lib/rapporteur/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rapporteur
-  VERSION = '3.6.4'
+  VERSION = '3.7.0'
 end

data/rapporteur.gemspec

@@ -1,24 +1,22 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rapporteur/version'
+require_relative 'lib/rapporteur/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'rapporteur'
   spec.version       = Rapporteur::VERSION
-  spec.authors       = ['Envy Labs', 'Code School']
+  spec.authors       = ['Envy Labs']
   spec.email         = ['']
   spec.description   = 'An engine that provides common status polling endpoint.'
   spec.summary       = 'An engine that provides common status polling endpoint.'
   spec.homepage      = 'https://github.com/envylabs/rapporteur'
   spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 
   spec.metadata['source_code_uri'] = 'https://github.com/envylabs/rapporteur'
   spec.metadata['changelog_uri'] = 'https://github.com/envylabs/rapporteur/blob/master/CHANGELOG.md'
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
@@ -30,10 +28,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'appraisal', '~> 2.1'
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'combustion', '~> 1.0'
-  spec.add_development_dependency 'rails', '>= 3.1', '< 6'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rails', '>= 3.1', '< 7'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.66.0'
-  spec.add_development_dependency 'rubocop-rails_config', '~> 0.5.0'
+  spec.add_development_dependency 'rubocop', '~> 0.78.0'
+  spec.add_development_dependency 'rubocop-rails_config', '~> 0.9.0'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapporteur
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.7.0
 platform: ruby
 authors:
 - Envy Labs
-- Code School
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -82,7 +81,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,21 +91,21 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -141,28 +140,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: 0.78.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.9.0
 description: An engine that provides common status polling endpoint.
 email:
 - ''
@@ -174,6 +173,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- ".yamllint"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -188,9 +188,8 @@ files:
 - config.ru
 - config/locales/en.yml
 - config/routes.rb
-- gemfiles/rails5.0.gemfile
-- gemfiles/rails5.1.gemfile
 - gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
 - gemfiles/rails_latest.gemfile
 - gemfiles/sinatra2.x.gemfile
 - lib/rapporteur.rb
@@ -220,14 +219,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: An engine that provides common status polling endpoint.

data/gemfiles/rails5.1.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-gem "sqlite3", "< 1.4", platforms: :ruby
-gem "rails", "~> 5.1.0"
-
-gemspec path: "../"