statsd-instrument 2.0.12 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63dfe410622af6e685d7a2f6614f528152b36357
-  data.tar.gz: 104d234cfd0350fcd4f079bec5baf965f86da6f3
+  metadata.gz: 18047951724aa18b3d78beeb6f41dc4de83af59c
+  data.tar.gz: aca4e756c32bfeb9564e485cd95406d11028cc05
 SHA512:
-  metadata.gz: 69206e0b5124e2223184895448be069458c95023ff85bb684897bd9ff369d70f8b91e8dfbcec3cbf2f9e13c081612ef615fa1cfb21311a46ddea9fd5ad72aa6d
-  data.tar.gz: 471d932952f69c70e1f73e92e2e8ce08841d91f054353690002d2e4017571b866cc1c6cb86028eee3830f97ab7ce2080fe001acb20c97be85565c64d675f7971
+  metadata.gz: d14651044e4b148c3caefaac65f7d4c7b49471ddf769c8124d9e9a5f0034eb4069c1139ea0ccb772e0ad78c1378599b0b5fae56f64c85d289df69c780096578b
+  data.tar.gz: e4187bb6b8d76a86e7fb0e46800fe5d2a7625234bb54cdb3630165590834fe5a27555367cb6148ae67a9993883bfa6be7decf6ad18abe50cf476d077cfb43ac3

data/lib/statsd/instrument.rb

@@ -277,7 +277,7 @@ module StatsD
   def measure(key, value = nil, *metric_options, &block)
     if value.is_a?(Hash) && metric_options.empty?
       metric_options = [value]
-      value = nil
+      value = value.fetch(:value, nil)
     end
 
     result = nil
@@ -301,7 +301,7 @@ module StatsD
   def increment(key, value = 1, *metric_options)
     if value.is_a?(Hash) && metric_options.empty?
       metric_options = [value]
-      value = 1
+      value = value.fetch(:value, 1)
     end
 
     collect_metric(hash_argument(metric_options).merge(type: :c, name: key, value: value))
@@ -313,6 +313,11 @@ module StatsD
   # @param metric_options [Hash] (default: {}) Metric options
   # @return (see #collect_metric)
   def gauge(key, value, *metric_options)
+    if value.is_a?(Hash) && metric_options.empty?
+      metric_options = [value]
+      value = value.fetch(:value, nil)
+    end
+
     collect_metric(hash_argument(metric_options).merge(type: :g, name: key, value: value))
   end
 
@@ -323,6 +328,11 @@ module StatsD
   # @return (see #collect_metric)
   # @note Supported by the datadog implementation only.
   def histogram(key, value, *metric_options)
+    if value.is_a?(Hash) && metric_options.empty?
+      metric_options = [value]
+      value = value.fetch(:value, nil)
+    end
+
     collect_metric(hash_argument(metric_options).merge(type: :h, name: key, value: value))
   end
 
@@ -333,6 +343,11 @@ module StatsD
   # @return (see #collect_metric)
   # @note Supported by the statsite implementation only.
   def key_value(key, value, *metric_options)
+    if value.is_a?(Hash) && metric_options.empty?
+      metric_options = [value]
+      value = value.fetch(:value, nil)
+    end
+
     collect_metric(hash_argument(metric_options).merge(type: :kv, name: key, value: value))
   end
 
@@ -343,6 +358,11 @@ module StatsD
   # @return (see #collect_metric)
   # @note Supported by the datadog implementation only.
   def set(key, value, *metric_options)
+    if value.is_a?(Hash) && metric_options.empty?
+      metric_options = [value]
+      value = value.fetch(:value, nil)
+    end
+
     collect_metric(hash_argument(metric_options).merge(type: :s, name: key, value: value))
   end
 

data/lib/statsd/instrument/matchers.rb

@@ -1,5 +1,5 @@
 require 'rspec/expectations'
-require 'rspec/version'
+require 'rspec/core/version'
 
 module StatsD::Instrument::Matchers
   CUSTOM_MATCHERS = {
@@ -12,7 +12,7 @@ module StatsD::Instrument::Matchers
   }
 
   class Matcher
-    include RSpec::Matchers::Composable if RSpec::Version::STRING.start_with?('3')
+    include RSpec::Matchers::Composable if RSpec::Core::Version::STRING.start_with?('3')
     include StatsD::Instrument::Helpers
 
     def initialize(metric_type, metric_name, options = {})

data/lib/statsd/instrument/version.rb

@@ -1,5 +1,5 @@
 module StatsD
   module Instrument
-    VERSION = "2.0.12"
+    VERSION = "2.1.0"
   end
 end

data/test/statsd_test.rb

@@ -17,12 +17,25 @@ class StatsDTest < Minitest::Test
     assert_equal :ms, metric.type
   end
 
+  def test_statsd_measure_with_explicit_value_as_keyword_argument
+    result = nil
+    metric = capture_statsd_call { result = StatsD.measure('values.foobar', value: 42) }
+    assert_equal metric, result
+    assert_equal 'values.foobar', metric.name
+    assert_equal 42, metric.value
+    assert_equal :ms, metric.type
+  end
+
+  def test_statsd_measure_without_value_or_block
+    assert_raises(ArgumentError) { StatsD.measure('values.foobar', tags: 123) }
+  end
+
   def test_statsd_measure_with_explicit_value_and_sample_rate
     metric = capture_statsd_call { StatsD.measure('values.foobar', 42, :sample_rate => 0.1) }
     assert_equal 0.1, metric.sample_rate
   end
 
-  def test_statsd_measure_with_benchmarked_duration
+  def test_statsd_measure_with_benchmarked_block_duration
     StatsD::Instrument.stubs(:duration).returns(1.12)
     metric = capture_statsd_call do
       StatsD.measure('values.foobar') { 'foo' }
@@ -51,6 +64,12 @@ class StatsDTest < Minitest::Test
     assert_equal 1, metric.value
   end
 
+  def test_statsd_increment_with_value_as_keyword_argument
+    metric = capture_statsd_call { StatsD.increment('values.foobar', :value => 2) }
+    assert_equal StatsD.default_sample_rate, metric.sample_rate
+    assert_equal 2, metric.value
+  end
+
   def test_statsd_increment_with_multiple_arguments
     metric = capture_statsd_call { StatsD.increment('values.foobar', 12, nil, ['test']) }
     assert_equal StatsD.default_sample_rate, metric.sample_rate
@@ -67,6 +86,19 @@ class StatsDTest < Minitest::Test
     assert_equal 12, metric.value
   end
 
+  def test_statsd_gauge_with_keyword_argument
+    result = nil
+    metric = capture_statsd_call { result = StatsD.gauge('values.foobar', value: 13) }
+    assert_equal metric, result
+    assert_equal :g, metric.type
+    assert_equal 'values.foobar', metric.name
+    assert_equal 13, metric.value
+  end
+
+  def test_statsd_gauge_without_value
+    assert_raises(ArgumentError) { StatsD.gauge('values.foobar', tags: 123) }
+  end
+
   def test_statsd_set
     result = nil
     metric = capture_statsd_call { result = StatsD.set('values.foobar', 'unique_identifier') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.1.0
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A StatsD client for Ruby apps