coach 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee62dd79b30b026f6b147715cfd69e5a06b0dab0
-  data.tar.gz: 7dea56a9d5e873925093698fee383b800e62d82d
+  metadata.gz: e57234c99f6622d05b93fed13fb589250cab7082
+  data.tar.gz: 950d40743209a397c5509438b2056a9aa06e16ce
 SHA512:
-  metadata.gz: 4229b86085230cc2e464f8e02aca5cf8a3723964a36e59d63d6595fca067fff9a687559595c41bfae1bf08e3aca046cddc10599ad146448d7cb45ef2c1b3a9c3
-  data.tar.gz: 1ba51dd6d4fb775e834ed94dbda5e0b372313c6d8d0890221b2ab462f7c34dc3c9000bd19ef79748e62408547b0658b5b3151e61c26851138c7779504caed4f2
+  metadata.gz: 926d433306e25f0aba99f433a491b135e17405da467b5baaf36466d96929aeb7fc42204321b88ca74855e1a01dbe7f158b16474cfe905ce6ba3a3a259f2a93f1
+  data.tar.gz: 1b79b97214372ffa5411cd6c94d165af8efee424a4cf3542b0e91755ea34bac765d1f9873ad4e1584dd2f02ca4f17cf8f9557e958cbe1b71838792b4f67ab49f

data/.rubocop.yml

@@ -4,27 +4,14 @@
 LineLength:
   Max: 90
 
-ClassLength:
-  Enabled: false
-
-ModuleLength:
-  Enabled: false
-
 # Avoid methods longer than 30 lines of code
 MethodLength:
   CountComments: false  # count full line comments?
-  Max: 87
-
-# Avoid single-line methods.
-SingleLineMethods:
-  AllowIfMethodIsEmpty: true
+  Max: 16
 
 StringLiterals:
   Enabled: false
 
-GlobalVars:
-  Enabled: false # We use them Redis + StatsD (though maybe we shouldn't?)
-
 # Wants underscores in all large numbers. Pain in the ass for things like
 # unix timestamps.
 NumericLiterals:
@@ -39,7 +26,7 @@ Style/SignalException:
   EnforcedStyle: 'only_raise'
 
 # Use trailing rather than leading dots on multi-line call chains
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 Lint/NestedMethodDefinition:
@@ -65,7 +52,7 @@ Style/AsciiComments:
   Enabled: false
 
 # Configuration parameters: EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle, SupportedLastArgumentHashStyles.
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: false
 
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
@@ -76,7 +63,7 @@ Style/BlockDelimiters:
 Style/ClassAndModuleChildren:
   Enabled: false
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
 # Configuration parameters: Keywords.
@@ -94,14 +81,14 @@ Style/GuardClause:
   Enabled: false
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: false
 
 Style/Lambda:
   Enabled: false
 
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: false
 
 # Configuration parameters: NamePrefix, NamePrefixBlacklist.
@@ -111,13 +98,17 @@ Style/PredicateName:
 Style/RedundantSelf:
   Enabled: false
 
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 
 # Configuration parameters: MultiSpaceAllowedForOperators.
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: false
 
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, Whitelist.
 Style/TrivialAccessors:
   Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Unreleased changes
+
+# 0.4.6
+
+* [https://github.com/gocardless/coach/pull/22](#22) Publish ActiveSupport notifications
+  even on errors
+
 # 0.4.5 / 2017-04-26
 
 * [https://github.com/gocardless/coach/pull/17] Only require rspec/expectations

data/README.md

@@ -152,6 +152,7 @@ class Logger < Coach::Middleware
   def call
     # Logs the incoming request path, with a configured prefix
     Rails.logger.info("[#{config[:prefix]}] - #{request.path}")
+    next_middleware.call
   end
 end
 

data/coach.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'coach/version'
@@ -8,9 +9,9 @@ Gem::Specification.new do |spec|
   spec.version       = Coach::VERSION
   spec.summary       = 'coach middleware'
   spec.description   = 'Controller framework'
-  spec.authors       = %w(GoCardless)
+  spec.authors       = %w[GoCardless]
   spec.homepage      = "https://github.com/gocardless/coach"
-  spec.email         = %w(developers@gocardless.com)
+  spec.email         = %w[developers@gocardless.com]
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -23,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rubocop', '~> 0.32.0'
+  spec.add_development_dependency 'rubocop', '~> 0.49.1'
 end

data/lib/coach/handler.rb

@@ -2,6 +2,8 @@ require "coach/errors"
 
 module Coach
   class Handler
+    STATUS_CODE_FOR_EXCEPTIONS = 500
+
     def initialize(middleware, config = {})
       @root_item = MiddlewareItem.new(middleware, config)
       validate!
@@ -25,16 +27,17 @@ module Coach
       start = Time.now
 
       publish('coach.handler.start', start_event.dup)
-      response = chain.instrument.call
-
-      finish = Time.now
-      publish('coach.handler.finish',
-              start, finish, nil,
-              start_event.
-                merge(response: { status: response[0] },
-                      metadata: context.fetch(:_metadata, {})))
 
-      response
+      begin
+        response = chain.instrument.call
+      ensure
+        status = response.try(:first) || STATUS_CODE_FOR_EXCEPTIONS
+        publish('coach.handler.finish', start, Time.now, nil,
+                start_event.merge(
+                  response: { status: status },
+                  metadata: context.fetch(:_metadata, {})
+                ))
+      end
     end
 
     # Traverse the middlware tree to build a linear middleware sequence,

data/lib/coach/notifications.rb

@@ -32,11 +32,11 @@ module Coach
         @benchmarks[event[:request].uuid] = RequestBenchmark.new(event[:middleware])
       end
 
-      @subscriptions << subscribe('middleware.finish') do |name, start, finish, _, event|
+      @subscriptions << subscribe('middleware.finish') do |_name, start, finish, _, event|
         log_middleware_finish(event, start, finish)
       end
 
-      @subscriptions << subscribe('handler.finish') do |name, start, finish, _, event|
+      @subscriptions << subscribe('handler.finish') do |_name, start, finish, _, event|
         log_handler_finish(event, start, finish)
       end
     end

data/lib/coach/version.rb

@@ -1,3 +1,3 @@
 module Coach
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.4.6'.freeze
 end

data/spec/lib/coach/handler_spec.rb

@@ -26,7 +26,7 @@ describe Coach::Handler do
       result = handler.call({})
       expect(a_spy).to have_received(:call)
       expect(b_spy).to have_received(:call)
-      expect(result).to eq(%w(A{} B{} Terminal{:handler=>true}))
+      expect(result).to eq(%w[A{} B{} Terminal{:handler=>true}])
     end
   end
 
@@ -94,7 +94,7 @@ describe Coach::Handler do
 
     it "sets up the chain correctly, calling each item in the correct order" do
       expect(handler.build_request_chain(sequence, {}).call).
-        to eq(%w(A{} B{:b=>true} Terminal{}))
+        to eq(%w[A{} B{:b=>true} Terminal{}])
     end
 
     context "with inheriting config" do
@@ -103,7 +103,7 @@ describe Coach::Handler do
 
       it "calls lambda with parent middlewares config" do
         expect(handler.build_request_chain(sequence, {}).call).
-          to eq(%w(A{} C{:b=>true} D{} B{:b=>true} Terminal{}))
+          to eq(%w[A{} C{:b=>true} D{} B{:b=>true} Terminal{}])
       end
     end
   end
@@ -137,6 +137,38 @@ describe Coach::Handler do
       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
+        let(:explosive_action) { -> { raise "AH" } }
+        before { terminal_middleware.uses(middleware_a, callback: explosive_action) }
+
+        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
+
+        it "should capture the error event with the metadata " do
+          is_expected.
+            to include(['coach.handler.finish', hash_including(
+              response: { status: 500 },
+              metadata: { A: true }
+            )])
+        end
+
+        it "should bubble the error to the next handler" do
+          expect { handler.call({}) }.to raise_error(StandardError, "AH")
+        end
+      end
     end
   end
 

data/spec/lib/coach/notifications_spec.rb

@@ -53,7 +53,7 @@ describe Coach::Notifications do
 
       it "contains all middleware that have been run" do
         middleware_names = middleware_event[:chain].map { |item| item[:name] }
-        expect(middleware_names).to include(*%w(Terminal A B))
+        expect(middleware_names).to include('Terminal', 'A', 'B')
       end
 
       it "includes all logged metadata" do

data/spec/lib/coach/request_benchmark_spec.rb

@@ -36,7 +36,7 @@ describe Coach::RequestBenchmark do
 
     it "correctly orders chain" do
       chain_names = stats[:chain].map { |item| item[:name] }
-      expect(chain_names).to eq %w(A B)
+      expect(chain_names).to eq %w[A B]
     end
   end
 end

data/spec/lib/coach/router_spec.rb

@@ -13,7 +13,7 @@ describe Coach::Router do
 
   let(:resource_routes) do
     routes_module = Module.new
-    [:Index, :Show, :Create, :Update, :Destroy, :Refund].each do |class_name|
+    %i[Index Show Create Update Destroy Refund].each do |class_name|
       routes_module.const_set(class_name, Class.new)
     end
     routes_module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coach
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - GoCardless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.49.1
 description: Controller framework
 email:
 - developers@gocardless.com
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: coach middleware