saddle 0.0.50 → 0.0.51

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2YwNTRjYjcwYWE2NDY5NjQ5N2I3ZTU2ODNhM2JlYmY3YjA0NWU3YQ==
+    ZjAxNjc4ZDBjMjUwZTg1ZTVlNzc1YjI1YTAxZTg0YmU2N2M2YTFkMA==
   data.tar.gz: !binary |-
-    N2Y3OTg4YzYwMWM5NGJiYmRlYWM5MzRkNDFkZjJkNzk2ZTNlMjIxNg==
+    OGYxYjA4M2VhNDM1ZjI4NzdmZDQ2NmNlMmYwYzAwM2U1NGJlYjczZg==
 SHA512:
   metadata.gz: !binary |-
-    YjEyZGVkNTkwMjhhNTk3OTZlZTE3M2UyYzIyNzFiZmFhZDg3NjVlMzY0YTlk
-    YjQ5MDZhODJhYTUyYTQ2NTEwNjgzNWJjODI5YWYyZjA0NWJjNmMyNDk1NWVl
-    OTMxN2NlMGI4NDdkNmE5M2ZiOWRlNjU2ODU4OWZmM2IzOTNlNjM=
+    ZDEwZjdjNmIzNzg2ODFiNDlmZjNhM2Y5MjkwMWZhODY3N2ExNDgzYzQzNWI2
+    MTc3MDZhNTJlOTU4MGE1MTc1ZmUyNjc2MTBhMDU0OGQ0YzMyNGQ3MTYzYTU4
+    MTI2NjBiMjc0ZTMxYmE2ZGU3M2E2MDA0MmUzY2U4ODg1ZGU5YzU=
   data.tar.gz: !binary |-
-    ZjJkYzU3NzYzMTU2ZjFlMGNhMTk0OTZjMzg5ZTQzMGUzMDc3YTI3Y2IxODkw
-    OWVlMjY3YzIzYTdhZDYxZDFhMGZmNTJhOTllMzA3NjFkZGE4YmVjOWZlMjU5
-    MWQxOWEzZDczMjU2ZGNkZjQ5MjAxZTRkNjFiZWUwZmI2MzA5ODk=
+    YmE5MWExZmJiNmI1ZjM1YzY1NGQ5MWM4OGZjOTk0NTlhN2ZhMzg3MDU1MzE4
+    NDg4YWNhYzFkMzhjYjkzOTU5YWZiOTEzODhkNjZlMmFhNDYwMGExNTczMTI1
+    Y2VmMzNmYmY5ZGQxZTkxZTA5OGNhZGQ4NmI2NmViZmI5M2RlNzI=

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

@@ -52,13 +52,18 @@ module Saddle
 
           # If we have a path, wrap the call
           if statsd_path
-            self.statsd.time(statsd_path) do
+            self.statsd.time(sanitize_path(statsd_path)) do
               @app.call(env)
             end
           else
             @app.call(env)
           end
         end
+
+        private
+        def sanitize_path(path)
+          path.gsub(/\s+/, '_').gsub(/\//, '-').gsub(/[^a-zA-Z_\-0-9\.]/, '')
+        end
       end
 
     end

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.50'
+  VERSION = '0.0.51'
 end

data/spec/middleware/logging/statsd_spec.rb

@@ -7,13 +7,15 @@ describe Saddle::Middleware::Logging::StatsdLogger do
 
   context "test Statsd middleware" do
 
-    it "with a request" do
-      class StatsdClient < Saddle::Client
-        add_middleware({
-          :klass => Saddle::Middleware::Logging::StatsdLogger,
-          :args => ['127.0.0.1'],
-        })
-      end
+    class StatsdClient < Saddle::Client
+      add_middleware({
+        :klass => Saddle::Middleware::Logging::StatsdLogger,
+        :args => ['127.0.0.1'],
+      })
+    end
+
+    it "should log a request" do
+      ::Statsd.any_instance.should_receive(:time).with("saddle.statsd_client.raw.localhost-test").and_yield
 
       client = StatsdClient.create(
         :stubs => Faraday::Adapter::Test::Stubs.new do |stub|
@@ -29,5 +31,22 @@ describe Saddle::Middleware::Logging::StatsdLogger do
       client.requester.get('/test').should == 'Party on!'
     end
 
+    it "should allow overriding the path" do
+      ::Statsd.any_instance.should_receive(:time).with("hello").and_yield
+
+      client = StatsdClient.create(
+        :stubs => Faraday::Adapter::Test::Stubs.new do |stub|
+          stub.get('/test') {
+            [
+              200,
+              {},
+              'Party on!',
+            ]
+          }
+        end
+      )
+      client.requester.get('/test', {}, {:statsd_path => "hello"}).should == 'Party on!'
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport