msgr 0.14.1.1.b125 → 0.14.1.1.b126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2001d4982c46db6d24deff4a4224ea3ab324d356
-  data.tar.gz: 897ee73e929eeb57fdc851985d754002e43c9d12
+  metadata.gz: 58d8c36902cdf5dd4d97ea60e27e7ff0cd61d3bf
+  data.tar.gz: ac9c00107a12baf9d1c1fb522760721820e6b570
 SHA512:
-  metadata.gz: 9c6106196c3f0fbe1bec232bbdaac6f795c104937f4a9582765c19e1b4e56656460da183d0bde6dcdc7726bb1b2e06162b0dbd1f0952698b24d46f759d8712d0
-  data.tar.gz: 5b94e72a33b0cfabd76721f09e16524ea8265ee056c53d09632cfcc3887174075138e4256621bac31a442bfa5c0a230a35b4509c88a3212121e190d18603ea7d
+  metadata.gz: ed786680950674203f4ec550b7e8709925295dca09e5568254e72cf6257855fe1cfdd48ef07a072fdfc43871487df4295d7876fe2995679d76ab7d6a248a2e2e
+  data.tar.gz: 3c975a75f71c80ccb820ca5f731382020a278ad6c6a4fb00356744e02052b6dc752807beeb31b8650a3a4e27409d86934ee56a5753f269e91d48ad4c92faeaca

data/.rubocop.yml

@@ -0,0 +1,48 @@
+AllCops:
+  Include:
+    - '**/*.rb'
+  TargetRubyVersion: 2.4
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Metrics/LineLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/Documentation:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: no_space
+  SpaceBeforeBlockParameters: false
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/CaseIndentation:
+  EnforcedStyle: end
+  SupportedStyles:
+    - case
+    - end
+  IndentOneStep: true
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/TrivialAccessors:
+  AllowPredicates: true

data/lib/msgr/binding.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   class Binding
     include Logging
 
@@ -45,7 +45,8 @@ module Msgr
           dispatcher.call Message.new(connection, *args, route)
         rescue => err
           log(:error) do
-            "Rescued error from subscribe: #{err.class.name}: #{err}\n#{err.backtrace.join("\n")}"
+            "Rescued error from subscribe: #{err.class.name}: " \
+            "#{err}\n#{err.backtrace.join("\n")}"
           end
         end
       end

data/lib/msgr/client.rb

@@ -1,26 +1,29 @@
+# frozen_string_literal: true
 module Msgr
-
+  # rubocop:disable Metrics/ClassLength
   class Client
     include Logging
     attr_reader :uri, :config
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def initialize(config = {})
-      @uri          = ::URI.parse config[:uri] ? config.delete(:uri) : 'amqp://localhost/'
+      @uri = ::URI.parse config[:uri] ? config.delete(:uri) : 'amqp://localhost/'
       config[:pass] ||= @uri.password
 
       @uri.user   = config[:user] ||= @uri.user || 'guest'
-      @uri.scheme = (config[:ssl] ||= @uri.scheme.to_s.downcase == 'amqps') ? 'amqps' : 'amqp'
+      @uri.scheme = (config[:ssl] ||= @uri.scheme.to_s.casecmp('amqps').zero?) ? 'amqps' : 'amqp'
       @uri.host   = config[:host] ||= @uri.host || '127.0.0.1'
       @uri.port   = config[:port] ||= @uri.port
       @uri.path   = config[:vhost] ||= @uri.path.present? ? @uri.path : '/'
-      config.reject! { |_, v| v.nil? }
+      config.reject! {|_, v| v.nil? }
 
-      @config       = config
+      @config = config
       @config[:max] ||= 2
 
       @mutex  = ::Mutex.new
       @routes = Routes.new
-      @pid    ||= ::Process.pid
+      @pid ||= ::Process.pid
 
       log(:debug) { "Created new client on process ##{@pid}..." }
     end
@@ -120,17 +123,17 @@ module Msgr
       connection.publish message, opts
     end
 
-    def mutex
-      @mutex
-    end
+    attr_reader :mutex
 
     def check_process!
-      unless ::Process.pid == @pid
-        log(:warn) { "Fork detected. Reset internal state. (Old PID: #{@pid} / New PID: #{::Process.pid}" }
-
-        reset
-        @pid = ::Process.pid
+      return if ::Process.pid == @pid
+      log(:warn) do
+        "Fork detected. Reset internal state. (Old PID: #{@pid} / " \
+        "New PID: #{::Process.pid}"
       end
+
+      reset
+      @pid = ::Process.pid
     end
 
     def connection

data/lib/msgr/connection.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 require 'bunny'
 require 'multi_json'
 
 module Msgr
-
+  # rubocop:disable Metrics/ClassLength
   class Connection
     include Logging
 
@@ -29,7 +30,7 @@ module Msgr
     end
 
     def connection
-      @connection ||= ::Bunny.new(config).tap { |b| b.start }
+      @connection ||= ::Bunny.new(config).tap(&:start)
     end
 
     def connect
@@ -48,14 +49,14 @@ module Msgr
       return if bindings.empty?
       log(:debug) { "Release bindings (#{bindings.size})..." }
 
-      bindings.each { |binding| binding.release }
+      bindings.each(&:release)
     end
 
     def delete
       return if bindings.empty?
       log(:debug) { "Delete bindings (#{bindings.size})..." }
 
-      bindings.each { |binding| binding.delete }
+      bindings.each(&:delete)
     end
 
     def purge(**kwargs)
@@ -78,10 +79,12 @@ module Msgr
     end
 
     def exchange
-      @exchange ||= channel.topic(prefix(EXCHANGE_NAME), durable: true).tap do |ex|
-        log(:debug) do
-          "Created exchange #{ex.name} (type: #{ex.type}, " \
-              "durable: #{ex.durable?}, auto_delete: #{ex.auto_delete?})"
+      @exchange ||= begin
+        channel.topic(prefix(EXCHANGE_NAME), durable: true).tap do |ex|
+          log(:debug) do
+            "Created exchange #{ex.name} (type: #{ex.type}, " \
+                "durable: #{ex.durable?}, auto_delete: #{ex.auto_delete?})"
+          end
         end
       end
     end
@@ -97,7 +100,10 @@ module Msgr
 
     def bind(routes)
       if routes.empty?
-        log(:warn) { "No routes to bound to. Bind will have no effect. (#{routes.inspect})" }
+        log(:warn) do
+          "No routes to bound to. Bind will have no effect:\n" \
+          "  #{routes.inspect}"
+        end
       else
         bind_all(routes)
       end
@@ -125,8 +131,9 @@ module Msgr
     end
 
     private
+
     def bind_all(routes)
-      routes.each { |route| bindings << Binding.new(self, route, @dispatcher) }
+      routes.each {|route| bindings << Binding.new(self, route, @dispatcher) }
     end
   end
 end

data/lib/msgr/consumer.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   class Consumer
     include Logging
 
@@ -12,7 +12,11 @@ module Msgr
       @message = message
 
       action = message.route.action.to_sym
-      raise Msgr::NoAction.new "No action `#{action}` for `#{self.class.name}`." unless respond_to? action
+
+      unless respond_to?(action)
+        raise Msgr::NoAction.new \
+          "No action `#{action}` for `#{self.class.name}`."
+      end
 
       log(:debug) { "Invoke action #{action.inspect}." }
 

data/lib/msgr/dispatcher.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   # The Dispatcher receives incoming messages,
   # process them through a middleware stack and
   # delegate them to a new and fresh consumer instance.
@@ -12,18 +12,23 @@ module Msgr
     def initialize(config)
       config[:pool_class] ||= 'Msgr::Dispatcher::NullPool'
 
-      log(:debug) { "Initialize new dispatcher (#{config[:pool_class]}: #{config})..." }
+      log(:debug) do
+        "Initialize new dispatcher (#{config[:pool_class]}: #{config})..."
+      end
 
       @config = config
       @pool = config[:pool_class].constantize.new config
     end
 
     def call(message)
-      pool.post(message) do |message|
-        dispatch message
+      pool.post(message) do |msg|
+        dispatch msg
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/CyclomaticComplexity
     def dispatch(message)
       consumer_class = Object.const_get message.route.consumer
 
@@ -38,27 +43,26 @@ module Msgr
 
       log(:error) do
         "Dispatcher error: #{error.class.name}: #{error}\n" +
-            error.backtrace.join("\n")
+          error.backtrace.join("\n")
       end
 
       raise error if config[:raise_exceptions]
     ensure
-      if defined?(ActiveRecord) && ActiveRecord::Base.connection_pool.active_connection?
+      if defined?(ActiveRecord) &&
+         ActiveRecord::Base.connection_pool.active_connection?
         log(:debug) { 'Release used AR connection for dispatcher thread.' }
         ActiveRecord::Base.connection_pool.release_connection
       end
     end
 
-    def shutdown
-    end
+    def shutdown; end
 
     def to_s
       self.class.name
     end
 
     class NullPool
-      def initialize(*)
-      end
+      def initialize(*); end
 
       def post(*args)
         yield(*args)

data/lib/msgr/errors.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   # Abstract error base class
   class CausedByError < StandardError
     attr_accessor :cause
@@ -11,11 +11,10 @@ module Msgr
     end
 
     def message
-      cause ? "#{super}\n  caused by:\n#{cause.to_s}" : super
+      cause ? "#{super}\n  caused by:\n#{cause}" : super
     end
   end
 
   class ConnectionError < CausedByError
-
   end
 end

data/lib/msgr/logging.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
 module Msgr
-
   module Logging
     def log(level)
-      Msgr.logger.send(level) { "#{self.log_name} #{yield}" } if Msgr.logger
+      Msgr.logger.send(level) { "#{log_name} #{yield}" } if Msgr.logger
     end
 
     def log_name

data/lib/msgr/message.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   class Message
     attr_reader :delivery_info, :metadata, :payload, :route
 
@@ -10,6 +10,7 @@ module Msgr
       @payload       = payload
       @route         = route
 
+      # rubocop:disable Style/GuardClause
       if content_type == 'application/json'
         @payload = MultiJson.load(payload)
         @payload.symbolize_keys! if @payload.respond_to? :symbolize_keys!
@@ -35,10 +36,10 @@ module Msgr
     # @api public
     #
     def ack
-      unless acked?
-        @acked = true
-        @connection.ack delivery_info.delivery_tag
-      end
+      return if acked?
+
+      @acked = true
+      @connection.ack delivery_info.delivery_tag
     end
 
     # Send negative message acknowledge to broker unless
@@ -47,10 +48,10 @@ module Msgr
     # @api public
     #
     def nack
-      unless acked?
-        @acked = true
-        @connection.nack delivery_info.delivery_tag
-      end
+      return if acked?
+
+      @acked = true
+      @connection.nack delivery_info.delivery_tag
     end
   end
 end

data/lib/msgr/railtie.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
 module Msgr
-
   class Railtie < ::Rails::Railtie
     config.msgr = ActiveSupport::OrderedOptions.new
-    config.autoload_paths << File.expand_path("#{Rails.root}/app/consumers") if File.exist?("#{Rails.root}/app/consumers")
+
+    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
@@ -40,7 +43,7 @@ module Msgr
 
         cfg = HashWithIndifferentAccess.new cfg[Rails.env]
         unless cfg[:uri]
-          raise ArgumentError, 'Could not load rabbitmq environment config: URI missing.'
+          raise ArgumentError.new('Could not load rabbitmq environment config: URI missing.')
         end
 
         case cfg[:autostart]
@@ -49,7 +52,7 @@ module Msgr
           when false, 'false', 'disabled', nil
             cfg[:autostart] = false
           else
-            raise ArgumentError, "Invalid value for rabbitmq config autostart: \"#{cfg[:autostart]}\""
+            raise ArgumentError.new("Invalid value for rabbitmq config autostart: \"#{cfg[:autostart]}\"")
         end
 
         case cfg[:checkcredentials]
@@ -58,7 +61,7 @@ module Msgr
           when false, 'false', 'disabled'
             cfg[:checkcredentials] = false
           else
-            raise ArgumentError, "Invalid value for rabbitmq config checkcredentials: \"#{cfg[:checkcredentials]}\""
+            raise ArgumentError.new("Invalid value for rabbitmq config checkcredentials: \"#{cfg[:checkcredentials]}\"")
         end
 
         case cfg[:raise_exceptions]
@@ -67,7 +70,7 @@ module Msgr
           when false, 'false', 'disabled', nil
             cfg[:raise_exceptions] = false
           else
-            raise ArgumentError, "Invalid value for rabbitmq config raise_exceptions: \"#{cfg[:raise_exceptions]}\""
+            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
@@ -76,7 +79,7 @@ module Msgr
 
       def load_config(options)
         if options.rabbitmq_config || !Rails.application.respond_to?(:config_for)
-          load_file options.rabbitmq_config || Rails.root.join(*%w(config rabbitmq.yml))
+          load_file options.rabbitmq_config || Rails.root.join('config', 'rabbitmq.yml')
         else
           conf = Rails.application.config_for :rabbitmq
 
@@ -85,7 +88,7 @@ module Msgr
       end
 
       def load_file(path)
-        YAML.load ERB.new(File.read(path)).result
+        YAML.safe_load ERB.new(File.read(path)).result
       end
     end
   end

data/lib/msgr/route.rb

@@ -1,26 +1,34 @@
+# frozen_string_literal: true
 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
     def initialize(key, opts = {})
       @opts = opts
       raise ArgumentError.new 'Missing `to` options.' unless @opts[:to]
 
       add key
 
-      if (match = /\A(?<consumer>\w+)#(?<action>\w+)\z/.match(opts[:to].strip.to_s))
-        @consumer = "#{match[:consumer].camelize}Consumer"
-        @action   = match[:action].underscore
-      else
-        raise ArgumentError.new "Invalid consumer format: #{opts[:to].strip.to_s.inspect}. Must be `consumer_class#action`."
+      result = MATCH_REGEXP.match(opts[:to].strip.to_s)
+
+      unless result
+        raise ArgumentError.new \
+          "Invalid consumer format: #{opts[:to].strip.to_s.inspect}. " \
+          'Must be `consumer_class#action`.'
       end
+
+      @consumer = "#{result[:consumer].camelize}Consumer"
+      @action   = result[:action].underscore
     end
 
     def keys
       @keys ||= []
     end
-    alias_method :routing_keys, :keys
+    alias routing_keys keys
 
     def add(key)
       raise ArgumentError.new 'Routing key required.' unless key.present?
@@ -28,7 +36,7 @@ module Msgr
       keys << key
     end
 
-    def accept?(key, opts)
+    def accept?(_key, opts)
       self.opts == opts
     end
 

data/lib/msgr/routes.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 module Msgr
-
   class Routes
     include Logging
     attr_reader :routes
@@ -11,7 +11,7 @@ module Msgr
 
     def configure(&block)
       blocks << block
-      instance_eval &block
+      instance_eval(&block)
     end
 
     def files
@@ -32,10 +32,10 @@ module Msgr
 
     def reload
       routes.clear
-      blocks.each { |block| instance_eval(&block) }
+      blocks.each {|block| instance_eval(&block) }
       files.uniq!
       files.each do |file|
-        if File.exists? file
+        if File.exist? file
           load file
         else
           log(:warn) { "Routes file `#{file}` does not exists (anymore)." }
@@ -44,19 +44,19 @@ module Msgr
     end
 
     def load(file)
-      raise ArgumentError.new "File `#{file}` does not exists." unless File.exists? file
+      unless File.exist?(file)
+        raise ArgumentError.new "File `#{file}` does not exists."
+      end
+
       instance_eval File.read file
     end
 
     def route(key, opts = {})
-      routes.each do |route|
-        if route.accept? key, opts
-          route.add key
-          return
-        end
+      if (route = routes.find {|r| r.accept?(key, opts) })
+        route.add key
+      else
+        routes << Msgr::Route.new(key, opts)
       end
-
-      routes << Msgr::Route.new(key, opts)
     end
   end
 end

data/lib/msgr/test_pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Msgr
   class TestPool
     def initialize(*)
@@ -25,10 +26,12 @@ module Msgr
       end
     end
 
-    alias_method :reset, :clear
+    alias reset clear
 
     private
 
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength
     def ns_run(count: 1, timeout: 5)
       received = 0
 
@@ -66,7 +69,7 @@ module Msgr
         @instance ? @instance.clear : nil
       end
 
-      alias_method :reset, :clear
+      alias reset clear
     end
   end
 end

data/lib/msgr/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Msgr
   module VERSION
     MAJOR = 0
@@ -6,6 +7,8 @@ module Msgr
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 
-    def self.to_s; STRING end
+    def self.to_s
+      STRING
+    end
   end
 end

data/lib/msgr.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'msgr/version'
 require 'active_support'
 require 'active_support/core_ext/object/blank'
@@ -21,7 +22,6 @@ require 'msgr/test_pool'
 require 'msgr/railtie' if defined? Rails
 
 module Msgr
-
   class << self
     attr_writer :client, :config
     delegate :publish, to: :client
@@ -43,9 +43,7 @@ module Msgr
       @logger
     end
 
-    def logger=(logger)
-      @logger = logger
-    end
+    attr_writer :logger
 
     def start
       client.start

data/scripts/simple_test.rb

@@ -1,4 +1,5 @@
-$:.unshift File.join File.dirname(__FILE__), '../lib'
+# frozen_string_literal: true
+$LOAD_PATH.unshift File.join File.dirname(__FILE__), '../lib'
 require 'msgr'
 
 Msgr.logger.level = Logger::Severity::INFO
@@ -19,8 +20,7 @@ end
 
 #
 class NullPool
-  def initialize(*)
-  end
+  def initialize(*); end
 
   def post(*args)
     yield(*args)
@@ -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/fixtures/msgr-routes-test-1.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 # Test routes
 route 'abc.#', to: 'test#index'

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

@@ -1,3 +1,3 @@
+# frozen_string_literal: true
 class ApplicationConsumer < Msgr::Consumer
-
 end

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

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
 class TestConsumer < ApplicationConsumer
-
   def index
-    data = { fuubar: 'abc' }
+    data = {fuubar: 'abc'}
 
     publish data, to: 'local.test.another_action'
   end
 
   def another_action
-    puts "#{payload.inspect}"
+    puts payload.inspect.to_s
   end
 end

data/spec/integration/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.

data/spec/integration/dummy/app/controllers/test_controller.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 class TestController < ApplicationController
-
   def index
-    @data = { abc: 'abc' }
+    @data = {abc: 'abc'}
 
     Msgr.publish @data, to: 'local.test.index'
 

data/spec/integration/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 module ApplicationHelper
 end

data/spec/integration/dummy/bin/bundle

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

data/spec/integration/dummy/bin/rails

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

data/spec/integration/dummy/bin/rake

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
@@ -21,4 +22,3 @@ module Dummy
     config.msgr.logger = Logger.new $stdout
   end
 end
-

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Load the Rails application.
 require File.expand_path('../application', __FILE__)
 

data/spec/integration/dummy/config/environments/development.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/integration/dummy/config/environments/production.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/integration/dummy/config/environments/test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -14,7 +15,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/integration/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/spec/integration/dummy/config/initializers/filter_parameter_logging.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

data/spec/integration/dummy/config/initializers/inflections.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/integration/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/integration/dummy/config/initializers/secret_token.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Your secret key is used for verifying the integrity of signed cookies.

data/spec/integration/dummy/config/initializers/session_store.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'

data/spec/integration/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

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

@@ -1,3 +1,4 @@
 
+# frozen_string_literal: true
 route 'local.test.index', to: 'test#index'
 route 'local.test.another_action', to: 'test#another_action'

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

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 Dummy::Application.routes.draw do
-
   root to: 'test#index'
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
@@ -41,7 +41,7 @@ Dummy::Application.routes.draw do
   #       get 'recent', on: :collection
   #     end
   #   end
-  
+
   # Example resource route with concerns:
   #   concern :toggleable do
   #     post 'toggle'

data/spec/integration/msgr/dispatcher_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class DispatcherTestConsumer < Msgr::Consumer
@@ -8,13 +9,13 @@ end
 
 class DispatcherRaiseConsumer < Msgr::Consumer
   def index
-    raise ArgumentError, 'Not happy with the payload'
+    raise ArgumentError.new('Not happy with the payload')
   end
 end
 
 describe Msgr::Dispatcher do
   let(:dispatcher) { described_class.new config }
-  let(:config) { { max: 1 } }
+  let(:config) { {max: 1} }
   let(:consumer) { 'DispatcherTestConsumer' }
   let(:route) do
     double(:route).tap do |t|
@@ -28,8 +29,8 @@ describe Msgr::Dispatcher do
     end
   end
   let(:delivery_info) do
-     double(:delivery_info).tap do |ti|
-       allow(ti).to receive(:delivery_tag).and_return(3)
+    double(:delivery_info).tap do |ti|
+      allow(ti).to receive(:delivery_tag).and_return(3)
     end
   end
   let(:payload) { {} }
@@ -39,7 +40,7 @@ describe Msgr::Dispatcher do
     end
   end
   let(:message) { Msgr::Message.new connection, delivery_info, metadata, payload, route }
-  let(:action) { -> { dispatcher.call message }}
+  let(:action) { -> { dispatcher.call message } }
 
   it 'should consume message' do
     expect_any_instance_of(DispatcherTestConsumer).to receive(:index)

data/spec/integration/msgr/railtie_spec.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Msgr::Railtie do
-
   describe 'configuration options' do
     let(:config) { Rails.configuration }
 
@@ -19,32 +19,32 @@ describe Msgr::Railtie do
       subject { -> { action } }
 
       context 'with config without url' do
-        let(:settings) { {"test" => { hans: 'otto'}} }
+        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'}} }
+        let(:settings) { {'test' => {uri: 'hans', autostart: 'unvalid'}} }
 
-        it { should raise_error 'Invalid value for rabbitmq config 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'}} }
+        let(:settings) { {'test' => {uri: 'hans', checkcredentials: 'unvalid'}} }
 
-        it { should raise_error 'Invalid value for rabbitmq config 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'}} }
+        let(:settings) { {'test' => {uri: 'franz', raise_exceptions: 'unvalid'}} }
 
-        it { should raise_error 'Invalid value for rabbitmq config 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'}} }
+      let(:settings) { {'test' => {uri: 'test'}} }
 
       context '[:routing_file]' do
         subject { super()[:routing_file] }
@@ -53,7 +53,7 @@ describe Msgr::Railtie do
     end
 
     context 'with set routes file' do
-      let(:settings) { {"test" => { uri: 'test', 'routing_file' => 'my fancy file' }} }
+      let(:settings) { {'test' => {uri: 'test', 'routing_file' => 'my fancy file'}} }
 
       context '[:routing_file]' do
         subject { super()[:routing_file] }
@@ -62,7 +62,7 @@ describe Msgr::Railtie do
     end
 
     context 'with uri as symbol' do
-      let(:settings) { {"test" => { uri: "hans"}}}
+      let(:settings) { {'test' => {uri: 'hans'}} }
 
       context '[:uri]' do
         subject { super()[:uri] }
@@ -71,7 +71,7 @@ describe Msgr::Railtie do
     end
 
     context 'with uri as string' do
-      let(:settings) { {"test" => { 'uri' => "hans"}}}
+      let(:settings) { {'test' => {'uri' => 'hans'}} }
 
       context '[:uri]' do
         subject { super()[:uri] }
@@ -80,7 +80,7 @@ describe Msgr::Railtie do
     end
 
     context 'without raise_exceptions config' do
-      let(:settings) { {"test" => { 'uri' => 'hans'}, "development" => { 'uri' => 'hans_dev'}}}
+      let(:settings) { {'test' => {'uri' => 'hans'}, 'development' => {'uri' => 'hans_dev'}} }
 
       describe '[:raise_exceptions]' do
         subject { super()[:raise_exceptions] }
@@ -92,14 +92,14 @@ describe Msgr::Railtie do
   describe '#load' do
     let(:config) do
       cfg = ActiveSupport::OrderedOptions.new
-      cfg.rabbitmq_config = Rails.root.join *%w(config rabbitmq.yml)
+      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} })
+        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test', autostart: true})
         Msgr::Railtie.load config
       end
     end
@@ -107,7 +107,7 @@ describe Msgr::Railtie do
     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' } })
+        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test'})
         Msgr::Railtie.load config
       end
     end
@@ -115,7 +115,7 @@ describe Msgr::Railtie do
     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' } })
+        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test'})
         Msgr::Railtie.load config
       end
     end
@@ -123,7 +123,7 @@ describe Msgr::Railtie do
     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 } })
+        expect(Msgr::Railtie).to receive(:load_config).and_return('test' => {uri: 'test', checkcredentials: false})
         Msgr::Railtie.load config
       end
     end

data/spec/integration/msgr_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe TestController, type: :request do

data/spec/integration/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Bundler setup
 require 'bundler'
 Bundler.require :default, :test, :rails
@@ -16,14 +17,13 @@ require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration) && Rails::VERSION::MAJOR >= 4
 
 RSpec.configure do |config|
-
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.

data/spec/msgr/msgr/connection_spec.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Msgr::Connection do
-
   describe '#rebind' do
     let(:conn) { double }
     let(:routes) { Msgr::Routes.new }

data/spec/msgr/msgr/consumer_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 # describe Msgr::Consumer do

data/spec/msgr/msgr/route_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Msgr::Route do
@@ -9,27 +10,27 @@ describe Msgr::Route do
 
   describe '#initialize' do
     it 'should require `to` option' do
-      expect {
+      expect do
         Msgr::Route.new(routing_key, {})
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'should require routing_key' do
-      expect {
+      expect do
         Msgr::Route.new nil, options
-      }.to raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'should require not empty routing_key' do
-      expect {
+      expect do
         Msgr::Route.new '', options
-      }.to raise_error ArgumentError, /routing key required/i
+      end.to raise_error ArgumentError, /routing key required/i
     end
 
     it 'should require `to: "consumer#action` format' do
-      expect {
+      expect do
         Msgr::Route.new routing_key, to: 'abc'
-      }.to raise_error ArgumentError, /invalid consumer format/i
+      end.to raise_error ArgumentError, /invalid consumer format/i
     end
   end
 

data/spec/msgr/msgr/routes_spec.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Msgr::Routes do
   let(:routes) { Msgr::Routes.new }
 
   describe '#configure' do
-    let(:block) { Proc.new{} }
+    let(:block) { proc {} }
 
     it 'should evaluate given block within instance context' do
       expect(routes).to receive(:instance_eval) do |&p|
@@ -47,7 +48,7 @@ describe Msgr::Routes do
     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)
+      expect { subject.call }.to change { routes.routes.size }.from(0).to(1)
     end
 
     it 'should add given route' do
@@ -60,14 +61,14 @@ describe Msgr::Routes do
 
     context 'with same target' do
       let(:subject) do
-        -> 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)
+        expect { subject.call }.to change { routes.routes.size }.from(0).to(1)
       end
 
       it 'should add second binding to first route' do
@@ -87,7 +88,7 @@ describe Msgr::Routes do
   end
 
   describe 'reload' do
-    before { File.stub(:exists?).and_return(true) }
+    before { File.stub(:exist?).and_return(true) }
 
     it 'should trigger load for all files' do
       expect(routes).to receive(:load).with('cde.rb').ordered

data/spec/msgr/msgr_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 class Receiver
@@ -36,7 +37,7 @@ describe Msgr do
 
     client.publish 'Payload', to: 'test.index'
 
-    Timeout::timeout(4) { queue.pop }
+    Timeout.timeout(4) { queue.pop }
   end
 
   it 'should redelivery failed messages' do
@@ -45,6 +46,6 @@ describe Msgr do
 
     client.publish 'Payload', to: 'test.error'
 
-    Timeout::timeout(4) { queue.pop }
+    Timeout.timeout(4) { queue.pop }
   end
 end

data/spec/msgr/spec_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Bundler setup
 require 'bundler'
 Bundler.setup :default, :test
@@ -10,7 +11,7 @@ end
 
 require 'msgr'
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
 
 RSpec.configure do |config|
   config.order = 'random'

data/spec/support/setup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler'
 
 # Somewhere between
@@ -16,7 +17,7 @@ require 'bundler'
 
 module Bundler
   class << self
-    alias :old_setup :setup
+    alias old_setup setup
     def setup(*groups)
       old_setup(*groups) unless groups.empty?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1.b125
+  version: 0.14.1.1.b126
 platform: ruby
 authors:
 - Jan Graichen
@@ -80,6 +80,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile