msgr 1.2.0 → 1.4.0

data/spec/{msgr → unit}/msgr/routes_spec.rb

@@ -3,25 +3,15 @@
 require 'spec_helper'
 
 describe Msgr::Routes do
-  let(:routes) { Msgr::Routes.new }
+  let(:routes) { described_class.new }
 
   describe '#configure' do
-    let(:block) { proc {} }
-
-    it 'should evaluate given block within instance context' do
-      expect(routes).to receive(:instance_eval) do |&p|
-        expect(p).to be block
-      end
-
-      routes.configure(&block)
-    end
-
-    it 'should allow to call instance method in gven block' do
-      expect(routes).to receive(:test_instance_method).with(:abc)
-
+    it 'allows to configure the instance in given block' do
       routes.configure do
-        test_instance_method :abc
+        route 'abc', to: 'consumer#action'
       end
+
+      expect(routes.routes.first.keys).to eq ['abc']
     end
   end
 
@@ -35,7 +25,7 @@ describe Msgr::Routes do
 
     let(:each) { routes.each }
 
-    it 'should iterate over configured routes' do
+    it 'iterates over configured routes' do
       expect(each.size).to eq 2
 
       expect(each.map(&:keys)).to eq [%w[abc.#], %w[edf.#]]
@@ -45,15 +35,16 @@ describe Msgr::Routes do
   end
 
   describe '#route' do
-    let(:subject) { -> { routes.route 'routing.key', to: 'test2#index2' } }
+    subject(:route) { -> { routes.route 'routing.key', to: 'test2#index2' } }
+
     let(:last_route) { routes.routes.last }
 
-    it 'should add a new route' do
-      expect { subject.call }.to change { routes.routes.size }.from(0).to(1)
+    it 'adds a new route' do
+      expect { route.call }.to change { routes.routes.size }.from(0).to(1)
     end
 
-    it 'should add given route' do
-      subject.call
+    it 'adds given route' do
+      route.call
 
       expect(last_route.keys).to eq %w[routing.key]
       expect(last_route.consumer).to eq 'Test2Consumer'
@@ -61,26 +52,26 @@ describe Msgr::Routes do
     end
 
     context 'with same target' do
-      let(:subject) do
+      subject(:route) do
         lambda do
           routes.route 'routing.key', to: 'test#index'
           routes.route 'another.routing.key', to: 'test#index'
         end
       end
 
-      it 'should only add one new route' do
-        expect { subject.call }.to change { routes.routes.size }.from(0).to(1)
+      it 'onlies add one new route' do
+        expect { route.call }.to change { routes.routes.size }.from(0).to(1)
       end
 
-      it 'should add second binding to first route' do
-        subject.call
+      it 'adds second binding to first route' do
+        route.call
         expect(routes.routes.first.keys).to eq %w[routing.key another.routing.key]
       end
     end
   end
 
   describe '#files' do
-    it 'should allow to add route paths' do
+    it 'allows to add route paths' do
       routes.files << 'abc.rb'
       routes.files += %w[cde.rb edf.rb]
 
@@ -89,16 +80,20 @@ describe Msgr::Routes do
   end
 
   describe 'reload' do
-    before { File.stub(:exist?).and_return(true) }
+    before do
+      allow(File).to receive(:exist?).and_return(true)
+      allow(routes).to receive(:load)
+    end
 
-    it 'should trigger load for all files' do
-      expect(routes).to receive(:load).with('cde.rb').ordered
-      expect(routes).to receive(:load).with('edf.rb').ordered
+    it 'triggers load for all files' do
       routes.files += %w[cde.rb edf.rb]
       routes.reload
+
+      expect(routes).to have_received(:load).with('cde.rb').ordered
+      expect(routes).to have_received(:load).with('edf.rb').ordered
     end
 
-    it 'should clear old routes before reloading' do
+    it 'clears old routes before reloading' do
       routes.route 'abc', to: 'abc#test'
       routes.reload
       expect(routes.each.size).to eq 0
@@ -106,11 +101,13 @@ describe Msgr::Routes do
   end
 
   describe 'load' do
-    let(:file) { 'spec/fixtures/msgr-routes-test-1.rb' }
+    let(:file) { 'spec/fixtures/msgr_routes_test_1.rb' }
 
-    it 'should eval given file within routes context' do
-      expect(routes).to receive(:route).with('abc.#', to: 'test#index')
+    it 'evals given file within routes context' do
       routes.load file
+      expect(routes.routes.count).to eq 1
+      expect(routes.routes.first.keys).to eq ['abc.#']
+      expect(routes.routes.first.name).to eq 'msgr.consumer.TestConsumer.index'
     end
   end
 end

data/spec/{msgr → unit}/msgr_spec.rb

@@ -2,10 +2,8 @@
 
 require 'spec_helper'
 
-class Receiver
-end
+Receiver = Class.new
 
-#
 class MsgrTestConsumer < Msgr::Consumer
   def index
     Receiver.index
@@ -26,7 +24,7 @@ end
 
 describe Msgr do
   let(:queue) { Queue.new }
-  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2) }
+  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2), uri: ENV['AMQP_SERVER'] }
 
   before do
     client.routes.configure do
@@ -36,43 +34,51 @@ describe Msgr do
     end
 
     client.start
+
+    allow(Receiver).to receive(:index) { queue << :end }
+    allow(Receiver).to receive(:batch) {|msg| queue << msg }
+
+    error_count = 0
+    allow(Receiver).to receive(:error) do
+      error_count += 1
+      raise 'error' if error_count == 1
+
+      queue << :end
+    end
   end
 
   after do
     client.stop delete: true
   end
 
-  it 'should dispatch published methods to consumer' do
-    expect(Receiver).to receive(:index) { queue << :end }
-
+  it 'dispatches published methods to consumer' do
     client.publish 'Payload', to: 'test.index'
 
     Timeout.timeout(4) { queue.pop }
-  end
 
-  it 'should redelivery failed messages' do
-    expect(Receiver).to receive(:error).ordered.and_raise RuntimeError
-    expect(Receiver).to receive(:error).ordered { queue << :end }
+    expect(Receiver).to have_received(:index).exactly(1).time
+  end
 
+  it 'redelivers failed messages' do
     client.publish 'Payload', to: 'test.error'
 
     Timeout.timeout(4) { queue.pop }
-  end
 
-  it 'should receive 2 messages when prefetch is set to 2' do
-    expect(Receiver).to receive(:batch).twice { |msg| queue << msg }
+    expect(Receiver).to have_received(:error).exactly(2).times
+  end
 
+  it 'receives 2 messages when prefetch is set to 2' do
     2.times { client.publish 'Payload', to: 'test.batch' }
 
     2.times { Timeout.timeout(4) { queue.pop } }
-  end
 
-  it 'should not bulk ack all unacknowledged messages when acknowledging the last one' do
-    expect(Receiver).to receive(:batch).exactly(3).times { |msg| queue << msg }
+    expect(Receiver).to have_received(:batch).exactly(2).times
+  end
 
+  it 'does not bulk ack all unacknowledged messages when acknowledging the last one' do
     2.times { client.publish 'Payload', to: 'test.batch' }
 
-    messages = 2.times.map { Timeout.timeout(4) { queue.pop } }
+    messages = Array.new(2) { Timeout.timeout(4) { queue.pop } }
     messages[1].ack
     messages[0].nack
 
@@ -80,5 +86,7 @@ describe Msgr do
     message = Timeout.timeout(4) { queue.pop }
     expect(message.payload).to eq(messages[0].payload)
     expect(message.delivery_info.redelivered).to eq(true)
+
+    expect(Receiver).to have_received(:batch).exactly(3).times
   end
 end

data/spec/{msgr → unit}/spec_helper.rb

@@ -12,7 +12,7 @@ end
 
 require 'msgr'
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each {|f| require f }
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,26 +60,28 @@ dependencies:
         version: '0'
 description: 'Msgr: Rails-like Messaging Framework'
 email:
-- jg@altimos.de
+- jgraichen@altimos.de
 executables:
 - msgr
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/msgr
-- gemfiles/Gemfile.rails-4-2
-- gemfiles/Gemfile.rails-5-0
-- gemfiles/Gemfile.rails-5-1
-- gemfiles/Gemfile.rails-5-2
-- gemfiles/Gemfile.rails-master
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_head.gemfile
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/channel.rb
@@ -94,12 +96,16 @@ files:
 - lib/msgr/railtie.rb
 - lib/msgr/route.rb
 - lib/msgr/routes.rb
+- lib/msgr/tasks/msgr/drain.rake
 - 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_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
@@ -125,22 +131,22 @@ files:
 - spec/integration/dummy/public/favicon.ico
 - spec/integration/msgr/dispatcher_spec.rb
 - spec/integration/msgr/railtie_spec.rb
-- spec/integration/msgr_spec.rb
 - spec/integration/spec_helper.rb
-- spec/msgr/msgr/client_spec.rb
-- spec/msgr/msgr/connection_spec.rb
-- spec/msgr/msgr/consumer_spec.rb
-- spec/msgr/msgr/dispatcher_spec.rb
-- spec/msgr/msgr/route_spec.rb
-- spec/msgr/msgr/routes_spec.rb
-- spec/msgr/msgr_spec.rb
-- spec/msgr/spec_helper.rb
-- spec/msgr/support/.keep
-- spec/support/setup.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
 homepage: https://github.com/jgraichen/msgr
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -149,20 +155,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 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_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
@@ -188,15 +196,14 @@ test_files:
 - spec/integration/dummy/public/favicon.ico
 - spec/integration/msgr/dispatcher_spec.rb
 - spec/integration/msgr/railtie_spec.rb
-- spec/integration/msgr_spec.rb
 - spec/integration/spec_helper.rb
-- spec/msgr/msgr/client_spec.rb
-- spec/msgr/msgr/connection_spec.rb
-- spec/msgr/msgr/consumer_spec.rb
-- spec/msgr/msgr/dispatcher_spec.rb
-- spec/msgr/msgr/route_spec.rb
-- spec/msgr/msgr/routes_spec.rb
-- spec/msgr/msgr_spec.rb
-- spec/msgr/spec_helper.rb
-- spec/msgr/support/.keep
-- spec/support/setup.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

data/.travis.yml

@@ -1,43 +0,0 @@
-dist: xenial
-language: ruby
-rvm:
-- 2.6.3
-- 2.5.5
-- 2.4.6
-- 2.3.8
-gemfile:
-- gemfiles/Gemfile.rails-5-2
-- gemfiles/Gemfile.rails-5-1
-- gemfiles/Gemfile.rails-5-0
-- gemfiles/Gemfile.rails-4-2
-- gemfiles/Gemfile.rails-master
-before_install:
-- sudo apt-get install -qy rabbitmq-server
-- echo yes | rvm gemset delete global
-- gem install bundler -v'~>1.0'
-script:
-- bundle exec rake spec:msgr
-- bundle exec rake spec:integration
-jobs:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.rails-master
-  exclude:
-  - rvm: 2.6.3
-    gemfile: gemfiles/Gemfile.rails-4-2
-  - rvm: 2.4.6
-    gemfile: gemfiles/Gemfile.rails-master
-  - rvm: 2.3.8
-    gemfile: gemfiles/Gemfile.rails-master
-  include:
-    - stage: Beta release
-      rvm: 2.6.3
-      script: echo "Deploy to rubygems.org..."
-      deploy:
-        provider: rubygems
-        api_key:
-          secure: g8icPMdxEmbpBzSRCDmR3uB+1Zhu7tGq3h0cVbGUka2Ni1NiEiQo3LCDzbMp+L7AXH5RhdsG9FTViIAyCy9YENqZ1+jzrQGeADx0KnJZb6F81/SyumeUld0zdkzDbe1aUCJWz2WnEk12aLMPLNPRmDE7wub+od7gJEEv2SsKObo=
-        gem: msgr
-        on:
-          branch: master
-          repo: jgraichen/msgr
-

data/gemfiles/Gemfile.rails-4-2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 4.2.0'
-gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-5-0

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.0.0'
-gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-5-1

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.1.0'
-gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-5-2

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', '~> 5.2.0'
-gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']

data/gemfiles/Gemfile.rails-master

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-NO_RAILS_GEM = true
-
-# Load root Gemfile
-eval_gemfile '../Gemfile'
-
-gem 'activesupport', git: 'https://github.com/rails/rails'
-gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']
-
-group :rails do
-  gem 'rails', '>= 5.2', git: 'https://github.com/rails/rails', require: 'rails'
-  gem 'sqlite3', '~> 1.4'
-end

data/spec/msgr/msgr/client_spec.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Msgr::Client do
-  subject { described_class.new config }
-  let(:config) { {} }
-
-  describe '#uri' do
-    subject { super().uri.to_s }
-
-    context 'with default config' do
-      it 'uses the default config' do
-        is_expected.to eq 'amqp://127.0.0.1'
-      end
-    end
-
-    context 'with overwritten URI' do
-      context 'without vhost' do
-        let(:config) { {uri: 'amqp://rabbit'} }
-
-        it 'does not specify a vhost' do
-          is_expected.to eq 'amqp://rabbit'
-        end
-      end
-
-      context 'with empty vhost' do
-        let(:config) { {uri: 'amqp://rabbit/'} }
-
-        it 'does not specify a vhost' do
-          is_expected.to eq 'amqp://rabbit'
-        end
-      end
-
-      context 'with explicit vhost' do
-        let(:config) { {uri: 'amqp://rabbit/some_vhost'} }
-
-        # This behavior is due to legacy parsing in Msgr's config.
-        # We interpret the entire path (incl. the leading slash)
-        # as vhost. As per AMQP rules, this means the leading slash
-        # is part of the vhost, which means it has to be URL encoded.
-        # This will likely change with the next major release.
-        it 'uses the entire path as vhost' do
-          is_expected.to eq 'amqp://rabbit/%2Fsome_vhost'
-        end
-      end
-    end
-
-    context 'with URI and vhost' do
-      let(:config) { {uri: 'amqp://rabbit/some_vhost', vhost: 'real_vhost'} }
-
-      # This is currently the only way to specify a vhost without
-      # leading slash (as a vhost in the :uri config would have
-      # an extra URL encoded leading slash).
-      it 'uses the explicit vhost' do
-        is_expected.to eq 'amqp://rabbit/real_vhost'
-      end
-    end
-  end
-end

data/spec/msgr/msgr/dispatcher_spec.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-class MsgrAutoAckConsumer < Msgr::Consumer
-  self.auto_ack = true
-
-  def index
-  end
-end
-
-class MsgrManualAckConsumer < Msgr::Consumer
-  self.auto_ack = false
-
-  def index
-  end
-end
-
-describe Msgr::Dispatcher do
-  let(:config) { {} }
-  let(:args) { [config] }
-  let(:dispatcher) { Msgr::Dispatcher.new(*args) }
-  subject { dispatcher }
-
-  describe 'dispatch' do
-    it 'should ack messages automatically if auto_ack is enabled' do
-      route_db = double('Route', :consumer => 'MsgrAutoAckConsumer', :action => :index)
-      msg_db = double('Message', :route => route_db, :acked? => false)
-      expect(msg_db).to receive(:ack)
-      expect(msg_db).not_to receive(:nack)
-
-      dispatcher.dispatch(msg_db)
-    end
-
-    it 'should not ack messages if auto_ack is disabled' do
-      route_db = double('Route', :consumer => 'MsgrManualAckConsumer', :action => :index)
-      msg_db = double('Message', :route => route_db, :acked? => false)
-      expect(msg_db).not_to receive(:ack)
-      expect(msg_db).not_to receive(:nack)
-
-      dispatcher.dispatch(msg_db)
-    end
-  end
-end

data/spec/support/setup.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler'
-
-# Somewhere between
-#   `ruby -w -W2 -S rspec ...`
-# and the rspec executable `bundle/setup` is required or
-# `Bundler.setup` without groups called. This will let Bundler
-# load ALL gems from ALL groups. This results in leaking
-# gems only for rails integration tests into msgr testing
-# environment.
-#
-# This file will be required by ruby on the commandline before
-# everything else can kick in. The code snippet below will
-# patch bundler to just ignore `setup` calls without
-# specified groups. All test helper will explicit call
-# `Bundler.setup` with required test groups.
-
-module Bundler
-  class << self
-    alias old_setup setup
-    def setup(*groups)
-      old_setup(*groups) unless groups.empty?
-    end
-  end
-end
-
-# Only load default group
-Bundler.setup :default