saddle 0.0.17 → 0.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjlmNzBjOWU4ZWRlNWZkNTZmYjA4YTdlZDFmMmNjMzQwNDU3MTFjZA==
+    NmNmNGZiMGJmYjkxMWYwZTRiYTJkODczNjA0ODcxYmU0ZjE1ZDQwYw==
   data.tar.gz: !binary |-
-    ZDc5NGQ0MWY2ZGFhYzEwMDVlY2IwMjRhNWJiYjc0NDhhYzM3NDRhMA==
+    ZjIxYmIyZDExYjc0NjMxMDk3N2UyOTRlNjY0MDdhODE4M2QxOWU4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZGI4M2I3ODMwMGRjZGQ5Nzc4NWRiMGIyMTA0ZGQ5ZmZhODhkNmVmZmE2MjIw
-    YTUzNjExNjVkZmVkNjI1YzZhYjBlOGUyZGI2ZjIxN2IyOWU0MGRjODcyYmY0
-    NWRjNGI1M2MwMzkxMGY0MWYzNzIyM2QyNzgwYzVkNGNkNDY3YTM=
+    MGFiM2QyY2E3NTllMjA5ZDMyMGUzOTFlYzZjN2FiNGYxM2Q4Yzg4ZTkyYzFl
+    ZjZkMjJhYjRkNjhmNDM0MWIyZTZhZmVkODJjMTYxNTk2MmIwODFhMWZkZWJl
+    NmMyMmFmNzQ2YWVhNDYxODdmOTJkMTI0OTJlODUwNzQ2MTg3ZDI=
   data.tar.gz: !binary |-
-    N2ZiYTYyZDZiZTE4ZTYyNDYwYTAyZmVlZmI1MzA0OTZkMzI4YTJiZjUwOTYw
-    ZDFlOGEyZTYwYjdhMjRkYWFlMDgwNTdmMDUwMjVlNmMyMTIwMWM1MzE0MjE5
-    ZTBmYzliNWE0NjhlMTBlY2Q2MTQ5MTViZmMxODUwNTczMjBmOWY=
+    ZDk5MGQ5MTU4ZDA1OTUxNmZkNDFkZWUxNDdlNjdmMzMxOTJmNmQzNWViZWVk
+    YjBlMDNiMWE5N2I2OTYyNTU2NDgyY2EwNjQxNDQ4OWY3ZTZmNzgzOGEwNGVh
+    ODdiMzU3ZGJhOTdhMWFiMmI5ZWNlYmUwZjU3MjllZjNkZGI1ZjE=

data/Gemfile

@@ -8,4 +8,7 @@ gem 'faraday_middleware', '~> 0.9.0'
 group :test do
   gem 'rspec', '~> 2.13.0'
   gem 'rspec-instafail', '~> 0.2'
+
+  gem 'airbrake'
+  gem 'statsd-ruby'
 end

data/Gemfile.lock

@@ -4,12 +4,18 @@ GEM
     activesupport (3.2.13)
       i18n (= 0.6.1)
       multi_json (~> 1.0)
+    airbrake (3.1.12)
+      activesupport
+      builder
+      json
+    builder (3.2.0)
     diff-lcs (1.2.4)
     faraday (0.8.7)
       multipart-post (~> 1.1)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     i18n (0.6.1)
+    json (1.7.7)
     multi_json (1.7.3)
     multipart-post (1.2.0)
     rspec (2.13.0)
@@ -21,13 +27,16 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
     rspec-mocks (2.13.1)
+    statsd-ruby (1.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activesupport (>= 3.0)
+  airbrake
   faraday (~> 0.8.7)
   faraday_middleware (~> 0.9.0)
   rspec (~> 2.13.0)
   rspec-instafail (~> 0.2)
+  statsd-ruby

data/lib/saddle/middleware/logging/statsd.rb

@@ -31,7 +31,6 @@ module Saddle
 
         def call(env)
           # Try to build up a path for the STATSD logging
-          statsd_path = nil
           if env[:request][:statsd_path]
             statsd_path = env[:request][:statsd_path]
           elsif env[:request][:saddle]
@@ -41,6 +40,8 @@ module Saddle
               env[:request][:saddle][:call_chain] +
               [env[:request][:saddle][:action]]
             ).join('.')
+          else
+            statsd_path = "saddle.raw.#{env[:host].to_s}.#{env[:path].to_s}"
           end
 
           # If we have a path, wrap the ensuing app call in STATSD timing

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

data/spec/middleware_spec.rb

@@ -0,0 +1,48 @@
+require 'saddle'
+require 'saddle/middleware/logging/airbrake'
+require 'saddle/middleware/logging/statsd'
+
+describe Saddle::Client do
+
+  context "Test middlewares" do
+
+    before :each do
+      @stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+        stub.get('/test') {
+          [
+            200,
+            {},
+            'Party on!',
+          ]
+        }
+      end
+
+      @default_client = Saddle::Client.create(:stubs => @stubs)
+    end
+
+
+    it "test logging/airbrake" do
+      class AirbrakeClient < Saddle::Client
+        add_middleware({
+          :klass => Saddle::Middleware::Logging::AirbrakeLogger,
+        })
+      end
+
+      client = AirbrakeClient.create(:stubs => @stubs)
+      client.requester.get('/test').should == 'Party on!'
+    end
+
+    it "test logging/statsd" do
+      class StatsdClient < Saddle::Client
+        add_middleware({
+          :klass => Saddle::Middleware::Logging::StatsdLogger,
+          :args => ['127.0.0.1'],
+        })
+      end
+
+      client = StatsdClient.create(:stubs => @stubs)
+      client.requester.get('/test').should == 'Party on!'
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Mike Lewis
@@ -81,8 +81,9 @@ files:
 - lib/saddle/requester.rb
 - lib/saddle/version.rb
 - saddle.gemspec
+- spec/middleware_spec.rb
+- spec/multiple_spec.rb
 - spec/requester/get_spec.rb
-- spec/requester/multiple_spec.rb
 - spec/requester/post_spec.rb
 - spec/requester/retry_spec.rb
 homepage: https://github.com/mLewisLogic/saddle
@@ -111,7 +112,8 @@ specification_version: 4
 summary: A full-featured, generic consumer layer for you to build API client implementations
   with.
 test_files:
+- spec/middleware_spec.rb
+- spec/multiple_spec.rb
 - spec/requester/get_spec.rb
-- spec/requester/multiple_spec.rb
 - spec/requester/post_spec.rb
 - spec/requester/retry_spec.rb