rack-graphite 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  metadata.gz: 9dd26f2ff86b90d349544fd717a87bcf5f9131f5
+  data.tar.gz: 57d80d9c81e4e44c0fbafb9167a5fbe7dba341e2
+SHA512: 
+  metadata.gz: 30ab3c0e5af737e6924f7826969d460f444207c2ae360197659867424d813bb6f4cf3a570f116084f56b6ee4d4b5b9b4b2f37c5731f4c3350abe6840c2cbeddc
+  data.tar.gz: 56895e1ce3137028953dada3d30aacbaa4a4e0f015ffb5d33800bfa28224c8eb236e2e0fd5a619a3bab8a9e75e3943973d794f0e99a3344a42f6f21817eb537b

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 *.rbc
+.ruby-gemset
+.ruby-version
 .bundle
 .config
 coverage
@@ -11,6 +13,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock
 
 # YARD artifacts
 .yardoc

data/lib/rack/graphite/version.rb

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

data/lib/rack/graphite.rb

@@ -2,8 +2,11 @@ require 'statsd'
 
 module Rack
   class Graphite
-    VERSION = '1.0.0'
     PREFIX = 'requests'
+    ID_REGEXP = %r{/\d+(/|$)} # Handle /123/ or /123
+    ID_REPLACEMENT = '/id\1'.freeze
+    GUID_REGEXP = %r{/\h{8}-\h{4}-\h{4}-\h{4}-\h{12}(/|$)} # Handle /GUID/ or /GUID
+    GUID_REPLACEMENT = '/guid\1'.freeze
 
     def initialize(app, options={})
       @app = app
@@ -27,7 +30,12 @@ module Rack
       if (path.nil?) || (path == '/') || (path.empty?)
         "#{@prefix}.#{method}.root"
       else
-        path = path.gsub('/', '.')
+        # Replace ' ' => '_', '.' => '-'
+        path = path.tr(' .', '_-')
+        path.gsub!(ID_REGEXP, ID_REPLACEMENT)
+        path.gsub!(GUID_REGEXP, GUID_REPLACEMENT)
+        path.tr!('/', '.')
+
         "#{@prefix}.#{method}#{path}"
       end
     end

data/rack-graphite.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rack/graphite'
+require 'rack/graphite/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "rack-graphite"

data/spec/graphite_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'securerandom'
 
 describe Rack::Graphite do
   let(:statsd) { double('Mock Statsd::Client') }
@@ -10,6 +11,7 @@ describe Rack::Graphite do
 
   describe '#path_to_graphite' do
     let(:middleware) { described_class.new(nil) }
+    let(:guid) { SecureRandom.uuid }
     subject(:graphite) { middleware.path_to_graphite(method, path) }
 
     context 'GET requests' do
@@ -39,6 +41,36 @@ describe Rack::Graphite do
         let(:path) { nil }
         it { should eql('requests.get.root') }
       end
+
+      context 'with an id embedded in a path' do
+        let(:path) { '/one/234/five' }
+        it { should eql('requests.get.one.id.five') }
+      end
+
+      context 'with a path ending in an id' do
+        let(:path) { '/one/234' }
+        it { should eql('requests.get.one.id') }
+      end
+
+      context 'with a alpha-numeric in a path' do
+        let(:path) { '/one/v1/two' }
+        it { should eql('requests.get.one.v1.two') }
+      end
+
+      context 'with a guid embedded in a path' do
+        let(:path) { "/one/#{guid}/five" }
+        it { should eql('requests.get.one.guid.five') }
+      end
+
+      context 'with a path ending in a guid' do
+        let(:path) { "/one/#{guid}" }
+        it { should eql('requests.get.one.guid') }
+      end
+
+      context 'with something close to a guid in a path' do
+        let(:path) { '/one/deadbeef-babe-cafe/two' }
+        it { should eql('requests.get.one.deadbeef-babe-cafe.two') }
+      end
     end
   end
 

metadata

@@ -1,95 +1,80 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-graphite
-version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - R. Tyler Croy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-10-13 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        version: "1.3"
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: lookout-statsd
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id003 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id002
 description: Simple Rack middleware for logging request counts/timing information
-email:
+email: 
 - rtyler.croy@lookout.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/rack/graphite.rb
+- lib/rack/graphite/version.rb
 - rack-graphite.gemspec
 - spec/graphite_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lookout/rack-graphite
-licenses:
+licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1834689501216258839
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1834689501216258839
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id003
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Rack middleware for logging request counts/timing information
-test_files:
+test_files: 
 - spec/graphite_spec.rb
 - spec/spec_helper.rb