yabeda 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2581bd55cdd41639a1c6f01d456c5e09e1ad7636253e92720d35242fde6fab
-  data.tar.gz: 02f88db1ee3d892e387129c8775ab1b31dbafe2ec97ea8a67c34ff6abf67dc1d
+  metadata.gz: c713eeb29eb6f5eb9a022b2bb43f85961a72dca331629ca0ab335b2c72e9bd4d
+  data.tar.gz: e9309522c7b6e8982518d8a03d52e6b3096c61647cdb63a618e957da5b6f50d4
 SHA512:
-  metadata.gz: 57c4e7b716b077e37b7191cf4bfcc4f7090943eab1922439d485e02bc925408f21db656e239545bd7836413fc219282e71553b4cbd88e02b80f272dc236bacfb
-  data.tar.gz: 63707a843e531b01e685e17f7772dcf718ab730d401396d936ade23a5f8e0a7699ddbf7799caca797afcb4ef0fb5c07cacfd362ff98f46949846f166de636b97
+  metadata.gz: 9cb7676c26c849772cd27ddb180e5d733af2243b890d9dbb83dc7ff73ca57ed861a651ee7fa22f36410800600976ee0920115b96f36d036ed65b5652b6ff4dce
+  data.tar.gz: 0a145163ed0af2f669b8eaa235784b1bbbb0011a2222d4c5a44adca6461d264024a075c7c48a54fbdab089d8e8d2f41a3e96f9009fdb272b46ca2ba35d567c0c

data/.github/workflows/test.yml

@@ -14,10 +14,14 @@ jobs:
     # Skip running tests for local pull requests (use push event instead), run only for foreign ones
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login != github.event.pull_request.base.repo.owner.login
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.optional || false }}
     strategy:
       fail-fast: false
       matrix:
         include:
+          - ruby: head
+            optional: true
+          - ruby: "3.4"
           - ruby: "3.3"
           - ruby: "3.2"
           - ruby: "3.1"

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.13.2 - 2025-09-09
+
+### Fixed
+
+- Fix false positives of rspec matchers [@jbockler][] in [#42](https://github.com/yabeda-rb/yabeda/pull/42)
+
+## 0.13.1 - 2024-10-11
+
+### Fixed
+
+- Compatibility with Ruby 2.x, broken in 0.13.0 due to differences of keywords handling in Ruby 2.x for case when method has arguments with default values. [@Envek]
+
 ## 0.13.0 - 2024-10-02
 
 ### Added
@@ -183,3 +195,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 [@liaden]: https://github.com/liaden "Joel Johnson"
 [@bibendi]: https://github.com/bibendi "Misha Merkushin"
 [@Keallar]: https://github.com/Keallar "Eugene Lysanskiy"
+[@jbockler]: https://github.com/jbockler "Josch Bockler"

data/README.md

@@ -120,7 +120,7 @@ And then execute:
 
  - Prometheus:
    - [yabeda-prometheus](https://github.com/yabeda-rb/yabeda-prometheus) — wraps [official Ruby client for Prometheus](https://github.com/prometheus/client_ruby).
-   - [yabeda-prometheus-mmap](https://github.com/yabeda-rb/yabeda-prometheus-mmap) — wraps [GitLab's fork of Prometheus Ruby client](https://gitlab.com/gitlab-org/prometheus-client-mmap) which may work better for multi-process application servers.
+   - [yabeda-prometheus-mmap](https://github.com/yabeda-rb/yabeda-prometheus-mmap) — wraps [GitLab's fork of Prometheus Ruby client](https://gitlab.com/gitlab-org/ruby/gems/prometheus-client-mmap) which may work better for multi-process application servers.
  - [Datadog](https://github.com/yabeda-rb/yabeda-datadog)
  - [NewRelic](https://github.com/yabeda-rb/yabeda-newrelic)
 

data/lib/yabeda/counter.rb

@@ -3,7 +3,12 @@
 module Yabeda
   # Growing-only counter
   class Counter < Metric
-    def increment(tags = {}, by: 1)
+    # @overload increment(tags = {}, by: 1)
+    #   Increment the counter for given set of tags by the given increment value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the counter
+    #   @param by [Integer] strictly positive increment value
+    def increment(*args)
+      tags, by = self.class.parse_args(*args)
       all_tags = ::Yabeda::Tags.build(tags, group)
       values[all_tags] += by
       adapters.each_value do |adapter|
@@ -15,5 +20,25 @@ module Yabeda
     def values
       @values ||= Concurrent::Hash.new(0)
     end
+
+    # @api private
+    # rubocop:disable Metrics/MethodLength
+    def self.parse_args(*args)
+      case args.size
+      when 0 # increment()
+        [EMPTY_TAGS, 1]
+      when 1 # increment(by: 5) or increment(tags)
+        if args[0].key?(:by)
+          [EMPTY_TAGS, args.fetch(:by)]
+        else
+          [args[0], 1]
+        end
+      when 2 # increment(tags, by: 5)
+        [args[0], args[1].fetch(:by, 1)]
+      else
+        raise ArgumentError, "wrong number of arguments (given #{args.size}, expected 0..2)"
+      end
+    end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/yabeda/gauge.rb

@@ -12,11 +12,21 @@ module Yabeda
       value
     end
 
-    def increment(tags = {}, by: 1)
+    # @overload increment(tags = {}, by: 1)
+    #   Convenience method to increment current gauge value for given set of tags by the given increment value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the gauge
+    #   @param by [Integer] increment value
+    def increment(*args)
+      tags, by = Counter.parse_args(*args)
       set(tags, get(tags).to_i + by)
     end
 
-    def decrement(tags = {}, by: 1)
+    # @overload decrement(tags = {}, by: 1)
+    #   Convenience method to decrement current gauge value for given set of tags by the given decrement value
+    #   @param tags Hash{Symbol=>#to_s} tags to identify the gauge
+    #   @param by [Integer] decrement value
+    def decrement(*args)
+      tags, by = Counter.parse_args(*args)
       set(tags, get(tags).to_i - by)
     end
   end

data/lib/yabeda/rspec/base_matcher.rb

@@ -36,7 +36,7 @@ module Yabeda
       end
 
       # RSpec doesn't define this method, but it is more convenient to rely on +match_when_negated+ method presence
-      def does_not_match?(actual)
+      def does_not_match?(actual) # rubocop:disable Naming/PredicatePrefix
         @actual = actual
         if respond_to?(:match_when_negated)
           match_when_negated(expected, actual)

data/lib/yabeda/rspec/increment_yabeda_counter.rb

@@ -15,7 +15,7 @@ module Yabeda
     class IncrementYabedaCounter < BaseMatcher
       def by(increment)
         @expected_increment = increment
-        @expectations = { tags => increment } if tags
+        @expectations = { tags || {} => increment }
         self
       end
 

data/lib/yabeda/rspec/measure_yabeda_histogram.rb

@@ -17,6 +17,7 @@ module Yabeda
         return super if value.is_a?(Hash)
 
         @expected_value = value
+        @expectations = { tags || {} => value }
         self
       end
 

data/lib/yabeda/rspec/observe_yabeda_summary.rb

@@ -17,6 +17,7 @@ module Yabeda
         return super if value.is_a?(Hash)
 
         @expected_value = value
+        @expectations = { tags || {} => value }
         self
       end
 

data/lib/yabeda/rspec/update_yabeda_gauge.rb

@@ -17,6 +17,7 @@ module Yabeda
         return super if value.is_a?(Hash)
 
         @expected_value = value
+        @expectations = { tags || {} => value }
         self
       end
 

data/lib/yabeda/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yabeda
-  VERSION = "0.13.0"
+  VERSION = "0.13.2"
 end

data/lib/yabeda.rb

@@ -13,6 +13,8 @@ require "yabeda/errors"
 module Yabeda
   include DSL
 
+  EMPTY_TAGS = {}.freeze
+
   class << self
     extend Forwardable
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Andrey Novikov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2025-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anyway_config
@@ -114,7 +114,7 @@ homepage: https://github.com/yabeda-rb/yabeda
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,8 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Extensible framework for collecting metric for your Ruby application
 test_files: []