msgr 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d1c4c93abd233370b3175719c7d41902637c1d8cae51223f86f3cd16611da9
-  data.tar.gz: 432388472168160b0bc1be0ee303656ab0776674d3178ac63f6c375a7395fb6c
+  metadata.gz: b69f99b675987fb9acd292af1603a5806167aac39e49a98cd629a18cb03ef8f5
+  data.tar.gz: 41c53127e3fb1aee3efa28a107fd5d3b08baf99754582aef2415f6ee227676e0
 SHA512:
-  metadata.gz: 11ce36e23b4a499aaaff01e67a1be9a91048e19e9c55cf0487491aef49d3343d1ead2cb854e4c1a1035319e524b764f62c4846e6632bac5fa81da9b7fb125329
-  data.tar.gz: 62e2a4460070ae90fe264f270cab8852f81d85f177e2fe77e8b730926f88a11dd651506cc1b5ef58fafefa3b23c1ea0889239beacd7ba6b8342d04d65e11e05c
+  metadata.gz: 94753aaa39cb6be26a78962cd29fe0ad2fe922d117b85718b3a523fff032868f4b0e3ec9ac66d00e60cd0d561a2ba412cdf693c1eb736cf05201881d0e44664e
+  data.tar.gz: af7cc8d4e7d0ece9c03c673587797ed9d26412e83e3d96af1b41da872105dced4c7b2ad1a30d4dd95a91d3315b90cc2bb17845dba178fa51f76507665fb62c4a

data/.github/workflows/maintenance-cache-wipe.yml

@@ -0,0 +1,13 @@
+---
+name: maintenance-cache-clear
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  cache-clear:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: easimon/wipe-cache@v2

data/.github/workflows/maintenance-workflow-cleanup.yml

@@ -0,0 +1,17 @@
+---
+name: maintenance-workflow-cleanup
+on:
+  schedule:
+    - cron: "0 0 1 * *"
+  workflow_dispatch:
+
+jobs:
+  delete-workflow-runs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 180
+          keep_minimum_runs: 50

data/.github/workflows/release.yml

@@ -0,0 +1,36 @@
+name: release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  rubygems:
+    if: github.repository == 'jgraichen/msgr'
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: write
+      id-token: write
+
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_RETRY: 10
+      BUNDLE_WITHOUT: development test
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ruby
+          bundler-cache: true
+
+      - uses: rubygems/release-gem@v1
+
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          changelog: CHANGELOG.md
+          draft: true
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -3,27 +3,30 @@ on: [push]
 jobs:
   test:
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
         gemfile:
-          - rails_5.2.gemfile
-          - rails_6.0.gemfile
-          - rails_6.1.gemfile
+          - rails_7.2.gemfile
+          - rails_7.1.gemfile
           - rails_7.0.gemfile
+          - rails_6.1.gemfile
         exclude:
-          - ruby: "3.0"
-            gemfile: rails_5.2.gemfile
-          - ruby: "2.5"
-            gemfile: rails_7.0.gemfile
-          - ruby: "2.6"
-            gemfile: rails_7.0.gemfile
+          - gemfile: rails_7.2.gemfile
+            ruby: "3.0"
+          - gemfile: rails_7.2.gemfile
+            ruby: "2.7"
+          - gemfile: rails_7.1.gemfile
+            ruby: "3.0"
+          - gemfile: rails_7.1.gemfile
+            ruby: "2.7"
       fail-fast: False
 
     services:
@@ -59,9 +62,14 @@ jobs:
       - name: Run integration tests
         run: bundle exec rspec -Ispec/integration --color spec/integration
 
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+
   rubocop:
     name: rubocop
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     env:
       BUNDLE_JOBS: 4
@@ -72,7 +80,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.3"
           bundler-cache: true
 
       - name: Run rubocop

data/.gitignore

@@ -1,29 +1,29 @@
-*.gem
-*.rbc
+_yardoc
 .bundle
 .config
+.idea
+.rbx
+.rspec
 .yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
+*.gem
+*.iml
+*.lock
+*.log
+*.rbc
 coverage
 doc/
+InstalledFiles
 lib/bundler/man
 pkg
+pmip
 rdoc
+spec/integration/dummy/.generators
+spec/integration/dummy/.rakeTasks
+spec/integration/dummy/.sass-cache
+spec/integration/dummy/db/*.sqlite3
+spec/integration/dummy/db/*.sqlite3*
+spec/integration/dummy/tmp
 spec/reports
 test/tmp
 test/version_tmp
 tmp
-.idea
-pmip
-*.iml
-.rbx
-.rspec
-*.log
-spec/integration/dummy/db/*.sqlite3
-spec/integration/dummy/db/*.sqlite3-journal
-spec/integration/dummy/tmp
-spec/integration/dummy/.sass-cache
-spec/integration/dummy/.generators
-spec/integration/dummy/.rakeTasks

data/.markdownlint.yml

@@ -0,0 +1,22 @@
+# markdownlint config
+
+# The CHANGELOG contains duplicated headers by design
+MD024: false
+
+# MD013/line-length: disable line length for all. We prefer lines as
+# long as paragraph with in-editor line breaks.
+MD013: false
+
+# MD033/no-inline-html: allow often need tags
+MD033:
+  allowed_elements:
+    - figure
+    - figcaption
+
+# MD046/code-block-style: code block style conflicting with
+# admonitions...
+MD046: false
+
+# MD048/code-fence-style: code fence style
+MD048:
+  style: backtick

data/.rubocop.yml

@@ -1,8 +1,8 @@
 inherit_gem:
-  my-rubocop: default.yml
+  rubocop-config: default.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   SuggestExtensions: False
   Exclude:
     - gemfiles/**/*

data/.vscode/ltex.dictionary.en-US.txt

@@ -0,0 +1 @@
+AMQP

data/Appraisals

@@ -2,22 +2,22 @@
 
 # vim: ft=ruby
 
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
-end
-
-appraise 'rails-6.0' do
-  gem 'rails', '~> 6.0.0'
-end
-
 appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
+  gem 'sqlite3', '~> 1.4'
 end
 
 appraise 'rails-7.0' do
-  gem 'rails', '~> 6.1.0'
+  gem 'rails', '~> 7.0.0'
+  gem 'sqlite3', '~> 1.4'
+end
+
+appraise 'rails-7.1' do
+  gem 'rails', '~> 7.1.0'
+  gem 'sqlite3', '~> 2.0'
 end
 
-appraise 'rails-head' do
-  gem 'rails', git: 'https://github.com/rails/rails', require: 'rails'
+appraise 'rails-7.2' do
+  gem 'rails', '~> 7.2.0'
+  gem 'sqlite3', '~> 2.0'
 end

data/CHANGELOG.md

@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [1.6.0] - 2024-10-04
+
+### Added
+
+- Support for Ruby 3.3
+
+## [1.5.0] - 2023-08-16
+
+### Added
+
+- Support for Ruby 3.1 and 3.2
+
+### Changed
+
+- Drop support for Ruby < 2.7
+
+### Fixed
+
+- `TestPool#run` passing down keyword arguments
+
 ## [1.4.0] - 2022-01-10
 
 ### Added
@@ -48,7 +68,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- Serialize JSON using core JSON instead of MultiJson
+- Serialize JSON using core JSON instead of `MultiJson`
 - Remove application/text fallback for payload (#25)
 
 ## [1.1.0] - 2018-07-25
@@ -88,7 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- Rework TestPool timeout handling to not account processing time
+- Rework `TestPool` timeout handling to not account processing time
 
 ## [0.14.1] - 2016-02-17
 
@@ -124,7 +144,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
-- Add checkcredentials config option to disable initial connect to rabbitmq
+- Add `checkcredentials` config option to disable initial connect to RabbitMQ
   server to check the credentials
 
 ### Changed
@@ -135,13 +155,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Added
 
-- Add nack for messages when an error is rescued by dispatcher
+- Add `#nack` for messages when an error is rescued by dispatcher
 
 ## [0.11.0-rc1] - 2014-03-29
 
 ### Added
 
-- Add pool_class config to override pool classes used by dispatcher
+- Add `pool_class` config to override pool classes used by dispatcher
 
 ## [0.4.1] - 2014-03-18
 
@@ -153,7 +173,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 
-- Improve railtie and autostart code
+- Improve `Railtie` and autostart code
 
 ## 0.4.0 - 0.10.0
 
@@ -171,7 +191,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
-- Fix wrong rails initializer code - was not use the config file
+- Fix wrong Rails initializer code - was not use the config file
 
 ## [0.2.0] - 2014-02-21
 
@@ -179,7 +199,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Improve rails initializer code
 
-[unreleased]: https://github.com/jgraichen/msgr/compare/v1.4.0...HEAD
+[Unreleased]: https://github.com/jgraichen/msgr/compare/v1.6.0...HEAD
+[1.6.0]: https://github.com/jgraichen/msgr/compare/v1.5.0...v1.6.0
+[1.5.0]: https://github.com/jgraichen/msgr/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/jgraichen/msgr/compare/v1.3.2...v1.4.0
 [1.3.2]: https://github.com/jgraichen/msgr/compare/v1.3.1...v1.3.2
 [1.3.1]: https://github.com/jgraichen/msgr/compare/v1.3.0...v1.3.1

data/Gemfile

@@ -3,15 +3,18 @@
 source 'https://rubygems.org'
 
 gem 'appraisal'
-gem 'coveralls'
-gem 'my-rubocop', github: 'jgraichen/my-rubocop', ref: 'v4'
 gem 'rake'
 gem 'rake-release', '~> 1.1'
+
 gem 'rspec', '~> 3.0'
 gem 'rspec-rails'
 
+gem 'simplecov', require: false
+gem 'simplecov-cobertura', require: false
+
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v12', require: false
+
 gem 'rails'
-gem 'sqlite3'
 
 # Specify your gem's dependencies in acfs.gemspec
 gemspec

data/README.md

@@ -1,7 +1,7 @@
 # Msgr: _Rails-like Messaging Framework_
 
 [![Gem](https://img.shields.io/gem/v/msgr?logo=rubygems)](https://rubygems.org/gems/msgr)
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jgraichen/msgr/test?logo=github)](https://github.com/jgraichen/msgr/actions/workflows/test.yml)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/jgraichen/msgr/test.yml?branch=main&logo=github)](https://github.com/jgraichen/msgr/actions/workflows/test.yml)
 [![RubyDoc Documentation](http://img.shields.io/badge/rubydoc-here-blue.svg)](http://rubydoc.info/github/jgraichen/msgr/master/frames)
 
 You know it and you like it. Using Rails you can just declare your routes and
@@ -14,19 +14,25 @@ your routes, create your consumer and watch your app processing messages.
 
 Add this line to your application's Gemfile:
 
-    gem 'msgr'
+```ruby
+gem 'msgr', '~> 1.5'
+```
 
 And then execute:
 
-    $ bundle
+```console
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install msgr
+```console
+gem install msgr
+```
 
 ## Usage
 
-After adding 'msgr' to your gemfile create a `config/rabbitmq.yml` like this:
+After adding 'msgr' to your Gemfile create a `config/rabbitmq.yml` like this:
 
 ```yaml
 common: &common

data/gemfiles/rails_6.1.gemfile

@@ -3,13 +3,14 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "coveralls"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
 gem "rake"
 gem "rake-release", "~> 1.1"
 gem "rspec", "~> 3.0"
 gem "rspec-rails"
+gem "simplecov", require: false
+gem "simplecov-cobertura", require: false
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12", require: false
 gem "rails", "~> 6.1.0"
-gem "sqlite3"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -3,13 +3,14 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "coveralls"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
 gem "rake"
 gem "rake-release", "~> 1.1"
 gem "rspec", "~> 3.0"
 gem "rspec-rails"
-gem "rails", "~> 6.1.0"
-gem "sqlite3"
+gem "simplecov", require: false
+gem "simplecov-cobertura", require: false
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12", require: false
+gem "rails", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
 
 gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rake-release", "~> 1.1"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "simplecov", require: false
+gem "simplecov-cobertura", require: false
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12", require: false
+gem "rails", "~> 7.1.0"
+gem "sqlite3", "~> 2.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rake-release", "~> 1.1"
+gem "rspec", "~> 3.0"
+gem "rspec-rails"
+gem "simplecov", require: false
+gem "simplecov-cobertura", require: false
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v12", require: false
+gem "rails", "~> 7.2.0"
+gem "sqlite3", "~> 2.0"
+
+gemspec path: "../"

data/lib/msgr/cli.rb

@@ -45,8 +45,8 @@ module Msgr
       Msgr.client.start
 
       # Wait until we receive a signal
-      readable = IO.select([r])
-      case readable.first[0].gets.strip
+      r.wait_readable
+      case r.gets.strip
         when 'INT', 'TERM' # Safe shutdown
           Msgr.client.stop
         else # Error

data/lib/msgr/connection.rb

@@ -87,8 +87,8 @@ module Msgr
     def bind(routes)
       if routes.empty?
         log(:warn) do
-          "No routes to bound to. Bind will have no effect:\n" \
-            "  #{routes.inspect}"
+          "No routes to bound to. Bind will have no effect:\n  " \
+            "#{routes.inspect}"
         end
       else
         bind_all(routes)

data/lib/msgr/test_pool.rb

@@ -57,15 +57,15 @@ module Msgr
 
     class << self
       def new(*args)
-        @instance ||= super(*args) # rubocop:disable Naming/MemoizedInstanceVariableName
+        @instance ||= super # rubocop:disable Naming/MemoizedInstanceVariableName
       end
 
-      def run(*args)
-        new.run(*args)
+      def run(**kwargs)
+        new.run(**kwargs)
       end
 
       def clear
-        @instance ? @instance.clear : nil
+        @instance&.clear
       end
 
       alias reset clear

data/lib/msgr/version.rb

@@ -3,10 +3,10 @@
 module Msgr
   module VERSION
     MAJOR = 1
-    MINOR = 4
+    MINOR = 6
     PATCH = 0
     STAGE = nil
-    STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
+    STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.')
 
     def self.to_s
       STRING

data/msgr.gemspec

@@ -21,13 +21,10 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w[lib]
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'bunny', '>= 1.4', '< 3.0'
-
-  spec.add_development_dependency 'bundler'
 end

data/spec/integration/dummy/app/consumers/test_consumer.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 class TestConsumer < ApplicationConsumer
+  class << self
+    attr_accessor :queue
+  end
+
   def index
     data = {fuubar: 'abc'}
 
-    publish data, to: 'local.test.another_action'
+    publish(data, to: 'local.test.another_action')
   end
 
   def another_action
-    puts payload.inspect.to_s
+    self.class.queue ||= []
+    self.class.queue << payload
   end
 end

data/spec/integration/dummy/config/rabbitmq.yml

@@ -3,6 +3,8 @@ common: &common
 
 test:
   <<: *common
+  pool_class: Msgr::TestPool
+  raise_exceptions: true
 
 development:
   <<: *common

data/spec/integration/msgr/dispatcher_spec.rb

@@ -31,24 +31,23 @@ describe Msgr::Dispatcher do
   let(:config) { {max: 1} }
   let(:consumer) { 'DispatcherTestConsumer' }
   let(:route) do
-    instance_double('Msgr::Route').tap do |t|
-      allow(t).to receive(:consumer).and_return consumer
-      allow(t).to receive(:action).and_return 'index'
+    instance_double(Msgr::Route).tap do |t|
+      allow(t).to receive_messages(consumer: consumer, action: 'index')
     end
   end
   let(:channel) do
-    instance_double('Msgr::Channel').tap do |c|
+    instance_double(Msgr::Channel).tap do |c|
       allow(c).to receive(:ack)
     end
   end
   let(:delivery_info) do
-    instance_double('Bunny::DeliveryInfo').tap do |ti|
+    instance_double(Bunny::DeliveryInfo).tap do |ti|
       allow(ti).to receive(:delivery_tag).and_return(3)
     end
   end
   let(:payload) { {} }
   let(:metadata) do
-    instance_double('Bunny::MessageProperties').tap do |metadata|
+    instance_double(Bunny::MessageProperties).tap do |metadata|
       allow(metadata).to receive(:content_type).and_return('text/plain')
     end
   end

data/spec/integration/spec_helper.rb

@@ -4,14 +4,21 @@
 require 'bundler'
 Bundler.require :rails, :test
 
-# Coverage
-require 'coveralls'
-Coveralls.wear! do
+require 'simplecov'
+require 'simplecov-cobertura'
+
+SimpleCov.start do
+  command_name 'rspec:integration'
   add_filter 'spec'
+
+  self.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::CoberturaFormatter,
+  ]
 end
 
 ENV['RAILS_ENV'] ||= 'test'
-ENV['RAILS_GROUPS'] = ['rails', ENV['RAILS_GROUPS']].reject(&:nil?).join(',')
+ENV['RAILS_GROUPS'] = ['rails', ENV.fetch('RAILS_GROUPS', nil)].compact.join(',')
 require File.expand_path('dummy/config/environment', __dir__)
 require 'rspec/rails'
 
@@ -19,9 +26,9 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories.
 Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each {|f| require f }
 
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
-if defined?(ActiveRecord::Migration) && Rails::VERSION::MAJOR >= 4
+if ActiveRecord::Migration.respond_to?(:check_all_pending!)
+  ActiveRecord::Migration.check_all_pending!
+else
   ActiveRecord::Migration.check_pending!
 end
 
@@ -47,7 +54,9 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.before do
-    Msgr.logger = false
+  config.after do
+    # Flush the consumer queue
+    Msgr.client.stop delete: true
+    Msgr::TestPool.reset
   end
 end

data/spec/integration/test_controller_spec.rb

@@ -2,8 +2,16 @@
 
 require 'spec_helper'
 
-describe TestController, type: :request do
+describe TestController, type: :controller do
+  before do
+    Msgr.client.start
+  end
+
   it 'sends messages on :index' do
-    get '/'
+    get :index
+
+    Msgr::TestPool.run(count: 2)
+
+    expect(TestConsumer.queue).to eq [{fuubar: 'abc'}]
   end
 end

data/spec/unit/msgr/client_spec.rb

@@ -61,8 +61,8 @@ describe Msgr::Client do
     subject(:drain) { client.drain }
 
     let(:config) { {routing_file: 'spec/fixtures/msgr_routes_test_drain.rb'} }
-    let(:channel_stub) { instance_double('Msgr::Channel', prefetch: true) }
-    let(:queue_stub) { instance_double('Bunny::Queue', purge: true) }
+    let(:channel_stub) { instance_double(Msgr::Channel, prefetch: true) }
+    let(:queue_stub) { instance_double(Bunny::Queue, purge: true) }
 
     before do
       allow(Msgr::Channel).to receive(:new).and_return(channel_stub)

data/spec/unit/msgr/dispatcher_spec.rb

@@ -23,8 +23,8 @@ describe Msgr::Dispatcher do
 
   describe 'dispatch' do
     it 'acks messages automatically if auto_ack is enabled' do
-      route_db = instance_double('Msgr::Route', consumer: 'MsgrAutoAckConsumer', action: :index)
-      msg_db = instance_spy('Msgr::Message', route: route_db, acked?: false)
+      route_db = instance_double(Msgr::Route, consumer: 'MsgrAutoAckConsumer', action: :index)
+      msg_db = instance_spy(Msgr::Message, route: route_db, acked?: false)
 
       dispatcher.dispatch(msg_db)
 
@@ -33,8 +33,8 @@ describe Msgr::Dispatcher do
     end
 
     it 'does not ack messages if auto_ack is disabled' do
-      route_db = instance_double('Msgr::Route', consumer: 'MsgrManualAckConsumer', action: :index)
-      msg_db = instance_spy('Msgr::Message', route: route_db, acked?: false)
+      route_db = instance_double(Msgr::Route, consumer: 'MsgrManualAckConsumer', action: :index)
+      msg_db = instance_spy(Msgr::Message, route: route_db, acked?: false)
 
       dispatcher.dispatch(msg_db)
 

data/spec/unit/msgr/test_pool_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Msgr::TestPool do
+  let(:pool) { described_class.new }
+
+  describe '.run' do
+    it 'passes through to #run' do
+      expect(pool).to receive(:run).with(count: 5) # rubocop:disable RSpec/MessageSpies
+      described_class.run(count: 5)
+    end
+  end
+end

data/spec/unit/msgr_spec.rb

@@ -24,7 +24,7 @@ end
 
 describe Msgr do
   let(:queue) { Queue.new }
-  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2), uri: ENV['AMQP_SERVER'] }
+  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2), uri: ENV.fetch('AMQP_SERVER', nil) }
 
   before do
     client.routes.configure do
@@ -85,7 +85,7 @@ describe Msgr do
     # Test whether the nacked message gets redelivered. In this case, it was not acked when acknowledging the other message
     message = Timeout.timeout(4) { queue.pop }
     expect(message.payload).to eq(messages[0].payload)
-    expect(message.delivery_info.redelivered).to eq(true)
+    expect(message.delivery_info.redelivered).to be(true)
 
     expect(Receiver).to have_received(:batch).exactly(3).times
   end

data/spec/unit/spec_helper.rb

@@ -4,10 +4,17 @@
 require 'bundler'
 Bundler.setup :default, :test
 
-# Coverage
-require 'coveralls'
-Coveralls.wear! do
+require 'simplecov'
+require 'simplecov-cobertura'
+
+SimpleCov.start do
+  command_name 'rspec:unit'
   add_filter 'spec'
+
+  self.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::CoberturaFormatter,
+  ]
 end
 
 require 'msgr'
@@ -20,8 +27,4 @@ RSpec.configure do |config|
     # Only allow expect syntax
     c.syntax = :expect
   end
-
-  config.before do
-    Msgr.logger = false
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jan Graichen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,20 +44,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'Msgr: Rails-like Messaging Framework'
 email:
 - jgraichen@altimos.de
@@ -67,9 +53,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/maintenance-cache-wipe.yml"
+- ".github/workflows/maintenance-workflow-cleanup.yml"
+- ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- ".markdownlint.yml"
 - ".rubocop.yml"
+- ".vscode/ltex.dictionary.en-US.txt"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -77,11 +68,10 @@ files:
 - README.md
 - Rakefile
 - bin/msgr
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
-- gemfiles/rails_head.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/channel.rb
@@ -123,7 +113,6 @@ files:
 - spec/integration/dummy/config/rabbitmq.yml
 - spec/integration/dummy/config/routes.rb
 - spec/integration/dummy/config/secrets.yml
-- spec/integration/dummy/db/test.sqlite3
 - spec/integration/dummy/log/.keep
 - spec/integration/dummy/public/404.html
 - spec/integration/dummy/public/422.html
@@ -139,6 +128,7 @@ files:
 - spec/unit/msgr/dispatcher_spec.rb
 - spec/unit/msgr/route_spec.rb
 - spec/unit/msgr/routes_spec.rb
+- spec/unit/msgr/test_pool_spec.rb
 - spec/unit/msgr_spec.rb
 - spec/unit/spec_helper.rb
 - spec/unit/support/.keep
@@ -147,7 +137,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,55 +145,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: 'Msgr: Rails-like Messaging Framework'
-test_files:
-- spec/fixtures/msgr_routes_test_1.rb
-- spec/fixtures/msgr_routes_test_drain.rb
-- spec/integration/dummy/Rakefile
-- spec/integration/dummy/app/assets/config/manifest.js
-- spec/integration/dummy/app/consumers/application_consumer.rb
-- spec/integration/dummy/app/consumers/test_consumer.rb
-- spec/integration/dummy/app/controllers/application_controller.rb
-- spec/integration/dummy/app/controllers/test_controller.rb
-- spec/integration/dummy/app/helpers/application_helper.rb
-- spec/integration/dummy/bin/bundle
-- spec/integration/dummy/bin/rails
-- spec/integration/dummy/bin/rake
-- spec/integration/dummy/config.ru
-- spec/integration/dummy/config/application.rb
-- spec/integration/dummy/config/boot.rb
-- spec/integration/dummy/config/database.yml
-- spec/integration/dummy/config/environment.rb
-- spec/integration/dummy/config/msgr.rb
-- spec/integration/dummy/config/rabbitmq.yml
-- spec/integration/dummy/config/routes.rb
-- spec/integration/dummy/config/secrets.yml
-- spec/integration/dummy/db/test.sqlite3
-- spec/integration/dummy/log/.keep
-- spec/integration/dummy/public/404.html
-- spec/integration/dummy/public/422.html
-- spec/integration/dummy/public/500.html
-- spec/integration/dummy/public/favicon.ico
-- spec/integration/msgr/dispatcher_spec.rb
-- spec/integration/msgr/railtie_spec.rb
-- spec/integration/spec_helper.rb
-- spec/integration/test_controller_spec.rb
-- spec/unit/msgr/client_spec.rb
-- spec/unit/msgr/connection_spec.rb
-- spec/unit/msgr/consumer_spec.rb
-- spec/unit/msgr/dispatcher_spec.rb
-- spec/unit/msgr/route_spec.rb
-- spec/unit/msgr/routes_spec.rb
-- spec/unit/msgr_spec.rb
-- spec/unit/spec_helper.rb
-- spec/unit/support/.keep
+test_files: []

data/gemfiles/rails_5.2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "coveralls"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
-gem "rake"
-gem "rake-release", "~> 1.1"
-gem "rspec", "~> 3.0"
-gem "rspec-rails"
-gem "rails", "~> 5.2.0"
-gem "sqlite3"
-
-gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "coveralls"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
-gem "rake"
-gem "rake-release", "~> 1.1"
-gem "rspec", "~> 3.0"
-gem "rspec-rails"
-gem "rails", "~> 6.0.0"
-gem "sqlite3"
-
-gemspec path: "../"

data/gemfiles/rails_head.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal"
-gem "coveralls"
-gem "my-rubocop", github: "jgraichen/my-rubocop", ref: "v3"
-gem "rake"
-gem "rake-release", "~> 1.1"
-gem "rspec", "~> 3.0"
-gem "rspec-rails"
-gem "rails", git: "https://github.com/rails/rails", require: "rails"
-gem "sqlite3"
-
-gemspec path: "../"