counters 1.1.1 → 1.1.2

data/lib/counters/stats_d.rb

@@ -1,13 +1,25 @@
 require "socket"
+require "uri"
 
 module Counters
   class StatsD < Counters::Base
     attr_reader :host, :port, :socket
 
-    def initialize(host, port, options={})
+    def initialize(*args)
+      options = args.last.is_a?(Hash) ? args.pop : Hash.new
       super(options)
 
-      @host, @port = host, port
+      url = case args.length
+            when 0
+              options.fetch(:url) { raise ArgumentError, "Missing :url key from #{args.first}" }
+            when 2
+              "statsd://#{args.first}:#{args.last}"
+            else
+              raise ArgumentError, "Expected either a Hash or a host and port arguments, found: #{args.inspect}"
+            end
+
+      uri = URI.parse(url)
+      @host, @port = uri.host, uri.port
       @socket = options.fetch(:socket) { UDPSocket.new }
     end
 

data/lib/counters/version.rb

@@ -1,3 +1,3 @@
 module Counters
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/statsd_counter_spec.rb

@@ -1,5 +1,19 @@
 require "spec_helper"
 
+describe Counters::StatsD, "#initialize" do
+  it "should accept a Hash with a :url key" do
+    counter = Counters::StatsD.new(:url => "statsd://statsd.internal:9991")
+    counter.host.should == "statsd.internal"
+    counter.port.should == 9991
+  end
+
+  it "should accept a host/port pair" do
+    counter = Counters::StatsD.new("127.0.0.1", 8125)
+    counter.host.should == "127.0.0.1"
+    counter.port.should == 8125
+  end
+end
+
 describe Counters::StatsD do
   let :socket do
     double("socket")

metadata

@@ -2,7 +2,7 @@
 name: counters
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
+date: 2011-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency