msgr 1.2.0 → 1.3.0

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.3.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -60,26 +60,29 @@ 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/build.yml"
+- ".github/workflows/lint.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_master.gemfile
 - lib/msgr.rb
 - lib/msgr/binding.rb
 - lib/msgr/channel.rb
@@ -94,12 +97,14 @@ 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
 - scripts/simple_test.rb
-- spec/fixtures/msgr-routes-test-1.rb
+- spec/fixtures/msgr_routes_test_1.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,18 +130,17 @@ 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
@@ -156,13 +160,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 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/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 +193,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/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