rapporteur 3.6.1 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0ef74bb8c678f77be9dbad7aa078ab01e363d0588edd10d310dd7faebd4a14
-  data.tar.gz: cf5d2636d5922c5ca0d9afe2fa23508b1a0866d96890daa069dd1c88919e5bf3
+  metadata.gz: 13df72850687b6ffa72963ce159ff997d179474286830ad88310b2b07814d6dd
+  data.tar.gz: ae411b54da99569ee45f64ae7bf2dc93fa3c8a7e9a2716d3f164bec0eb9f60b3
 SHA512:
-  metadata.gz: 4592348f579f226daac44efc57c5be1351481ee743494531fa7c4dde78db1354b584651e926879c7e275462567f8d77f2c995ec53c5fad7dbc3a91f31063410e
-  data.tar.gz: 06e560141febd75c535f6f61b318b8b4d6e606799809f02a5b91997c69989154156a0e4238bbef31c60269194e8e3b2ecbb3ff8cfa87f37e62e68eea0e888be0
+  metadata.gz: 72f94494414402a9ef91a9951d8d9b7107e0123c0fcb65acfa72ad053ad1f5fce83f2d3874a7853e4d106ca38b91a2c9b90d05eea1372c364e2fdcdbeff29585
+  data.tar.gz: bb4e61342c23fa507f7900aeefd9be487c2257979ea48a31d556ebe299b32df2c9e87e3c623e9e0fd72de9b843e4d9e457c7093f7352f0ed58d8efe72389fbb1

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /gemfiles/*.lock
 /gemfiles/.bundle/
 /_yardoc/

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --format progress
+--require spec_helper
 --warnings

data/.rubocop.yml

@@ -0,0 +1,27 @@
+---
+
+inherit_gem:
+  rubocop-rails_config:
+    - "config/rails.yml"
+
+AllCops:
+  Exclude:
+    - 'gemfiles/*'
+    - 'gemfiles/**/*'
+    - 'vendor/**/*'
+  TargetRubyVersion: 2.5
+
+Layout/CaseIndentation:
+  EnforcedStyle: "end"
+
+Layout/EmptyLinesAroundAccessModifier:
+  EnforcedStyle: "around"
+
+Layout/EndOfLine:
+  EnforcedStyle: "lf"
+
+Layout/IndentationConsistency:
+  EnforcedStyle: "normal"
+
+Style/StringLiterals:
+  EnforcedStyle: "single_quotes"

data/.travis.yml

@@ -1,17 +1,54 @@
-before_install: gem install bundler -v 1.15.1
-cache: bundler
-gemfile:
-  - gemfiles/rails4.2.x.gemfile
-  - gemfiles/rails5.x.gemfile
-  - gemfiles/sinatra1.x.gemfile
-  - gemfiles/sinatra2.x.gemfile
-language: ruby
-matrix:
-  fast_finish: true
+---
+
+before_install:
+  - "gem install bundler -v 2.1.3"
+branches:
+  only:
+    - "master"
+    - '/^v\d+\.\d+\.\d+/'
+cache:
+  bundler: true
+dist: "bionic"
+install:
+  - "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
+jobs:
+  fail_fast: true
+  include:
+    - rvm: "2.7.1"
+      stage: "Test"
+
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.7.1"
+      stage: "Latest Rails Release"
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.6.6"
+    - gemfile: "gemfiles/rails_latest.gemfile"
+      rvm: "2.5.8"
+
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.7.1"
+      stage: "Additinal Rails Tests"
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.6.6"
+    - gemfile: "gemfiles/rails6.0.gemfile"
+      rvm: "2.5.8"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.7.1"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.6.6"
+    - gemfile: "gemfiles/rails5.2.gemfile"
+      rvm: "2.5.8"
+
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.7.1"
+      stage: "Sinatra 2.x Release"
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.6.6"
+    - gemfile: "gemfiles/sinatra2.x.gemfile"
+      rvm: "2.5.8"
+language: "ruby"
 notifications:
   email: false
-rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-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,15 +1,16 @@
 # frozen_string_literal: true
 
-appraise 'rails4.2.x' do
-  gem 'railties', '~> 4.2.0'
+appraise 'rails5.2' do
+  gem 'rails', '~> 5.2.0'
+  gem 'sqlite3', '< 1.4', platforms: :ruby
 end
 
-appraise 'rails5.x' do
-  gem 'railties', '~> 5.0'
+appraise 'rails6.0' do
+  gem 'rails', '~> 6.0.0'
 end
 
-appraise 'sinatra1.x' do
-  gem 'sinatra', '~> 1.4'
+appraise 'rails-latest' do
+  gem 'rails'
 end
 
 appraise 'sinatra2.x' do

data/CHANGELOG.md

@@ -2,14 +2,34 @@
 
 [![Gem Version](http://img.shields.io/gem/v/rapporteur.svg?style=flat)](http://rubygems.org/gems/rapporteur)
 [![Build Status](http://img.shields.io/travis/envylabs/rapporteur/master.svg?style=flat)](https://travis-ci.org/envylabs/rapporteur)
-[![Code Climate](http://img.shields.io/codeclimate/github/envylabs/rapporteur.svg?style=flat)](https://codeclimate.com/github/envylabs/rapporteur)
-[![Dependency Status](https://gemnasium.com/envylabs/rapporteur.svg)](https://gemnasium.com/envylabs/rapporteur)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8c498efff627b93db4b9/maintainability)](https://codeclimate.com/github/envylabs/rapporteur/maintainability)
 [![Inline docs](http://inch-ci.org/github/envylabs/rapporteur.svg?branch=master)](http://inch-ci.org/github/envylabs/rapporteur)
 
 ## [HEAD][] / unreleased
 
 * No significant changes.
 
+## [3.7.1][] / 2020-09-25
+
+* Fix a Ruby 2.7 keyword argument deprecation warning in MessageList.
+
+## [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.
+
+## [3.6.3][] / 2018-10-03
+
+* Ensure the `Rapporteur::ApplicationController` is loaded and utilized.
+
+## [3.6.2][] / 2018-09-11
+
+* Allow i18n 1.x versions as a dependency.
+
 ## [3.6.1][] / 2018-05-20
 
 * Convert Checker#messages and #errors into Thread-local variables. See
@@ -173,4 +193,9 @@
 [3.5.1]: https://github.com/envylabs/rapporteur/compare/v3.5.0...v3.5.1
 [3.6.0]: https://github.com/envylabs/rapporteur/compare/v3.5.1...v3.6.0
 [3.6.1]: https://github.com/envylabs/rapporteur/compare/v3.6.0...v3.6.1
-[HEAD]: https://github.com/envylabs/rapporteur/compare/v3.6.1...master
+[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
+[3.7.0]: https://github.com/envylabs/rapporteur/compare/v3.6.4...v3.7.0
+[3.7.1]: https://github.com/envylabs/rapporteur/compare/v3.7.0...v3.7.1
+[HEAD]: https://github.com/envylabs/rapporteur/compare/v3.7.1...master

data/Gemfile.lock

@@ -0,0 +1,225 @@
+PATH
+  remote: .
+  specs:
+    rapporteur (3.7.1)
+      i18n (>= 0.6, < 2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.3.3)
+      actionview (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.3)
+      activesupport (= 6.0.3.3)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.3)
+      activesupport (= 6.0.3.3)
+      globalid (>= 0.3.6)
+    activemodel (6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord (6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+    activerecord-jdbc-adapter (60.2-java)
+      activerecord (~> 6.0.0)
+    activerecord-jdbcsqlite3-adapter (60.2-java)
+      activerecord-jdbc-adapter (= 60.2)
+      jdbc-sqlite3 (~> 3.8, < 3.30)
+    activestorage (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      marcel (~> 0.3.1)
+    activesupport (6.0.3.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    appraisal (2.3.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    combustion (1.3.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+      thor (>= 0.14.6)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jdbc-sqlite3 (3.28.0)
+    loofah (2.7.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nio4r (2.5.4-java)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.10-java)
+    parallel (1.19.2)
+    parser (2.7.1.5)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.3.3)
+      actioncable (= 6.0.3.3)
+      actionmailbox (= 6.0.3.3)
+      actionmailer (= 6.0.3.3)
+      actionpack (= 6.0.3.3)
+      actiontext (= 6.0.3.3)
+      actionview (= 6.0.3.3)
+      activejob (= 6.0.3.3)
+      activemodel (= 6.0.3.3)
+      activerecord (= 6.0.3.3)
+      activestorage (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      bundler (>= 1.3.0)
+      railties (= 6.0.3.3)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.3)
+      actionpack (= 6.0.3.3)
+      activesupport (= 6.0.3.3)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.8.0)
+    rexml (3.2.4)
+    rspec-collection_matchers (1.2.0)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.3)
+    rubocop (0.92.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.5)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.5.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.5.0)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.8.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.87.0)
+    rubocop-rails_config (0.12.6)
+      railties (>= 5.0)
+      rubocop (~> 0.82)
+      rubocop-performance (~> 1.3)
+      rubocop-rails (~> 2.0)
+    ruby-progressbar (1.10.1)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    websocket-driver (0.7.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.7.3-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
+  appraisal (~> 2.1)
+  bundler (~> 2.0)
+  combustion (~> 1.0)
+  rails (>= 3.1, < 7)
+  rake (~> 13.0)
+  rapporteur!
+  rspec-collection_matchers (~> 1.0)
+  rspec-rails (~> 4.0)
+  rubocop (~> 0.92.0)
+  rubocop-rails_config (~> 0.12.0)
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/README.md

@@ -2,8 +2,7 @@
 
 [![Gem Version](http://img.shields.io/gem/v/rapporteur.svg?style=flat)](http://rubygems.org/gems/rapporteur)
 [![Build Status](http://img.shields.io/travis/envylabs/rapporteur/master.svg?style=flat)](https://travis-ci.org/envylabs/rapporteur)
-[![Code Climate](http://img.shields.io/codeclimate/github/envylabs/rapporteur.svg?style=flat)](https://codeclimate.com/github/envylabs/rapporteur)
-[![Dependency Status](https://gemnasium.com/envylabs/rapporteur.svg)](https://gemnasium.com/envylabs/rapporteur)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8c498efff627b93db4b9/maintainability)](https://codeclimate.com/github/envylabs/rapporteur/maintainability)
 [![Inline docs](http://inch-ci.org/github/envylabs/rapporteur.svg?branch=master)](http://inch-ci.org/github/envylabs/rapporteur)
 
 
@@ -49,21 +48,14 @@ $ bundle install
 
 ### Supported environments
 
-Supported Ruby versions:
+This library follows the maintenance policy of
+[Ruby](https://www.ruby-lang.org/en/downloads/branches/),
+[Ruby on Rails](https://guides.rubyonrails.org/maintenance_policy.html), and
+[Sinatra](https://github.com/sinatra/sinatra/blob/master/MAINTENANCE.md) for
+testing and maintaining these environments.
 
-* MRI 2.4
-* MRI 2.3
-* MRI 2.2
-
-Supported frameworks:
-
-* Rails 5.x.
-* Rails 4.2+.
-* Sinatra 2.x.
-* Sinatra 1.x.
-
-Older versions of Ruby and frameworks may also work with this library, however
-they are not officially supported.
+Unsupported versions of Ruby, Ruby on Rails, or Sinatra may also work with this
+library, however they are not officially supported or tested against.
 
 ## Usage
 

data/app/controllers/rapporteur/statuses_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'application_controller'
+
 module Rapporteur
   class StatusesController < ApplicationController
     def show

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/{rails4.2.x.gemfile → rails5.2.gemfile}

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

data/gemfiles/{sinatra1.x.gemfile → rails6.0.gemfile}

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 gem "sqlite3", platforms: :ruby
-gem "sinatra", "~> 1.4"
+gem "rails", "~> 6.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails5.x.gemfile → rails_latest.gemfile}

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 gem "sqlite3", platforms: :ruby
-gem "railties", "~> 5.0"
+gem "rails"
 
 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
@@ -98,10 +98,10 @@ module Rapporteur
       hash = {}
       @messages.each_pair do |key, value|
         hash[key] = if value.size == 1
-                      value.first
-                    else
-                      value.to_a
-                    end
+          value.first
+        else
+          value.to_a
+        end
       end
       hash
     end
@@ -109,8 +109,7 @@ 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,15 +11,11 @@ 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]))
-    end
-
-    it 'does not contain an ETag header' do
-      expect(response.headers).not_to have_key('ETag')
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'contains a Cache-Control header which disables client caching' do
-      expect(response.headers.fetch('Cache-Control')).to eq('no-cache')
+      expect(response.headers.fetch('Cache-Control')).to include('no-cache')
     end
   end
 
@@ -39,15 +35,11 @@ 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]))
-    end
-
-    it 'does not contain an ETag header' do
-      expect(response.headers).not_to have_key('ETag')
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'contains a Cache-Control header which disables client caching' do
-      expect(response.headers.fetch('Cache-Control')).to eq('no-cache')
+      expect(response.headers.fetch('Cache-Control')).to include('no-cache')
     end
   end
 
@@ -77,7 +69,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,15 +11,11 @@ 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]))
-    end
-
-    it 'does not contain an ETag header' do
-      expect(response.headers).not_to have_key('ETag')
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'contains a Cache-Control header which disables client caching' do
-      expect(response.headers.fetch('Cache-Control')).to eq('no-cache')
+      expect(response.headers.fetch('Cache-Control')).to include('no-cache')
     end
   end
 
@@ -39,15 +35,11 @@ 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]))
-    end
-
-    it 'does not contain an ETag header' do
-      expect(response.headers).not_to have_key('ETag')
+      expect(response.media_type).to(eq(Mime[:json]))
     end
 
     it 'contains a Cache-Control header which disables client caching' do
-      expect(response.headers.fetch('Cache-Control')).to eq('no-cache')
+      expect(response.headers.fetch('Cache-Control')).to include('no-cache')
     end
   end
 
@@ -74,7 +66,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.1'
+  VERSION = '3.7.1'
 end

data/rapporteur.gemspec

@@ -1,34 +1,37 @@
-# 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.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+  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(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'i18n', '~> 0.6'
+  spec.add_dependency 'i18n', '>= 0.6', '< 2'
 
   spec.add_development_dependency 'appraisal', '~> 2.1'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'combustion', '~> 0.5', '>= 0.5.1'
-  spec.add_development_dependency 'rails', '>= 3.1', '< 6'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'combustion', '~> 1.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 'rspec-rails', '~> 4.0'
+  spec.add_development_dependency 'rubocop', '~> 0.92.0'
+  spec.add_development_dependency 'rubocop-rails_config', '~> 0.12.0'
 end

metadata

@@ -1,30 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rapporteur
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.1
 platform: ruby
 authors:
 - Envy Labs
-- Code School
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -45,34 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -127,14 +126,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.92.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.92.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description: An engine that provides common status polling endpoint.
 email:
 - ''
@@ -144,10 +171,13 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
+- ".yamllint"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -158,9 +188,9 @@ files:
 - config.ru
 - config/locales/en.yml
 - config/routes.rb
-- gemfiles/rails4.2.x.gemfile
-- gemfiles/rails5.x.gemfile
-- gemfiles/sinatra1.x.gemfile
+- gemfiles/rails5.2.gemfile
+- gemfiles/rails6.0.gemfile
+- gemfiles/rails_latest.gemfile
 - gemfiles/sinatra2.x.gemfile
 - lib/rapporteur.rb
 - lib/rapporteur/check_list.rb
@@ -178,8 +208,10 @@ files:
 homepage: https://github.com/envylabs/rapporteur
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/envylabs/rapporteur
+  changelog_uri: https://github.com/envylabs/rapporteur/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -187,16 +219,15 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An engine that provides common status polling endpoint.
 test_files: []