statsd-ruby 0.2.1 → 0.3.0

data/Rakefile

@@ -30,6 +30,7 @@ Rcov::RcovTask.new do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.verbose = true
+  spec.rcov_opts << "--exclude spec,gems"
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/statsd.rb

@@ -16,6 +16,9 @@ class Statsd
   # A namespace to prepend to all statsd calls.
   attr_accessor :namespace
 
+  #characters that will be replaced with _ in stat names
+  RESERVED_CHARS_REGEX = /[\:\|\@]/
+  
   class << self
     # Set to any standard logger instance (including stdlib's Logger) to enable
     # stat logging using logger.debug
@@ -82,6 +85,7 @@ class Statsd
 
   def send(stat, delta, type, sample_rate)
     prefix = "#{@namespace}." unless @namespace.nil?
+    stat = stat.to_s.gsub('::', '.').gsub(RESERVED_CHARS_REGEX, '_')
     sampled(sample_rate) { send_to_socket("#{prefix}#{stat}:#{delta}|#{type}#{'|@' << sample_rate.to_s if sample_rate < 1}") }
   end
 

data/spec/helper.rb

@@ -4,6 +4,7 @@ require 'minitest/autorun'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'statsd'
+require 'logger'
 
 class FakeUDPSocket
   def initialize

data/spec/statsd_spec.rb

@@ -136,6 +136,49 @@ describe Statsd do
       @statsd.socket.recv.must_equal ['service.foobar:500|ms']
     end
   end
+
+  describe "with logging" do
+    require 'stringio'
+    before { Statsd.logger = Logger.new(@log = StringIO.new)}
+
+    it "should write to the log in debug" do
+      Statsd.logger.level = Logger::DEBUG
+
+      @statsd.increment('foobar')
+
+      @log.string.must_match "Statsd: foobar:1|c"
+    end
+
+    it "should not write to the log unless debug" do
+      Statsd.logger.level = Logger::INFO
+
+      @statsd.increment('foobar')
+
+      @log.string.must_be_empty
+    end
+
+  end
+
+  describe "stat names" do
+
+    it "should accept anything as stat" do
+      @statsd.increment(Object, 1)
+    end
+
+    it "should replace ruby constant delimeter with graphite package name" do
+      class Statsd::SomeClass; end
+      @statsd.increment(Statsd::SomeClass, 1)
+
+      @statsd.socket.recv.must_equal ['Statsd.SomeClass:1|c']
+    end
+
+    it "should replace statsd reserved chars in the stat name" do
+      @statsd.increment('ray@hostname.blah|blah.blah:blah', 1)
+      @statsd.socket.recv.must_equal ['ray_hostname.blah_blah.blah_blah:1|c']
+    end
+
+  end
+
 end
 
 describe Statsd do

data/statsd-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{statsd-ruby}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rein Henrichs"]
-  s.date = %q{2011-06-23}
+  s.date = %q{2011-06-24}
   s.description = %q{A Statsd client in Ruby}
   s.email = %q{rein@phpfog.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/reinh/statsd}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.3.9.1}
   s.summary = %q{A Statsd client in Ruby}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: statsd-ruby
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rein Henrichs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -07:00
+date: 2011-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.9.1
 signing_key: 
 specification_version: 3
 summary: A Statsd client in Ruby