msgr 1.1.0.1.b302 → 1.3.1

data/lib/msgr/railtie.rb

@@ -4,92 +4,31 @@ module Msgr
   class Railtie < ::Rails::Railtie
     config.msgr = ActiveSupport::OrderedOptions.new
 
-    if File.exist?("#{Rails.root}/app/consumers")
-      config.autoload_paths << File.expand_path("#{Rails.root}/app/consumers")
-    end
-
     initializer 'msgr.logger' do |app|
       app.config.msgr.logger ||= Rails.logger
     end
 
-    # Start msgr
     initializer 'msgr.start' do
       config.after_initialize do |app|
         Msgr.logger = app.config.msgr.logger
-
-        self.class.load app.config.msgr
+        self.class.load(app.config_for(:rabbitmq).symbolize_keys)
       end
     end
 
-    class << self
-      def load(rails_config)
-        cfg = parse_config load_config rails_config
-        return unless cfg # no config given -> does not load Msgr
-
-        Msgr.config = cfg
-        Msgr.client.connect if cfg[:checkcredentials]
-        Msgr.start if cfg[:autostart]
-      end
-
-      def parse_config(cfg)
-        unless cfg.is_a? Hash
-          Rails.logger.warn '[Msgr] Could not load rabbitmq config: Config must be a Hash'
-          return nil
-        end
-
-        unless cfg[Rails.env].is_a?(Hash)
-          Rails.logger.warn "Could not load rabbitmq config for environment \"#{Rails.env}\": is not a Hash"
-          return nil
-        end
-
-        cfg = HashWithIndifferentAccess.new cfg[Rails.env]
-        unless cfg[:uri]
-          raise ArgumentError.new('Could not load rabbitmq environment config: URI missing.')
-        end
-
-        case cfg[:autostart]
-          when true, 'true', 'enabled'
-            cfg[:autostart] = true
-          when false, 'false', 'disabled', nil
-            cfg[:autostart] = false
-          else
-            raise ArgumentError.new("Invalid value for rabbitmq config autostart: \"#{cfg[:autostart]}\"")
-        end
-
-        case cfg[:checkcredentials]
-          when true, 'true', 'enabled', nil
-            cfg[:checkcredentials] = true
-          when false, 'false', 'disabled'
-            cfg[:checkcredentials] = false
-          else
-            raise ArgumentError.new("Invalid value for rabbitmq config checkcredentials: \"#{cfg[:checkcredentials]}\"")
-        end
-
-        case cfg[:raise_exceptions]
-          when true, 'true', 'enabled'
-            cfg[:raise_exceptions] = true
-          when false, 'false', 'disabled', nil
-            cfg[:raise_exceptions] = false
-          else
-            raise ArgumentError.new("Invalid value for rabbitmq config raise_exceptions: \"#{cfg[:raise_exceptions]}\"")
-        end
-
-        cfg[:routing_file] ||= Rails.root.join('config/msgr.rb').to_s
-        cfg
-      end
-
-      def load_config(options)
-        if options.rabbitmq_config || !Rails.application.respond_to?(:config_for)
-          load_file options.rabbitmq_config || Rails.root.join('config', 'rabbitmq.yml')
-        else
-          conf = Rails.application.config_for :rabbitmq
-
-          {Rails.env.to_s => conf}
-        end
-      end
+    rake_tasks do
+      load File.expand_path('tasks/msgr/drain.rake', __dir__)
+    end
 
-      def load_file(path)
-        YAML.safe_load ERB.new(File.read(path)).result
+    class << self
+      def load(config)
+        # Set defaults
+        config.reverse_merge!(
+          checkcredentials: true,
+          routing_file: Rails.root.join('config/msgr.rb').to_s
+        )
+
+        Msgr.config = config
+        Msgr.client.connect if config.fetch(:checkcredentials)
       end
     end
   end

data/lib/msgr/route.rb

@@ -4,10 +4,7 @@ module Msgr
   class Route
     attr_reader :consumer, :action, :opts
 
-    MATCH_REGEXP = /\A(?<consumer>\w+)#(?<action>\w+)\z/
-
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
+    MATCH_REGEXP = /\A(?<consumer>\w+)#(?<action>\w+)\z/.freeze
     def initialize(key, opts = {})
       @opts = opts
       raise ArgumentError.new 'Missing `to` options.' unless @opts[:to]

data/lib/msgr/routes.rb

@@ -3,7 +3,9 @@
 module Msgr
   class Routes
     include Logging
+
     attr_reader :routes
+
     delegate :each, :empty?, :size, :any?, to: :@routes
 
     def initialize

data/lib/msgr/tasks/msgr/drain.rake

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+namespace :msgr do
+  desc 'Drain all known queues'
+  task drain: :environment do
+    client = Msgr.client
+
+    client.connect
+    client.drain
+  end
+end

data/lib/msgr/test_pool.rb

@@ -31,8 +31,6 @@ module Msgr
 
     private
 
-    # rubocop:disable Metrics/AbcSize
-    # rubocop:disable Metrics/MethodLength
     def ns_run(count: 1, timeout: 5)
       received = 0
 
@@ -59,7 +57,7 @@ module Msgr
 
     class << self
       def new(*args)
-        @instance ||= super(*args)
+        @instance ||= super(*args) # rubocop:disable Naming/MemoizedInstanceVariableName
       end
 
       def run(*args)

data/lib/msgr/version.rb

@@ -3,8 +3,8 @@
 module Msgr
   module VERSION
     MAJOR = 1
-    MINOR = 1
-    PATCH = 0
+    MINOR = 3
+    PATCH = 1
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/msgr.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'msgr/version'
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'msgr'
   spec.version       = Msgr::VERSION
   spec.authors       = ['Jan Graichen']
-  spec.email         = ['jg@altimos.de']
+  spec.email         = ['jgraichen@altimos.de']
   spec.description   = 'Msgr: Rails-like Messaging Framework'
   spec.summary       = 'Msgr: Rails-like Messaging Framework'
   spec.homepage      = 'https://github.com/jgraichen/msgr'
@@ -24,8 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bunny', '>= 1.4', '< 3.0'
 
   spec.add_development_dependency 'bundler'
-
-  if ENV['TRAVIS_BUILD_NUMBER']
-    spec.version = "#{spec.version}.1.b#{ENV['TRAVIS_BUILD_NUMBER']}"
-  end
 end

data/scripts/simple_test.rb

@@ -19,7 +19,6 @@ class TestConsumer < Msgr::Consumer
   end
 end
 
-#
 class NullPool
   def initialize(*); end
 
@@ -45,9 +44,9 @@ end
 
 begin
   sleep
-rescue Interrupt
+rescue Interrupt # rubocop:disable Lint/SuppressedException
 ensure
   @client.stop timeout: 10, delete: true
 end
 
-$stderr.puts "COUNTER: #{@counter}"
+warn "COUNTER: #{@counter}"

data/spec/integration/dummy/Rakefile

@@ -3,6 +3,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Dummy::Application.load_tasks

data/spec/integration/dummy/bin/bundle

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/integration/dummy/bin/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/integration/dummy/config/application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 

data/spec/integration/dummy/config/boot.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/spec/integration/dummy/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the Rails application.
 Dummy::Application.initialize!

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

@@ -1,5 +1,5 @@
 common: &common
-  uri: amqp://localhost/
+  uri: <%= ENV.fetch("AMQP_SERVER", "amqp://localhost/") %>
 
 test:
   <<: *common

data/spec/integration/msgr/dispatcher_spec.rb

@@ -4,7 +4,19 @@ require 'spec_helper'
 
 class DispatcherTestConsumer < Msgr::Consumer
   def index
-    puts "<<< #{payload}"
+    self.class.called!
+  end
+
+  class << self
+    def calls
+      @calls ||= 0
+    end
+
+    attr_writer :calls
+
+    def called!
+      self.calls += 1
+    end
   end
 end
 
@@ -19,55 +31,59 @@ describe Msgr::Dispatcher do
   let(:config) { {max: 1} }
   let(:consumer) { 'DispatcherTestConsumer' }
   let(:route) do
-    double(:route).tap do |t|
+    instance_double('Msgr::Route').tap do |t|
       allow(t).to receive(:consumer).and_return consumer
       allow(t).to receive(:action).and_return 'index'
     end
   end
   let(:channel) do
-    double(:channel).tap do |c|
+    instance_double('Msgr::Channel').tap do |c|
       allow(c).to receive(:ack)
     end
   end
   let(:delivery_info) do
-    double(:delivery_info).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
-    double(:metadata).tap do |metadata|
+    instance_double('Bunny::MessageProperties').tap do |metadata|
       allow(metadata).to receive(:content_type).and_return('text/plain')
     end
   end
   let(:message) { Msgr::Message.new channel, delivery_info, metadata, payload, route }
   let(:action) { -> { dispatcher.call message } }
 
-  it 'should consume message' do
-    expect_any_instance_of(DispatcherTestConsumer).to receive(:index)
-    dispatcher.call message
+  it 'consumes message' do
+    expect do
+      dispatcher.call message
+    end.to change(DispatcherTestConsumer, :calls).by(1)
   end
 
   context 'with not acknowledged message' do
-    before { dispatcher.call message }
     subject { message }
-    it { should be_acked }
+
+    before { dispatcher.call message }
+
+    it { is_expected.to be_acked }
   end
 
   describe 'exception swallowing' do
     let(:consumer) { 'DispatcherRaiseConsumer' }
+
     before do
       allow(message).to receive(:nack)
     end
 
-    it 'should swallow exceptions by default' do
+    it 'swallows exceptions by default' do
       expect { dispatcher.call(message) }.not_to raise_error
     end
 
     context 'with raise_exceptions configuration option and a synchronous pool' do
       let(:config) { super().merge(raise_exceptions: true) }
 
-      it 'should raise the exception' do
+      it 'raises the exception' do
         expect { dispatcher.call(message) }.to raise_error(ArgumentError)
       end
     end

data/spec/integration/msgr/railtie_spec.rb

@@ -6,139 +6,29 @@ describe Msgr::Railtie do
   describe 'configuration options' do
     let(:config) { Rails.configuration }
 
-    it 'should have `msgr` key' do
+    it 'has `msgr` key' do
       expect(config).to respond_to :msgr
     end
   end
 
-  describe '#parse_config' do
-    let(:settings) { {} }
-    let(:action) { described_class.parse_config settings }
-    subject { action }
-
-    context 'with incorrect settings' do
-      subject { -> { action } }
-
-      context 'with config without url' do
-        let(:settings) { {'test' => {hans: 'otto'}} }
-
-        it { should raise_error 'Could not load rabbitmq environment config: URI missing.' }
-      end
-
-      context 'with invalid autostart value' do
-        let(:settings) { {'test' => {uri: 'hans', autostart: 'unvalid'}} }
-
-        it { should raise_error 'Invalid value for rabbitmq config autostart: "unvalid"' }
-      end
-
-      context 'with invalid checkcredentials value' do
-        let(:settings) { {'test' => {uri: 'hans', checkcredentials: 'unvalid'}} }
-
-        it { should raise_error 'Invalid value for rabbitmq config checkcredentials: "unvalid"' }
-      end
-
-      context 'with invalid raise_exceptions value' do
-        let(:settings) { {'test' => {uri: 'franz', raise_exceptions: 'unvalid'}} }
-
-        it { should raise_error 'Invalid value for rabbitmq config raise_exceptions: "unvalid"' }
-      end
-    end
-
-    context 'without set routes file' do
-      let(:settings) { {'test' => {uri: 'test'}} }
-
-      context '[:routing_file]' do
-        subject { super()[:routing_file] }
-        it { should eq Rails.root.join('config/msgr.rb').to_s }
-      end
-    end
-
-    context 'with set routes file' do
-      let(:settings) { {'test' => {uri: 'test', 'routing_file' => 'my fancy file'}} }
-
-      context '[:routing_file]' do
-        subject { super()[:routing_file] }
-        it { should eq 'my fancy file' }
-      end
-    end
-
-    context 'with uri as symbol' do
-      let(:settings) { {'test' => {uri: 'hans'}} }
-
-      context '[:uri]' do
-        subject { super()[:uri] }
-        it { should eq 'hans' }
-      end
-    end
-
-    context 'with uri as string' do
-      let(:settings) { {'test' => {'uri' => 'hans'}} }
-
-      context '[:uri]' do
-        subject { super()[:uri] }
-        it { should eq 'hans' }
-      end
-    end
-
-    context 'without raise_exceptions config' do
-      let(:settings) { {'test' => {'uri' => 'hans'}, 'development' => {'uri' => 'hans_dev'}} }
-
-      describe '[:raise_exceptions]' do
-        subject { super()[:raise_exceptions] }
-        it { should eq false }
-      end
-    end
-  end
-
   describe '#load' do
-    let(:config) do
-      cfg = ActiveSupport::OrderedOptions.new
-      cfg.rabbitmq_config = Rails.root.join 'config', 'rabbitmq.yml'
-      cfg
-    end
-
-    context 'with autostart is true' do
-      it 'should not start Msgr' do
-        expect(Msgr).to receive(:start)
-        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test', autostart: true})
-        Msgr::Railtie.load config
-      end
-    end
-
-    context 'without autostart value' do
-      it 'should not start Msgr' do
-        expect(Msgr).to_not receive(:start)
-        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test'})
-        Msgr::Railtie.load config
-      end
+    before do
+      allow(Msgr).to receive(:start)
+      allow(Msgr.client).to receive(:connect)
     end
 
     context 'without checkcredentials value' do
-      it 'should connect to rabbitmq directly to check credentials' do
-        expect_any_instance_of(Msgr::Client).to receive(:connect)
-        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test'})
-        Msgr::Railtie.load config
+      it 'connects to rabbitmq directly to check credentials' do
+        described_class.load({})
+        expect(Msgr.client).to have_received(:connect)
       end
     end
 
     context 'with checkcredentials is false' do
-      it 'should connect to rabbitmq directly to check credentials' do
-        expect_any_instance_of(Msgr::Client).to_not receive(:connect)
-        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test', checkcredentials: false})
-        Msgr::Railtie.load config
+      it 'connects to rabbitmq directly to check credentials' do
+        described_class.load({checkcredentials: false})
+        expect(Msgr.client).not_to have_received(:connect)
       end
     end
   end
-
-  # describe '#load_config'
-  #   let(:options) { {} }
-
-  #   subject { Msgr::Railtie.load_config options }
-
-  #   if Rails::Application.methods.include(:config_for)
-  #     it 'should use config_for' do
-
-  #     end
-  #   end
-  # end
 end