rack-graphite 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 9dd26f2ff86b90d349544fd717a87bcf5f9131f5
-  data.tar.gz: 57d80d9c81e4e44c0fbafb9167a5fbe7dba341e2
+  metadata.gz: 2ee3b228c46d4e023d898ca8240bcd0bccde1782
+  data.tar.gz: 13326a994a12e4a8ae0d2274d182c82343928807
 SHA512: 
-  metadata.gz: 30ab3c0e5af737e6924f7826969d460f444207c2ae360197659867424d813bb6f4cf3a570f116084f56b6ee4d4b5b9b4b2f37c5731f4c3350abe6840c2cbeddc
-  data.tar.gz: 56895e1ce3137028953dada3d30aacbaa4a4e0f015ffb5d33800bfa28224c8eb236e2e0fd5a619a3bab8a9e75e3943973d794f0e99a3344a42f6f21817eb537b
+  metadata.gz: 4c4ecafcee5fb8966f595dbf48b17858defb04f2bd5a95699cf0bf5dd2a0dfb9629b9c82bf84d5e7ade83ea5d45733a3e52c7fd132ab0b8b3e0ddc3e372a341e
+  data.tar.gz: 2de42823be00cecbc9cc038b06b8e68e4fe797f5b99526d96c2203aaa494b289b1c1eb858c2f83be54bd9de29e78e3c48dad9b27b0b2336b3e41abf2a8a54217

data/lib/rack/graphite.rb

@@ -18,11 +18,12 @@ module Rack
       method = env['REQUEST_METHOD'] || 'GET'
       metric = path_to_graphite(method, path)
 
-      result = nil
+      status, headers, body = nil
       Statsd.instance.timing(metric) do
-        result = @app.call(env)
+        status, headers, body = @app.call(env)
       end
-      return result
+      Statsd.instance.increment("#{metric}.response.#{status}")
+      return status, headers, body
     end
 
     def path_to_graphite(method, path)

data/lib/rack/graphite/version.rb

@@ -1,6 +1,6 @@
 module Rack
   class Graphite
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end
 

data/spec/graphite_spec.rb

@@ -77,11 +77,15 @@ describe Rack::Graphite do
 
   context 'with a fake app' do
     let(:app) { double('Mock Rack App') }
+    let(:status) { 200 }
+    let(:headers) { {:foo => 'bar' } }
+    let(:response) { double('Mock Response') }
     subject(:middleware) { described_class.new(app) }
 
     before :each do
       # Stub out timing by default to and just yield
       statsd.stub(:timing).and_yield
+      statsd.stub(:increment)
     end
 
     describe '#call' do
@@ -89,7 +93,7 @@ describe Rack::Graphite do
 
       before :each do
         # Stub out by default for all tests
-        app.stub(:call)
+        app.stub(:call).and_return([status, headers, response])
       end
 
       it 'should propogate the invocation to the app' do
@@ -97,10 +101,11 @@ describe Rack::Graphite do
         middleware.call(env)
       end
 
+      it 'should return response of the app' do
+      end
+
       it 'should return the result of the propogated app.call' do
-        result = double('Mock Rack Response')
-        app.should_receive(:call).and_return(result)
-        expect(middleware.call({})).to eql(result)
+        expect(middleware.call(env)).to eql([status, headers, response])
       end
 
       it 'should invoke a timer' do
@@ -118,6 +123,7 @@ describe Rack::Graphite do
     context 'with a root request' do
       before :each do
         statsd.should_receive(:timing).with('requests.get.root').and_yield
+        statsd.should_receive(:increment).with('requests.get.root.response.200')
         get '/'
       end
       its(:status) { should eql(200) }
@@ -126,6 +132,7 @@ describe Rack::Graphite do
     context 'with a request with query params' do
       before :each do
         statsd.should_receive(:timing).with('requests.get.onelevel').and_yield
+        statsd.should_receive(:increment).with('requests.get.onelevel.response.200')
         get '/onelevel?q=foo'
       end
       its(:status) { should eql(200) }
@@ -134,6 +141,7 @@ describe Rack::Graphite do
     context 'with a PUT request' do
       before :each do
         statsd.should_receive(:timing).with('requests.put.onelevel').and_yield
+        statsd.should_receive(:increment).with('requests.put.onelevel.response.200')
         put '/onelevel'
       end
       its(:status) { should eql(200) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-graphite
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - R. Tyler Croy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-13 00:00:00 Z
+date: 2014-10-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler