msgr 1.3.2 → 1.5.0

data/lib/msgr/client.rb

@@ -14,7 +14,7 @@ module Msgr
       @config = {
         host: '127.0.0.1',
         vhost: '/',
-        max: 2
+        max: 2,
       }
 
       @config.merge! parse(config.delete(:uri)) if config[:uri]
@@ -148,7 +148,7 @@ module Msgr
 
       log(:warn) do
         "Fork detected. Reset internal state. (Old PID: #{@pid} / " \
-        "New PID: #{::Process.pid}"
+          "New PID: #{::Process.pid}"
       end
 
       reset

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/railtie.rb

@@ -24,7 +24,7 @@ module Msgr
         # Set defaults
         config.reverse_merge!(
           checkcredentials: true,
-          routing_file: Rails.root.join('config/msgr.rb').to_s
+          routing_file: Rails.root.join('config/msgr.rb').to_s,
         )
 
         Msgr.config = config

data/lib/msgr/route.rb

@@ -4,7 +4,7 @@ module Msgr
   class Route
     attr_reader :consumer, :action, :opts
 
-    MATCH_REGEXP = /\A(?<consumer>\w+)#(?<action>\w+)\z/.freeze
+    MATCH_REGEXP = %r{\A(?<consumer>(?:\w+/)*\w+)#(?<action>\w+)\z}.freeze
     def initialize(key, opts = {})
       @opts = opts
       raise ArgumentError.new 'Missing `to` options.' unless @opts[:to]
@@ -16,7 +16,7 @@ module Msgr
       unless result
         raise ArgumentError.new \
           "Invalid consumer format: #{opts[:to].strip.to_s.inspect}. " \
-          'Must be `consumer_class#action`.'
+          'Must be `name/space/consumer_class#action`.'
       end
 
       @consumer = "#{result[:consumer].camelize}Consumer"

data/lib/msgr/test_pool.rb

@@ -60,12 +60,12 @@ module Msgr
         @instance ||= super(*args) # 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 = 3
-    PATCH = 2
+    MINOR = 5
+    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/lib/msgr.rb

@@ -25,7 +25,7 @@ require 'msgr/railtie' if defined? Rails
 
 module Msgr
   class << self
-    attr_writer :client, :config
+    attr_writer :client, :config, :logger
 
     delegate :publish, to: :client
 
@@ -46,8 +46,6 @@ module Msgr
       @logger
     end
 
-    attr_writer :logger
-
     def start
       client.start
       client

data/msgr.gemspec

@@ -15,13 +15,16 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/jgraichen/msgr'
   spec.license       = 'MIT'
 
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
+
   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.7'
+
   spec.add_dependency 'activesupport'
   spec.add_dependency 'bunny', '>= 1.4', '< 3.0'
-
-  spec.add_development_dependency 'bundler'
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/scripts/simple_test.rb

@@ -28,7 +28,7 @@ class NullPool
 end
 
 @client = Msgr::Client.new user: 'guest', password: 'guest',
-                           max: 4 # , pool_class: 'NullPool'
+  max: 4 # , pool_class: 'NullPool'
 
 @client.routes.configure do
   route 'abc.#', to: 'test#index'

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

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class TestConsumer < ApplicationConsumer
+  class << self
+    attr_accessor :queue
+  end
+
   def index
     data = {fuubar: 'abc'}
 
@@ -8,6 +12,7 @@ class TestConsumer < ApplicationConsumer
   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

@@ -11,7 +11,7 @@ Coveralls.wear! do
 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'
 
@@ -50,4 +50,10 @@ RSpec.configure do |config|
   config.before do
     Msgr.logger = false
   end
+
+  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/route_spec.rb

@@ -34,6 +34,12 @@ describe Msgr::Route do
         described_class.new routing_key, to: 'abc'
       end.to raise_error ArgumentError, /invalid consumer format/i
     end
+
+    it 'allows namespaces in consumer' do
+      expect do
+        described_class.new routing_key, to: 'abc/def#ghi'
+      end.not_to raise_error
+    end
   end
 
   describe '#consumer' do
@@ -44,10 +50,18 @@ describe Msgr::Route do
     context 'with underscore consumer name' do
       let(:options) { super().merge to: 'test_resource_foo#index' }
 
-      it 'returns camelized method name' do
+      it 'returns camelized class name' do
         expect(route.consumer).to eq 'TestResourceFooConsumer'
       end
     end
+
+    context 'with nested namespace in consumer name' do
+      let(:options) { super().merge to: 'nested/namespace/foo#index' }
+
+      it 'returns fully classified, classified class name' do
+        expect(route.consumer).to eq 'Nested::Namespace::FooConsumer'
+      end
+    end
   end
 
   describe '#action' do

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

@@ -2,8 +2,7 @@
 
 require 'spec_helper'
 
-class Receiver
-end
+Receiver = Class.new
 
 class MsgrTestConsumer < Msgr::Consumer
   def index
@@ -25,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
@@ -86,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2023-08-16 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,11 +53,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
-- ".github/workflows/build.yml"
-- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
+- ".markdownlint.yml"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".vscode/ltex.dictionary.en-US.txt"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -82,7 +68,8 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
-- gemfiles/rails_master.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_head.gemfile
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/channel.rb
@@ -101,6 +88,7 @@ files:
 - lib/msgr/test_pool.rb
 - lib/msgr/version.rb
 - msgr.gemspec
+- renovate.json
 - scripts/simple_test.rb
 - spec/fixtures/msgr_routes_test_1.rb
 - spec/fixtures/msgr_routes_test_drain.rb
@@ -123,7 +111,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,13 +126,15 @@ 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
 homepage: https://github.com/jgraichen/msgr
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -154,55 +143,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.4.18
 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/.github/workflows/build.yml

@@ -1,52 +0,0 @@
-name: Build
-on: [push]
-jobs:
-  test:
-    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
-    runs-on: ubuntu-20.04
-
-    strategy:
-      matrix:
-        ruby:
-          - '2.7'
-          - '2.6'
-          - '2.5'
-        gemfile:
-          - rails_5.2.gemfile
-          - rails_6.0.gemfile
-          - rails_6.1.gemfile
-      fail-fast: false
-
-    services:
-      rabbitmq:
-        image: rabbitmq:latest
-        options: --health-cmd "rabbitmqctl node_health_check" --health-interval 10s --health-timeout 5s --health-retries 5
-        ports:
-          - 5672:5672
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-          bundler: 1
-        env:
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
-          BUNDLE_WITHOUT: development
-          BUNDLE_JOBS: 4
-          BUNDLE_RETRY: 3
-
-      - name: Run unit tests
-        env:
-          AMQP_SERVER: amqp://localhost:5672
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
-        run: bundle exec rspec -Ispec/unit --color spec/unit
-
-      - name: Run integration tests
-        env:
-          AMQP_SERVER: amqp://localhost:5672
-          BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
-        run: bundle exec rspec -Ispec/integration --color spec/integration

data/.github/workflows/lint.yml

@@ -1,20 +0,0 @@
-name: Lint
-on: [push]
-jobs:
-  rubocop:
-    name: rubocop
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@master
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.6
-          bundler-cache: true
-        env:
-          BUNDLE_WITHOUT: development
-          BUNDLE_JOBS: 4
-          BUNDLE_RETRY: 3
-
-      - name: Run rubocop
-        run: bundle exec rubocop --parallel --color

data/.travis.yml

@@ -1,29 +0,0 @@
-dist: bionic
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.0
-  - 2.6.5
-  - 2.5.7
-gemfile:
-  - gemfiles/rails_42.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_52.gemfile
-  - gemfiles/rails_60.gemfile
-  - gemfiles/rails_master.gemfile
-before_install:
-  - sudo apt-get install -qy rabbitmq-server
-  - echo yes | rvm gemset delete global
-  - gem install bundler --version '~> 1.0'
-script:
-  - bundle exec rake spec:unit
-  - bundle exec rake spec:integration
-jobs:
-  allow_failures:
-    - gemfile: gemfiles/rails_master.gemfile
-  exclude:
-    - rvm: 2.7.0
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 2.6.5
-      gemfile: gemfiles/rails_42.gemfile