statsd-instrument 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae7293e6877b2d74f238585a71aa2becf142dbd29541141d9571633e817a3003
-  data.tar.gz: 7b2414d09b941a107d86d7855325092e258b3032ffa1784e91ab716c3688d2c9
+  metadata.gz: 50951cc1d5be4659f87b7a6b4b2b820250b768a8a888bad19f85beb30cf77acd
+  data.tar.gz: 2dc9c84774e437ba6e64b221197b228d36ece95c42428f70eb43262028cca2b5
 SHA512:
-  metadata.gz: 2edbb8ce7c75358a9e5b06b7f3af777aacb54f8ce8d2793dcaa4ddb80c8a8117e17113e7304c63ed075e7c8f66e69abf004e3bccdd26ef31b6a295c55fbbebe6
-  data.tar.gz: a041d91c4ae37ffdfe06447614b73b9ea2a46e1a10ad3a37a72e1b38c49a037b5d501790385a5ea05c209b9f6e81597e00b4bf13c82d095fc2ffad9dbca54f47
+  metadata.gz: eabe89b8d4184ade826b5e68bb3fcf27a10330a454cefb4b9ecbb7583d4e5ab919878e7faa6e8a8e702bdcbe09c35fa4a4b6b37048f52f8970753c6225830632
+  data.tar.gz: a0a3f0a646c9669918faf6e4f5f6a0b8a0cfeb9db6128cb0350bafbd9f78ab778add4fe01cbab6a43bccc2ad91eac93721b9bd46cfe8d877cff43e5bec762e67

data/CHANGELOG.md

@@ -8,6 +8,17 @@ section below.
 
 _Nothing yet_
 
+## Version 2.9.2
+
+- Allow providing a value as second positional argument to `assert_statsd_*`
+  methods, rather than as keyword argument. This matches the arguments to the
+  StatsD metric call.
+  ``` ruby
+    assert_statsd_increment('batch_size', 10) do
+      StatsD.increment('batch_size', 10)
+    end
+  ```
+
 ## Version 2.9.1
 
 - The `VOID` object being returned by metric methods (e.g. `StatsD.increment`)

data/lib/statsd/instrument/assertions.rb

@@ -71,8 +71,8 @@ module StatsD::Instrument::Assertions
   # @return [void]
   # @raise [Minitest::Assertion] If an exception occurs, or if the metric did
   #   not occur as specified during the execution the block.
-  def assert_statsd_increment(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.increment(metric_name, **options)
+  def assert_statsd_increment(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.increment(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -83,8 +83,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_measure(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.measure(metric_name, **options)
+  def assert_statsd_measure(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.measure(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -95,8 +95,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_gauge(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.gauge(metric_name, **options)
+  def assert_statsd_gauge(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.gauge(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -107,8 +107,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_histogram(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.histogram(metric_name, **options)
+  def assert_statsd_histogram(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.histogram(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -119,8 +119,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_distribution(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.distribution(metric_name, **options)
+  def assert_statsd_distribution(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.distribution(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -131,8 +131,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_set(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.set(metric_name, **options)
+  def assert_statsd_set(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.set(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 
@@ -143,8 +143,8 @@ module StatsD::Instrument::Assertions
   # @yield (see #assert_statsd_increment)
   # @return [void]
   # @raise (see #assert_statsd_increment)
-  def assert_statsd_key_value(metric_name, datagrams: nil, client: nil, **options, &block)
-    expectation = StatsD::Instrument::Expectation.key_value(metric_name, **options)
+  def assert_statsd_key_value(metric_name, value = nil, datagrams: nil, client: nil, **options, &block)
+    expectation = StatsD::Instrument::Expectation.key_value(metric_name, value, **options)
     assert_statsd_expectation(expectation, datagrams: datagrams, client: client, &block)
   end
 

data/lib/statsd/instrument/expectation.rb

@@ -3,32 +3,32 @@
 # @private
 class StatsD::Instrument::Expectation
   class << self
-    def increment(name, **options)
-      new(type: :c, name: name, **options)
+    def increment(name, value = nil, **options)
+      new(type: :c, name: name, value: value, **options)
     end
 
-    def measure(name, **options)
-      new(type: :ms, name: name, **options)
+    def measure(name, value = nil, **options)
+      new(type: :ms, name: name, value: value, **options)
     end
 
-    def gauge(name, **options)
-      new(type: :g, name: name, **options)
+    def gauge(name, value = nil, **options)
+      new(type: :g, name: name, value: value, **options)
     end
 
-    def set(name, **options)
-      new(type: :s, name: name, **options)
+    def set(name, value = nil, **options)
+      new(type: :s, name: name, value: value, **options)
     end
 
-    def key_value(name, **options)
-      new(type: :kv, name: name, **options)
+    def key_value(name, value = nil, **options)
+      new(type: :kv, name: name, value: value, **options)
     end
 
-    def distribution(name, **options)
-      new(type: :d, name: name, **options)
+    def distribution(name, value = nil, **options)
+      new(type: :d, name: name, value: value, **options)
     end
 
-    def histogram(name, **options)
-      new(type: :h, name: name, **options)
+    def histogram(name, value = nil, **options)
+      new(type: :h, name: name, value: value, **options)
     end
   end
 

data/lib/statsd/instrument/version.rb

@@ -2,6 +2,6 @@
 
 module StatsD
   module Instrument
-    VERSION = "2.9.1"
+    VERSION = "2.9.2"
   end
 end

data/test/assertions_test.rb

@@ -132,43 +132,55 @@ class AssertionsTest < Minitest::Test
   end
 
   def test_assert_statsd_gauge_call_with_numeric_value
-    @test_case.assert_statsd_gauge('gauge', value: 42) do
+    @test_case.assert_statsd_gauge('gauge', 42) do
       StatsD.gauge('gauge', 42)
     end
 
-    @test_case.assert_statsd_gauge('gauge', value: '42') do
+    @test_case.assert_statsd_gauge('gauge', '42') do
       StatsD.gauge('gauge', 42)
     end
 
     assert_raises(Minitest::Assertion) do
-      @test_case.assert_statsd_gauge('gauge', value: 42) do
+      @test_case.assert_statsd_gauge('gauge', 42) do
         StatsD.gauge('gauge', 45)
       end
     end
+
+    @test_case.assert_statsd_gauge('gauge', value: 42) do
+      StatsD.gauge('gauge', 42)
+    end
   end
 
   def test_assert_statsd_set_call_with_string_value
-    @test_case.assert_statsd_set('set', value: 12345) do
+    @test_case.assert_statsd_set('set', 12345) do
       StatsD.set('set', '12345')
     end
 
-    @test_case.assert_statsd_set('set', value: '12345') do
+    @test_case.assert_statsd_set('set', '12345') do
       StatsD.set('set', '12345')
     end
 
-    @test_case.assert_statsd_set('set', value: 12345) do
+    @test_case.assert_statsd_set('set', 12345) do
       StatsD.set('set', 12345)
     end
 
-    @test_case.assert_statsd_set('set', value: '12345') do
+    @test_case.assert_statsd_set('set', '12345') do
       StatsD.set('set', 12345)
     end
 
     assert_raises(Minitest::Assertion) do
-      @test_case.assert_statsd_set('set', value: '42') do
+      @test_case.assert_statsd_set('set', '42') do
         StatsD.set('set', 45)
       end
     end
+
+    @test_case.assert_statsd_set('set', value: 12345) do
+      StatsD.set('set', '12345')
+    end
+
+    @test_case.assert_statsd_set('set', 'wrong_value', value: 12345) do
+      StatsD.set('set', '12345')
+    end
   end
 
   def test_tags_will_match_subsets
@@ -285,7 +297,7 @@ class AssertionsTest < Minitest::Test
     end
 
     foo_1_metric = StatsD::Instrument::Expectation.increment('counter', times: 2, tags: ['foo:1'])
-    foo_2_metric = StatsD::Instrument::Expectation.increment('counter', tags: ['foo:2'])
+    foo_2_metric = StatsD::Instrument::Expectation.increment('counter', 1, tags: ['foo:2'])
     @test_case.assert_statsd_expectations([foo_1_metric, foo_2_metric]) do
       StatsD.increment('counter', tags: { foo: 1 })
       StatsD.increment('counter', tags: { foo: 1 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsd-instrument
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Jesse Storimer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake