statsd-instrument 2.0.0beta → 2.0.0beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50bba4fad7c7d60e2272ec23888004b0cbebbd1
-  data.tar.gz: b36122aa5c275370c1a0e3e9edd3803321a4a960
+  metadata.gz: 0754302b0628e373af2d790101ab5e9d687494d8
+  data.tar.gz: 8cf3646796b5b0e7569f772e0da663d442f58cf9
 SHA512:
-  metadata.gz: 0e060d63fb216442bd387a131adca06326560aec60813efe34a608182b5066e698fdf217f13bee3ffbdcd8489e105079b0e99aca507729627a73014b5e2749e6
-  data.tar.gz: 39f3c512927e0c8ac41ff7c21936853d1d7e048b02ed3030c2c21bd67e3f07f703d6093fa54062617e102b9b273a809c23c218675b1a6280b349a46f71630856
+  metadata.gz: 816a88ac56220bb3da7f947f8d462c6ca14c5debe3d5c011a03cb3cbc4aa1e832088585dc0430efa8dfa5ec9f138a268505f41ca8a85ecaf63c981f316905398
+  data.tar.gz: 49283deaa25ce88057610481c8efe052a4cd847c43bf39399934f432cd177546868096fb6780bb02107c2371c80e4ca4fe8a5065ad1a334683d07d44e2a990a3

data/README.md

@@ -46,7 +46,7 @@ The other available settings, with their default, are
 # Logger to which commands are logged when using the LoggerBackend, which is
 # the default in development environment. Also, any errors or warnings will 
 # be logged here.
-StatsD.logger = defiend?(Rails) : Rails.logger ? Logger.new($stderr)
+StatsD.logger = defined?(Rails) ? Rails.logger : Logger.new($stderr)
 
 # An optional prefix to be added to each metric.
 StatsD.prefix = nil # but can be set to any string
@@ -211,7 +211,7 @@ warning is logged to `StatsD.logger`.
 
 ## Testing
 
-This library come swith a module called `StatsD::Instrument::Assertions` to help you write tests
+This library comes with a module called `StatsD::Instrument::Assertions` to help you write tests
 to verify StatsD is called properly.
 
 ``` ruby

data/lib/statsd/instrument.rb

@@ -123,8 +123,9 @@ module StatsD
       end
 
       result = nil
-      ms = value || 1000 * Benchmark.realtime { result = block.call }
-      collect_metric(hash_argument(metric_options).merge(type: :ms, name: key, value: ms))
+      value = 1000 * Benchmark.realtime { result = block.call } if block_given?
+      metric = collect_metric(hash_argument(metric_options).merge(type: :ms, name: key, value: value))
+      result = metric unless block_given?
       result
     end
 
@@ -174,7 +175,8 @@ module StatsD
     end
 
     def collect_metric(options)
-      backend.collect_metric(StatsD::Instrument::Metric.new(options))
+      backend.collect_metric(metric = StatsD::Instrument::Metric.new(options))
+      metric
     end
   end
 end

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.0.0beta"
+    VERSION = "2.0.0beta2"
   end
 end

data/test/statsd_test.rb

@@ -9,7 +9,9 @@ class StatsDTest < Minitest::Test
   end
 
   def test_statsd_measure_with_explicit_value
-    metric = capture_statsd_call { StatsD.measure('values.foobar', 42) }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.measure('values.foobar', 42) }
+    assert_equal metric, result
     assert_equal 'values.foobar', metric.name
     assert_equal 42, metric.value
     assert_equal :ms, metric.type
@@ -34,7 +36,9 @@ class StatsDTest < Minitest::Test
   end
 
   def test_statsd_increment
-    metric = capture_statsd_call { StatsD.increment('values.foobar', 3) }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.increment('values.foobar', 3) }
+    assert_equal metric, result
     assert_equal :c, metric.type
     assert_equal 'values.foobar', metric.name
     assert_equal 3, metric.value
@@ -55,28 +59,36 @@ class StatsDTest < Minitest::Test
   end
 
   def test_statsd_gauge
-    metric = capture_statsd_call { StatsD.gauge('values.foobar', 12) }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.gauge('values.foobar', 12) }
+    assert_equal metric, result
     assert_equal :g, metric.type
     assert_equal 'values.foobar', metric.name
     assert_equal 12, metric.value
   end
 
   def test_statsd_set
-    metric = capture_statsd_call { StatsD.set('values.foobar', 'unique_identifier') }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.set('values.foobar', 'unique_identifier') }
+    assert_equal metric, result
     assert_equal :s, metric.type
     assert_equal 'values.foobar', metric.name
     assert_equal 'unique_identifier', metric.value
   end
 
   def test_statsd_histogram
-    metric = capture_statsd_call { StatsD.histogram('values.foobar', 42) }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.histogram('values.foobar', 42) }
+    assert_equal metric, result
     assert_equal :h, metric.type
     assert_equal 'values.foobar', metric.name
     assert_equal 42, metric.value
   end
 
   def test_statsd_key_value
-    metric = capture_statsd_call { StatsD.key_value('values.foobar', 42) }
+    result = nil
+    metric = capture_statsd_call { result = StatsD.key_value('values.foobar', 42) }
+    assert_equal metric, result
     assert_equal :kv, metric.type
     assert_equal 'values.foobar', metric.name
     assert_equal 42, metric.value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.0.0beta
+  version: 2.0.0beta2
 platform: ruby
 authors:
 - Jesse Storimer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake