yabeda 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a48fc237f75ffdb834af3b14fe7d991cb1f65a37d528a0139d2cc2895d3e6b
-  data.tar.gz: f3b316975ff26a048e9a8361c93b164591f3b3add12bea20a01b0f47316519f2
+  metadata.gz: cbfcaaa322333f0bf774953f4ef40081a43f3d8dc89a3aec426397c174f8e5ef
+  data.tar.gz: 4f4dd1f0fc20cf59b72c26308861dfc7b439d271cdaebcd8441190a419e3b3e6
 SHA512:
-  metadata.gz: e9f252ca373fbf287c6ce674180e7cb58c35177951e903767722e8ad396bbee7cbebff73c6e9fcb7e2e43e30c6599c0aea5a53a7f4f546be28382a173ce5c856
-  data.tar.gz: 43fff38b19ef0fcde369eb4f43f78049543949d54d9f23d130a7e895ed7e10d62a6612f9328d1e9128cf1354578423f6992d56ee354063614c47f350cd960682
+  metadata.gz: d43a6452648112c376b29dce66942ad6a491f4b0d54794cd42f5dd874d8db7c005f3e65d883707b53a6bbc4ffc8f961526a8c757acb877e89239d527d5205b4b
+  data.tar.gz: c42902e5e1b7f410170f7dfec0594de246ec5aebaa989b33786cec835cfaa5e99308155b35f906e4bf495589c3d0b03c1cc40fcaa88ddb59b43b1abc5ce187e4

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,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.14.0 - 2025-09-10
+
+### Added
+
+- Allow to limit groups per adapter. [@killondark][] in [#41](https://github.com/yabeda-rb/yabeda/pull/41)
+
+  ```ruby
+  Yabeda.configure do
+    group :mushrooms do
+      counter :champignon_counter
+    end
+
+    adapter :basket_adapter do
+      include_group :mushrooms
+    end
+  end
+  ```
+
+## 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
@@ -189,3 +213,5 @@ 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"
+[@killondark]: https://github.com/killondark "Alexander Marychev"

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)
 
@@ -246,6 +246,19 @@ Yabeda.configure do
 end
 ```
 
+Or use another DSL to describe this logic:
+
+```ruby
+Yabeda.configure do
+  group :mushrooms do
+    counter :champignon_counter
+  end
+
+  adapter :basket_adapter do
+    include_group :mushrooms
+  end
+end
+```
 
 ## Roadmap (aka TODO or Help wanted)
 

data/lib/yabeda/dsl/class_methods.rb

@@ -96,10 +96,25 @@ module Yabeda
       #
       # @param adapter_names [Array<Symbol>] Names of adapters to use
       def adapter(*adapter_names, group: @group)
-        raise ConfigurationError, "Adapter limitation can't be defined outside of group" unless group
+        raise ConfigurationError, "Adapter limitation can't be defined without adapter_names" if adapter_names.empty?
+
+        @adapter_names = adapter_names
+        if group
+          include_group(group)
+        else
+          return yield if block_given?
+
+          raise ConfigurationError, "Yabeda.adapter should be called either inside group declaration " \
+            "or should have block provided with a call to include_group. No metric group provided."
+        end
+      ensure @adapter_names = nil
+      end
+
+      def include_group(group)
+        raise ConfigurationError, "Adapter limitation can't be defined without of group name" unless group
 
         Yabeda.groups[group] ||= Yabeda::Group.new(group)
-        Yabeda.groups[group].adapter(*adapter_names)
+        Yabeda.groups[group].adapter(*@adapter_names)
       end
 
       private

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.1"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Andrey Novikov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2025-09-10 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: []