coach 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f4c3a75e36f5a68ae2833e84b8bc6ccc45acbde8a137644fad05960620ae1d9
-  data.tar.gz: fcb6e844520cd5d19bcab21acc7b3e50b02708c3f750eb078dd52f844d09c3ae
+  metadata.gz: f314e7cc1779f326294cede2142167c325fd5182cc403b17dcdf2ffa4a0ab2f0
+  data.tar.gz: c29c7bc00999c22d65ed1da8268761ff1633f936e58e856dd9f2b3dad189ce80
 SHA512:
-  metadata.gz: c98ecef9fe5dc20158a6285c8d7f0c4c7bf0c9d7e1529c5c4a8c639cbab57a1cd17f3a43164eaffbd33c81441203904b899d282bebb55b280c3e544c2c9d4284
-  data.tar.gz: ef8d52b4fb9596707ee21f7e6908ed7bc2b47a242e7452b507e0c90efa84d5ce8b25b0f6b61a9722636d801b368c5318c06617ae796c65dfd619a599e461692c
+  metadata.gz: da2a45e51025660adc160604297d3614fea894b79b203be1ee8b337832281d59d4a4f8e3e4aa222209754251763cecced1e225a039921e9f8a979a2b741410e6
+  data.tar.gz: fc581d18446b2fbab925e49a4cb984d06d7112f1e90bde8dffb07ae124d0a061a9f6c107afd4addc1c8058ec5be503316d5a7437042b9d9c3ffbf602c6522af4

data/.circleci/config.yml

@@ -11,7 +11,7 @@ references:
     - type: cache-restore
       key: coach-bundler-{{ checksum "coach.gemspec" }}-{{ checksum "~/RAILS_VERSION.txt" }}
 
-    - run: gem install bundler
+    - run: gem install bundler -v 1.11.2
 
     - run: bundle install --path vendor/bundle
 
@@ -33,30 +33,6 @@ references:
 
     - run: bundle exec rubocop
 jobs:
-  build-ruby22-rails515:
-    docker:
-      - image: ruby:2.2
-        environment:
-          - RAILS_VERSION=5.1.5
-    steps: *steps
-  build-ruby22-rails4210:
-    docker:
-      - image: ruby:2.2
-        environment:
-          - RAILS_VERSION=4.2.10
-    steps: *steps
-  build-ruby23-rails515:
-    docker:
-      - image: ruby:2.3
-        environment:
-          - RAILS_VERSION=5.1.5
-    steps: *steps
-  build-ruby23-rails4210:
-    docker:
-      - image: ruby:2.3
-        environment:
-          - RAILS_VERSION=4.2.10
-    steps: *steps
   build-ruby24-rails515:
     docker:
       - image: ruby:2.4
@@ -86,10 +62,6 @@ workflows:
   version: 2
   tests:
     jobs:
-      - build-ruby22-rails515
-      - build-ruby22-rails4210
-      - build-ruby23-rails515
-      - build-ruby23-rails4210
       - build-ruby24-rails515
       - build-ruby24-rails4210
       - build-ruby25-rails515

data/.rubocop.yml

@@ -4,7 +4,10 @@ inherit_gem:
   gc_ruboconfig: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.4
+
+Metrics/MethodLength:
+  Max: 15
 
 Style/RescueStandardError:
   Exclude:

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # CHANGELOG
 
+# Unreleased
+
+No unreleased changes.
+
+# 2.0.0 / 2019-06-13
+
+## Breaking changes
+
+* [#70](https://github.com/gocardless/coach/pull/70) The following deprecated event names have been removed:
+  * `coach.handler.start`
+  * `coach.middleware.start`
+  * `coach.middleware.finish`
+  * `coach.handler.finish`
+  * `coach.request`
+
+* [#56](https://github.com/gocardless/coach/pull/56) Support for Ruby 2.2 and 2.3 has been
+  dropped. See our [compatibility policy](https://github.com/gocardless/coach/blob/master/docs/COMPATIBILITY.md) for more information.
+
+## Other changes
+
+* [#59](https://github.com/gocardless/coach/pull/59) Request data included in the
+  `request.coach` event includes a `session_ip` field which replaces the erroneously named
+  `session_id`. The latter is deprecated and will be removed in a future release.
+
+* [#60](https://github.com/gocardless/coach/pull/60) Add `Middleware.requires?`, which
+  behaves like `Middleware.provides?` but for requirements.
+
+* [#52](https://github.com/gocardless/coach/pull/52) Add `duration_seconds` to statistic
+  logging. The `duration` field is now deprecated and will be removed in a future release.
+
 # 1.0.0 / 2018-04-19
 
 ## Breaking changes

data/Gemfile

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-gem "gc_ruboconfig", "~> 2.3.4"
 gem "rails", "~> #{ENV['RAILS_VERSION']}" if ENV["RAILS_VERSION"]

data/README.md

@@ -1,7 +1,7 @@
 # Coach
 
 [![Gem Version](https://badge.fury.io/rb/coach.svg)](http://badge.fury.io/rb/coach)
-[![Build Status](https://travis-ci.org/gocardless/coach.svg?branch=master)](https://travis-ci.org/gocardless/coach)
+[![CircleCI](https://circleci.com/gh/gocardless/coach.svg?style=svg)](https://circleci.com/gh/gocardless/coach)
 [![Code Climate](https://codeclimate.com/github/gocardless/coach.svg)](https://codeclimate.com/github/gocardless/coach)
 
 Coach improves your controller code by encouraging:
@@ -13,6 +13,8 @@ Coach improves your controller code by encouraging:
 - **Testability** - Test each middleware in isolation, with effortless mocking of test
   data and natural RSpec matchers.
 
+For our policy on compatibility with Ruby and Rails versions, see [COMPATIBILITY.md](docs/COMPATIBILITY.md).
+
 # Installation
 
 To get started, just add Coach to your `Gemfile`, and then run `bundle`:
@@ -21,7 +23,7 @@ To get started, just add Coach to your `Gemfile`, and then run `bundle`:
 gem 'coach'
 ```
 
-Coach works with Ruby versions 2.2 and onwards.
+Coach works with Ruby versions 2.4 and onwards.
 
 ## Coach by example
 

data/coach.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "coach/version"
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/gocardless/coach"
   spec.email         = %w[developers@gocardless.com]
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.2"
+  spec.required_ruby_version = ">= 2.4"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.test_files    = spec.files.grep(%r{^spec/})
@@ -19,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionpack", ">= 4.2"
   spec.add_dependency "activesupport", ">= 4.2"
 
+  spec.add_development_dependency "gc_ruboconfig", "= 2.4.0"
   spec.add_development_dependency "pry", "~> 0.10"
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "rspec-its", "~> 1.2"
-  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.0"
 end

data/docs/COMPATIBILITY.md

@@ -0,0 +1,17 @@
+# Compatibility
+
+Our goal as Coach maintainers is for the library to be compatible with all supported versions of Ruby and Rails.
+
+Specifically, any CRuby/MRI version that has not received an End of Life notice ([e.g. this notice for Ruby 2.1](https://www.ruby-lang.org/en/news/2017/04/01/support-of-ruby-2-1-has-ended/)) is supported. Similarly, any version of Rails listed as currently supported on [this page](http://guides.rubyonrails.org/maintenance_policy.html) is one we aim to support in Coach.
+
+To that end, [our build matrix](../.circleci/config.yml) includes all these versions.
+
+Any time Coach doesn't work on a supported combination of Ruby and Rails, it's a bug, and can be reported [here](https://github.com/gocardless/coach/issues).
+
+# Deprecation
+
+Whenever a version of Ruby or Rails falls out of support, we will mirror that change in Coach by updating the build matrix and releasing a new major version.
+
+At that point, we will close any issues that only affect the unsupported version, and may choose to remove any workarounds from the code that are only necessary for the unsupported version.
+
+We will then bump the major version of Coach, to indicate the break in compatibility. Even if the new version of Coach happens to work on the unsupported version of Ruby or Rails, we consider compatibility to be broken at this point.

data/lib/coach.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support"
 require "action_dispatch"
 

data/lib/coach/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   module Errors
     class MiddlewareDependencyNotMet < StandardError

data/lib/coach/handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 require "active_support/core_ext/object/try"
 
@@ -8,10 +10,10 @@ module Coach
     def initialize(middleware, config = {})
       @root_item = MiddlewareItem.new(middleware, config)
       validate!
-    rescue Coach::Errors::MiddlewareDependencyNotMet => error
+    rescue Coach::Errors::MiddlewareDependencyNotMet => e
       # Remove noise of validation stack trace, reset to the handler callsite
-      error.backtrace.clear.concat(Thread.current.backtrace)
-      raise error
+      e.backtrace.clear.concat(Thread.current.backtrace)
+      raise e
     end
 
     # Run validation on the root of the middleware chain
@@ -28,8 +30,8 @@ module Coach
 
       event = build_event(context)
 
-      publish_start(event.dup)
-      instrumented_call(event) do
+      publish("start_handler.coach", event.dup)
+      instrument("finish_handler.coach", event) do
         begin
           response = chain.instrument.call
         ensure
@@ -87,28 +89,5 @@ module Coach
         request: context[:request],
       }
     end
-
-    def publish_start(event)
-      if notifier.listening?("coach.handler.start")
-        ActiveSupport::Deprecation.warn("The 'coach.handler.start' event has been " \
-          "renamed to 'start_handler.coach' and the old name will be removed in a " \
-          "future version.")
-        publish("coach.handler.start", event)
-      end
-      publish("start_handler.coach", event)
-    end
-
-    def instrumented_call(event, &block)
-      if notifier.listening?("coach.handler.finish")
-        ActiveSupport::Deprecation.warn("The 'coach.handler.find' event has been " \
-          "renamed to 'finish_handler.coach' and the old name will be removed in a " \
-          "future version.")
-        instrument("coach.handler.finish", event) do
-          instrument("finish_handler.coach", event, &block)
-        end
-      else
-        instrument("finish_handler.coach", event, &block)
-      end
-    end
   end
 end

data/lib/coach/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/middleware_item"
 
 module Coach
@@ -40,6 +42,10 @@ module Coach
       end
     end
 
+    def self.requires?(provision)
+      requirements.include?(provision)
+    end
+
     attr_reader :next_middleware, :config
 
     # Middleware gets access to a shared context, which is populated by other
@@ -73,14 +79,10 @@ module Coach
     # Use ActiveSupport to instrument the execution of the subsequent chain.
     def instrument
       proc do
-        publish_start
+        ActiveSupport::Notifications.publish("start_middleware.coach", middleware_event)
 
-        if ActiveSupport::Notifications.notifier.listening?("coach.middleware.finish")
-          instrument_deprecated { call }
-        else
-          ActiveSupport::Notifications.
-            instrument("finish_middleware.coach", middleware_event) { call }
-        end
+        ActiveSupport::Notifications.
+          instrument("finish_middleware.coach", middleware_event) { call }
       end
     end
 
@@ -106,28 +108,5 @@ module Coach
         request: request,
       }
     end
-
-    def publish_start
-      if ActiveSupport::Notifications.notifier.listening?("coach.middleware.start")
-        ActiveSupport::Deprecation.warn("The 'coach.middleware.start' event has " \
-          "been renamed to 'start_middleware.coach' and the old name will be " \
-          "removed in a future version.")
-        ActiveSupport::Notifications.
-          publish("coach.middleware.start", middleware_event)
-      end
-      ActiveSupport::Notifications.
-        publish("start_middleware.coach", middleware_event)
-    end
-
-    def instrument_deprecated(&block)
-      ActiveSupport::Deprecation.warn("The 'coach.middleware.finish' event has " \
-        "been renamed to 'finish_middleware.coach' and the old name will be " \
-        "removed in a future version.")
-      ActiveSupport::Notifications.
-        instrument("coach.middleware.finish", middleware_event) do
-        ActiveSupport::Notifications.
-          instrument("finish_middleware.coach", middleware_event, &block)
-      end
-    end
   end
 end

data/lib/coach/middleware_item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 require "coach/middleware_validator"
 
@@ -13,7 +15,7 @@ module Coach
     def build_middleware(context, successor)
       @middleware.
         new(context,
-            successor && successor.instrument,
+            successor&.instrument,
             config)
     end
 

data/lib/coach/middleware_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/errors"
 
 module Coach

data/lib/coach/notifications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "request_benchmark"
 require_relative "request_serializer"
 
@@ -43,6 +45,7 @@ module Coach
 
     def unsubscribe!
       return unless active?
+
       while @subscriptions.any?
         ActiveSupport::Notifications.unsubscribe(@subscriptions.pop)
       end
@@ -63,15 +66,13 @@ module Coach
     end
 
     def subscribe(event, &block)
-      # New key formats don't include a period. If they do, they're the old deprecated
-      # format. No need to warn here since the warnings will show up from elsewhere.
-      key = event.include?(".") ? "coach.#{event}" : "#{event}.coach"
-      ActiveSupport::Notifications.subscribe(key, &block)
+      ActiveSupport::Notifications.subscribe("#{event}.coach", &block)
     end
 
     def log_middleware_finish(event, start, finish)
       benchmark_for_request = @benchmarks[event[:request].uuid]
       return unless benchmark_for_request.present?
+
       benchmark_for_request.notify(event[:middleware], start, finish)
     end
 
@@ -87,11 +88,6 @@ module Coach
       serialized = RequestSerializer.new(event[:request]).serialize.
         merge(benchmark.stats).
         merge(event.slice(:response, :metadata))
-      if ActiveSupport::Notifications.notifier.listening?("coach.request")
-        ActiveSupport::Deprecation.warn("The 'coach.request' event has been renamed " \
-          "to 'request.coach' and the old name will be removed in a future version.")
-        ActiveSupport::Notifications.publish("coach.request", serialized)
-      end
       ActiveSupport::Notifications.publish("request.coach", serialized)
     end
   end

data/lib/coach/request_benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   # This class is built to aggregate data during the course of the request. It relies on
   # 'start_middleware.coach' and 'finish_middleware.coach' events to register the
@@ -32,8 +34,13 @@ module Coach
         endpoint_name: @endpoint_name,
         started_at: @start,
         duration: format_ms(@duration),
+        duration_seconds: @duration,
         chain: sorted_chain.map do |event|
-          { name: event[:name], duration: format_ms(event[:duration]) }
+          {
+            name: event[:name],
+            duration: format_ms(event[:duration]),
+            duration_seconds: event[:duration],
+          }
         end,
       }
     end

data/lib/coach/request_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
   class RequestSerializer
     def self.header_rules
@@ -14,6 +16,7 @@ module Coach
     # Applies sanitizing rules. Expects `header` to be in 'http_header_name' form.
     def self.apply_header_rule(header, value)
       return value if header_rules[header].nil?
+
       header_rules[header].call(value)
     end
 
@@ -39,7 +42,8 @@ module Coach
 
         # Extra request info
         headers: filtered_headers,
-        session_id: @request.remote_ip,
+        session_id: @request.remote_ip, # TODO: remove in a future release
+        session_ip: @request.remote_ip,
       }
     end
 
@@ -54,6 +58,7 @@ module Coach
     def filtered_headers
       header_value_pairs = @request.filtered_env.map do |key, value|
         next unless key =~ /^HTTP_/
+
         [key.downcase, self.class.apply_header_rule(key.downcase, value)]
       end.compact
 

data/lib/coach/router.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require_relative "handler"
 require_relative "errors"
 
 module Coach
   class Router
     ACTION_TRAITS = {
-      index:   { method: :get },
-      show:    { method: :get, url: ":id" },
-      create:  { method: :post },
-      update:  { method: :put, url: ":id" },
+      index: { method: :get },
+      show: { method: :get, url: ":id" },
+      create: { method: :post },
+      update: { method: :put, url: ":id" },
       destroy: { method: :delete, url: ":id" },
     }.each_value(&:freeze).freeze
 

data/lib/coach/rspec.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require "rspec/expectations"
 require "coach/middleware"
 
 # Middleware stubbing ######################################
 
-# rubocop:disable Metrics/MethodLength
 # rubocop:disable Metrics/AbcSize
 def build_middleware(name)
   Class.new(Coach::Middleware) do
@@ -28,7 +29,6 @@ def build_middleware(name)
   end
 end
 # rubocop:enable Metrics/AbcSize
-# rubocop:enable Metrics/MethodLength
 
 def null_middleware
   double(call: nil)

data/lib/coach/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Coach
-  VERSION = "1.0.0".freeze
+  VERSION = "2.0.0"
 end

data/spec/lib/coach/handler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "coach/handler"
@@ -123,27 +125,25 @@ describe Coach::Handler do
     before { terminal_middleware.uses(middleware_a) }
 
     describe "notifications" do
-      before do
-        Coach::Notifications.subscribe!
-
-        # Prevent RequestSerializer from erroring due to insufficient request mock
-        allow(Coach::RequestSerializer).
-          to receive(:new).
-          and_return(instance_double("Coach::RequestSerializer", serialize: {}))
-      end
-
       subject(:coach_events) do
         events = []
         subscription = ActiveSupport::Notifications.
-          subscribe(/\.coach$/) do |name, *_args|
-          events << name
-        end
+          subscribe(/\.coach$/) { |name, *_args| events << name }
 
         handler.call({})
         ActiveSupport::Notifications.unsubscribe(subscription)
         events
       end
 
+      before do
+        Coach::Notifications.subscribe!
+
+        # Prevent RequestSerializer from erroring due to insufficient request mock
+        allow(Coach::RequestSerializer).
+          to receive(:new).
+          and_return(instance_double("Coach::RequestSerializer", serialize: {}))
+      end
+
       it { is_expected.to include("start_handler.coach") }
       it { is_expected.to include("start_middleware.coach") }
       it { is_expected.to include("request.coach") }
@@ -160,7 +160,7 @@ describe Coach::Handler do
 
           begin
             handler.call({})
-          rescue
+          rescue StandardError
             :continue_anyway
           end
           ActiveSupport::Notifications.unsubscribe(subscription)
@@ -172,7 +172,7 @@ describe Coach::Handler do
         before { terminal_middleware.uses(middleware_a, callback: explosive_action) }
 
         it "captures the error event with the metadata" do
-          is_expected.
+          expect(coach_events).
             to include(["finish_handler.coach", hash_including(
               response: { status: 500 },
               metadata: { A: true },
@@ -183,72 +183,6 @@ describe Coach::Handler do
           expect { handler.call({}) }.to raise_error(StandardError, "AH")
         end
       end
-
-      context "deprecations" do
-        subject(:coach_events) do
-          events = []
-          subscription = ActiveSupport::Notifications.
-            subscribe(/^coach\./) do |name, *_args|
-            events << name
-          end
-
-          handler.call({})
-          ActiveSupport::Notifications.unsubscribe(subscription)
-          events
-        end
-
-        let!(:deprecations_silenced) do
-          ActiveSupport::Deprecation.silenced
-        end
-
-        before do
-          ActiveSupport::Deprecation.silenced = true
-        end
-
-        after do
-          ActiveSupport::Deprecation.silenced = deprecations_silenced
-        end
-
-        it { is_expected.to include("coach.handler.start") }
-        it { is_expected.to include("coach.middleware.start") }
-        it { is_expected.to include("coach.request") }
-        it { is_expected.to include("coach.middleware.finish") }
-        it { is_expected.to include("coach.handler.finish") }
-
-        context "when an exception is raised in the chain" do
-          subject(:coach_events) do
-            events = []
-            subscription = ActiveSupport::Notifications.
-              subscribe(/^coach\./) do |name, *args|
-              events << [name, args.last]
-            end
-
-            begin
-              handler.call({})
-            rescue
-              :continue_anyway
-            end
-            ActiveSupport::Notifications.unsubscribe(subscription)
-            events
-          end
-
-          let(:explosive_action) { -> { raise "AH" } }
-
-          before { terminal_middleware.uses(middleware_a, callback: explosive_action) }
-
-          it "captures the error event with the metadata" do
-            is_expected.
-              to include(["coach.handler.finish", hash_including(
-                response: { status: 500 },
-                metadata: { A: true },
-              )])
-          end
-
-          it "bubbles the error to the next handler" do
-            expect { handler.call({}) }.to raise_error(StandardError, "AH")
-          end
-        end
-      end
     end
   end
 

data/spec/lib/coach/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "coach/middleware"
 
 describe Coach::Middleware do
@@ -35,6 +37,29 @@ describe Coach::Middleware do
     end
   end
 
+  describe ".requires?" do
+    context "given names it does require" do
+      before { middleware_class.requires(:foo, :bar) }
+
+      it "returns true" do
+        # rubocop:disable RSpec/PredicateMatcher
+        expect(middleware_class.requires?(:foo)).to be_truthy
+        expect(middleware_class.requires?(:bar)).to be_truthy
+        # rubocop:enable RSpec/PredicateMatcher
+      end
+    end
+
+    context "given names it doesn't require" do
+      before { middleware_class.requires(:foo) }
+
+      it "returns false" do
+        # rubocop:disable RSpec/PredicateMatcher
+        expect(middleware_class.requires?(:bar)).to be_falsy
+        # rubocop:enable RSpec/PredicateMatcher
+      end
+    end
+  end
+
   describe "#provide" do
     before { middleware_class.provides(:foo) }
 

data/spec/lib/coach/middleware_validator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/middleware_validator"
 
@@ -37,6 +39,7 @@ describe Coach::MiddlewareValidator do
           head_middleware.requires :c
           middleware_c.provides :c
         end
+
         it { is_expected.to_not raise_error }
       end
 
@@ -48,6 +51,7 @@ describe Coach::MiddlewareValidator do
           middleware_a.provides :a
           middleware_b.requires :a
         end
+
         it { is_expected.to_not raise_error }
       end
     end

data/spec/lib/coach/notifications_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/notifications"
 

data/spec/lib/coach/request_benchmark_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "coach/request_benchmark"
 
@@ -24,6 +26,7 @@ describe Coach::RequestBenchmark do
 
     it "computes overall duration" do
       expect(stats[:duration]).to eq(5000)
+      expect(stats[:duration_seconds]).to eq(5.0)
     end
 
     it "captures the endpoint_name" do
@@ -35,11 +38,11 @@ describe Coach::RequestBenchmark do
     end
 
     it "computes duration of middleware with no children" do
-      expect(stats[:chain]).to include(name: "B", duration: 1000)
+      expect(stats[:chain]).to include(name: "B", duration: 1000, duration_seconds: 1.0)
     end
 
     it "adjusts duration of middleware for their children" do
-      expect(stats[:chain]).to include(name: "A", duration: 2000)
+      expect(stats[:chain]).to include(name: "A", duration: 2000, duration_seconds: 2.0)
     end
 
     it "correctly orders chain" do

data/spec/lib/coach/request_serializer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 require "active_support/core_ext/object/try"
 require "coach/request_serializer"
@@ -40,12 +42,12 @@ describe Coach::RequestSerializer do
       subject(:request_serializer) { described_class.new(mock_request) }
 
       let(:mock_request) do
-        instance_double("ActionDispatch::Request", format:              nil,
-                                                   remote_ip:           nil,
-                                                   uuid:                nil,
-                                                   method:              nil,
+        instance_double("ActionDispatch::Request", format: nil,
+                                                   remote_ip: nil,
+                                                   uuid: nil,
+                                                   method: nil,
                                                    filtered_parameters: nil,
-                                                   filtered_env:        {
+                                                   filtered_env: {
                                                      "foo" => "bar",
                                                      "HTTP_foo" => "bar",
                                                    })

data/spec/lib/coach/router_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "coach/router"

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/its"
 require "pry"
 require "coach"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coach
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: gc_ruboconfig
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 description: 
 email:
 - developers@gocardless.com
@@ -111,6 +125,7 @@ files:
 - LICENSE.txt
 - README.md
 - coach.gemspec
+- docs/COMPATIBILITY.md
 - lib/coach.rb
 - lib/coach/errors.rb
 - lib/coach/handler.rb
@@ -143,15 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Alternative controllers built with middleware