basquiat 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9d30c5b9e300401aaae4a4f540e669089bd54fb
-  data.tar.gz: 8f55ad82b149cf79dc7298f456ddd2f07d60eba4
+SHA256:
+  metadata.gz: b56c04fa01dfd0ac7184fb888147847eaf32984b3f4c45288f320643d009f76c
+  data.tar.gz: c79977131ec506e134765047d91bd35cefb6b8c4c33abee851815bf08f81c1ab
 SHA512:
-  metadata.gz: a6ab916581627800c6244ebf6a0c1c50e8f137d3a0d2f34212369e6ddec45b9e9402ca97bda3fb448494c865c680a0a5de8f41df35b018b0b60a85ae8f5136d9
-  data.tar.gz: 34cfdbe22e53a74953de85808ec55493b7dc95317476e1cfa71c75f851198b3fc6caa7ba558f918fd60d53fc9baf9f99bd662d44e427ead0fdf6e2fc1c7ccf82
+  metadata.gz: b086c6f28292cb39c7c26f27027e01489908a0301401e1a78b9fe42ca828925ae4a907779067eb7acc60400c03fb48c9ee9e1362265f0e88c7ad92f062436f47
+  data.tar.gz: 9902027d312973ba2e5eeace7712c76dbfbd7a7c87de6bcaae2ea8215ea886dfbf406170a3685c3d4df70f0b7414b98c549e2a3eb23c1d65be6c6aa765873232

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in basquiat.gemspec

data/Guardfile

@@ -4,20 +4,24 @@ guard :bundler do
   watch('basquiat.gemspec')
 end
 
-guard :rspec, cmd: 'bundle exec rspec', all_on_start: true,
-      keep: true, all_after_pass: true, run_all: { cmd: 'rspec -f progress' } do
-  watch(%r{^spec/.+_spec.rb$})
-  watch(%r{^spec/lib/.+_spec.rb$})
-  watch(%r{^lib/basquiat/(.+)\.rb$}) { |matchdata| "spec/lib/#{matchdata[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { 'spec' }
-  watch(%r{spec/support/.+\.rb}) { 'spec' }
-end
+group :bdd, halt_on_fail: true do
+  guard :rspec, cmd:    'bundle exec rspec', keep: true, all_on_start: true,
+        all_after_pass: true, run_all: { cmd: 'rspec -f progress' } do
+    watch(%r{^spec/.+_spec.rb$})
+    watch(%r{^spec/lib/.+_spec.rb$})
+    watch(%r{^lib/basquiat/(.+)\.rb$}) { |matchdata| "spec/lib/#{matchdata[1]}_spec.rb" }
+    watch('spec/spec_helper.rb') { 'spec' }
+    watch(%r{spec/support/.+\.rb}) { 'spec' }
+  end
 
-guard :rubocop, cmd: 'rubocop', cli: '-fs -c./.rubocop.yml' do
-  # watch(%r{.+\.rb$})
-  # watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  guard :rubocop, cmd: 'rubocop', cli: '-D -E -fs -c./.rubocop.yml' do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end
 
-guard 'yard', cli: '-r' do
-  watch %r{lib/.+\.rb}
+group :docs do
+  guard 'yard', cli: '-r' do
+    watch(%r{lib/.+\.rb}) { 'lib' }
+  end
 end

data/basquiat.gemspec

@@ -33,7 +33,7 @@ EOD
   spec.add_development_dependency 'yajl-ruby'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'metric_fu'
+  spec.add_development_dependency 'rubycritic'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'yard'
 

data/lib/basquiat.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'multi_json'
 require 'naught'
 require 'yaml'

data/lib/basquiat/adapters.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 require 'basquiat/adapters/base_adapter'
 require 'basquiat/adapters/test_adapter'

data/lib/basquiat/adapters/base_adapter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'delegate'
 require 'basquiat/adapters/base_message'
 
@@ -91,10 +92,12 @@ module Basquiat
         raise Basquiat::Errors::SubclassResponsibility
       end
       # @!endgroup
+      #
+      attr_reader :procs
 
       private
 
-      attr_reader :procs, :options
+      attr_reader :options
     end
   end
 end

data/lib/basquiat/adapters/base_message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     # The simplest Message class. It's encouraged to tailor it to your adapter needs (hence BaseMessage).

data/lib/basquiat/adapters/rabbitmq/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq
@@ -10,16 +11,17 @@ module Basquiat
           @options = { connection:
                          { hosts: ['localhost'],
                            port: 5672,
-                           auth: { user: 'guest', password: 'guest' }
-                         },
+                           auth: { user: 'guest', password: 'guest' } },
                        queue: {
                          name: Basquiat.configuration.queue_name,
                          durable: true,
-                         options: {} },
+                         options: {}
+                       },
                        exchange: {
                          name: Basquiat.configuration.exchange_name,
                          durable: true,
-                         options: {} },
+                         options: {}
+                       },
                        publisher: { confirm: true, persistent: false },
                        consumer: { prefetch: 1000, manual_ack: true },
                        requeue: { enabled: false } }

data/lib/basquiat/adapters/rabbitmq/connection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq
@@ -60,7 +61,8 @@ module Basquiat
             recovery_attempts:         @failover.fetch(:max_retries, 5),
             network_recovery_interval: @failover.fetch(:default_timeout, 5),
             connection_timeout:        @failover.fetch(:connection_timeout, 5),
-            logger:                    Basquiat.logger)
+            logger:                    Basquiat.logger
+          )
           __setobj__(@connection)
         end
       end

data/lib/basquiat/adapters/rabbitmq/events.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq

data/lib/basquiat/adapters/rabbitmq/message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq

data/lib/basquiat/adapters/rabbitmq/requeue_strategies.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'basquiat/adapters/rabbitmq/requeue_strategies/base_strategy'
 require 'basquiat/adapters/rabbitmq/requeue_strategies/auto_acknowledge'
 require 'basquiat/adapters/rabbitmq/requeue_strategies/basic_acknowledge'

data/lib/basquiat/adapters/rabbitmq/requeue_strategies/auto_acknowledge.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq

data/lib/basquiat/adapters/rabbitmq/requeue_strategies/base_strategy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq

data/lib/basquiat/adapters/rabbitmq/requeue_strategies/basic_acknowledge.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq

data/lib/basquiat/adapters/rabbitmq/requeue_strategies/dead_lettering.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq
@@ -11,8 +12,12 @@ module Basquiat
               session: {
                 queue: {
                   options: {
-                    'x-dead-letter-exchange' => opts.fetch(:exchange, 'basquiat.dlx') } } },
-              dlx:     { ttl: opts.fetch(:ttl, 1_000) } }
+                    'x-dead-letter-exchange' => opts.fetch(:exchange, 'basquiat.dlx')
+                  }
+                }
+              },
+              dlx:     { ttl: opts.fetch(:ttl, 1_000) }
+            }
           end
 
           def session_options

data/lib/basquiat/adapters/rabbitmq/requeue_strategies/delayed_delivery.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq
@@ -76,7 +77,8 @@ module Basquiat
                                             durable:   true,
                                             arguments: {
                                               'x-dead-letter-exchange' => session.exchange.name,
-                                              'x-message-ttl'          => timeout * 1_000 })
+                                              'x-message-ttl'          => timeout * 1_000
+                                            })
             queue.bind(@exchange, routing_key: "#{timeout * 1_000}.#")
           end
         end

data/lib/basquiat/adapters/rabbitmq/session.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     class RabbitMq
@@ -31,8 +32,8 @@ module Basquiat
         end
 
         def queue
-          @queue ||= channel.queue(@options[:queue][:name],
-                                   durable:   @options[:queue][:durable],
+          @queue ||= channel.queue(@options.dig(:queue, :name),
+                                   durable:   @options.dig(:queue, :durable),
                                    arguments: (@options[:queue][:options] || {}))
         end
 

data/lib/basquiat/adapters/rabbitmq_adapter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bunny'
 require 'delegate'
 
@@ -8,6 +9,8 @@ module Basquiat
     class RabbitMq < Basquiat::Adapters::Base
       using Basquiat::HashRefinements
 
+      attr_reader :procs
+
       # Avoid superclass mismatch errors
       require 'basquiat/adapters/rabbitmq/events'
       require 'basquiat/adapters/rabbitmq/message'
@@ -17,8 +20,8 @@ module Basquiat
       require 'basquiat/adapters/rabbitmq/requeue_strategies'
 
       # Initializes the superclass using a {Events} object as the procs instance variable
-      def initialize
-        super(procs: Events.new)
+      def initialize(procs: Events.new)
+        super(procs: procs)
       end
 
       # Since the RabbitMQ configuration options are quite vast and it's interations with the requeue strategies a bit
@@ -57,7 +60,7 @@ module Basquiat
 
       def process_message(message, rescue_proc)
         procs[message.routing_key].call(message)
-      rescue => ex
+      rescue StandardError => ex
         rescue_proc.call(ex, message)
       end
 

data/lib/basquiat/adapters/test_adapter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Adapters
     # An adapter to be used in testing
@@ -9,7 +10,7 @@ module Basquiat
         end
 
         def clean
-          @events.clear if @events
+          @events&.clear
         end
       end
 
@@ -39,6 +40,10 @@ module Basquiat
         msg ? procs[event].call(BaseMessage.new(msg)) : nil
       end
 
+      def connected?
+        true
+      end
+
       private
 
       def subscribed_event

data/lib/basquiat/errors.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 require 'basquiat/errors/subclass_responsibility'
 require 'basquiat/errors/strategy_not_registered'

data/lib/basquiat/errors/strategy_not_registered.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Errors
     class StrategyNotRegistered < KeyError

data/lib/basquiat/errors/subclass_responsibility.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module Errors
     class SubclassResponsibility < NoMethodError

data/lib/basquiat/interfaces/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 
 module Basquiat
@@ -19,7 +20,8 @@ module Basquiat
     end
 
     def reload_adapter_from_configuration
-      @adapter = Kernel.const_get Basquiat.configuration.default_adapter
+      @procs = adapter.procs
+      self.adapter = Kernel.const_get(Basquiat.configuration.default_adapter)
       adapter_options Basquiat.configuration.adapter_options
     end
 
@@ -28,7 +30,7 @@ module Basquiat
     #   @return [Basquiat::Adapter] the adapter instance for the current class
     #   @deprecated event_adapter is deprecated and will be removed eventually. Please use {#adapter}.
     def adapter=(adapter_klass)
-      @adapter = adapter_klass.new
+      @adapter = @procs ? adapter_klass.new(procs: @procs) : adapter_klass.new
     end
 
     alias event_adapter= adapter=

data/lib/basquiat/rails/railtie.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   class Railtie < ::Rails::Railtie
     initializer 'load_basquiat_configuration' do

data/lib/basquiat/support.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'basquiat/support/hash_refinements'
 require 'basquiat/support/configuration'
 require 'basquiat/support/json'

data/lib/basquiat/support/configuration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'naught'
 require 'erb'
 require 'basquiat/support/hash_refinements'
@@ -61,7 +62,7 @@ module Basquiat
 
     # @return [Hash] return the configured adapter options. Defaults to an empty {::Hash}
     def adapter_options
-      config.fetch(:adapter_options) { Hash.new }
+      config.fetch(:adapter_options) { {} }
     end
 
     # @return [String] return the configured default adapter. Defaults to {Adapters::Test}
@@ -81,7 +82,7 @@ module Basquiat
     end
 
     def load_yaml(path)
-      @yaml = YAML.load(ERB.new(IO.readlines(path).join).result).symbolize_keys
+      @yaml = YAML.safe_load(ERB.new(IO.readlines(path).join).result).symbolize_keys
     end
 
     def setup_basic_options

data/lib/basquiat/support/hash_refinements.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   module HashRefinements
     # @!method deep_merge
@@ -25,8 +26,12 @@ module Basquiat
 
       def symbolize_keys
         each_with_object({}) do |(key, value), new_hash|
-          new_key = key.to_sym rescue key
-          new_value         = (value.is_a? Hash) ? value.symbolize_keys : value
+          new_key = begin
+                      key.to_sym
+                    rescue StandardError
+                      key
+                    end
+          new_value         = value.is_a?(Hash) ? value.symbolize_keys : value
           new_hash[new_key] = new_value
         end
       end

data/lib/basquiat/support/json.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Basquiat
   # A simple MultiJson wrapper to protect against eventual API changes.
   module Json

data/lib/basquiat/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
+
 # Version file
 module Basquiat
-  VERSION = '1.3.2'
+  VERSION = '1.3.4'
 end

data/spec/lib/adapters/base_adapter_spec.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
 # Sample class used for testing
-describe Basquiat::Adapters::Base do
+RSpec.describe Basquiat::Adapters::Base do
   subject(:adapter) { Basquiat::Adapters::Base.new }
 
-  [:disconnect, :subscribe_to, :publish].each do |meth|
+  %i[disconnect subscribe_to publish].each do |meth|
     it "raise a SubclassResponsibility error if #{meth} isn't implemented" do
       expect { adapter.public_send(meth) }.to raise_error Basquiat::Errors::SubclassResponsibility
     end

data/spec/lib/adapters/base_message_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat::Adapters::BaseMessage do
+RSpec.describe Basquiat::Adapters::BaseMessage do
   subject(:message) { Basquiat::Adapters::BaseMessage.new({ data: 'everything is AWESOME!' }.to_json) }
 
   it 'delegates calls to the JSON' do

data/spec/lib/adapters/rabbitmq/configuration_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
 class AwesomeStrategy < Basquiat::Adapters::RabbitMq::BaseStrategy
@@ -8,11 +8,11 @@ class AwesomeStrategy < Basquiat::Adapters::RabbitMq::BaseStrategy
   end
 end
 
-describe Basquiat::Adapters::RabbitMq::Configuration do
+RSpec.describe Basquiat::Adapters::RabbitMq::Configuration do
   subject(:config) { Basquiat::Adapters::RabbitMq::Configuration.new }
 
   # used by the Adapter::Base class
-  describe '#merge_user_options', focus: true do
+  describe '#merge_user_options' do
     it 'merges the user supplied options with the default ones' do
       config.merge_user_options(queue: { name: 'config.test.queue' })
       expect(config.base_options[:queue][:name]).to eq('config.test.queue')
@@ -39,7 +39,7 @@ describe Basquiat::Adapters::RabbitMq::Configuration do
       expect { config.strategy }.to raise_error Basquiat::Errors::StrategyNotRegistered
     end
 
-    it 'deals with the requeue strategy options', focus: true do
+    it 'deals with the requeue strategy options' do
       Basquiat::Adapters::RabbitMq.register_strategy :dlx, Basquiat::Adapters::RabbitMq::DeadLettering
       config.merge_user_options(requeue: { enabled: true, strategy: 'dlx', options: { exchange: 'dlx.topic' } })
       expect(config.session_options[:queue][:options]).to include('x-dead-letter-exchange' => 'dlx.topic')

data/spec/lib/adapters/rabbitmq/connection_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::Connection do
+RSpec.describe Basquiat::Adapters::RabbitMq::Connection do
   subject(:connection) { Basquiat::Adapters::RabbitMq::Connection }
 
   let(:hosts) do
@@ -34,7 +34,7 @@ describe Basquiat::Adapters::RabbitMq::Connection do
     it 'uses another server after all retries on a single one' do
       conn = connection.new(hosts: hosts, failover: failover)
       expect { conn.start }.to_not raise_error
-      expect(conn.host).to match "#{ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' }}"
+      expect(conn.host).to match(ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' })
       conn.close
     end
   end

data/spec/lib/adapters/rabbitmq/events_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::Events do
+RSpec.describe Basquiat::Adapters::RabbitMq::Events do
   subject(:events) { Basquiat::Adapters::RabbitMq::Events.new }
 
   context 'basic functionality' do
@@ -21,7 +21,7 @@ describe Basquiat::Adapters::RabbitMq::Events do
     let(:proc) { -> { 'Hello from the lambda! o/' } }
 
     describe '*' do
-      let(:words) { %w(awesome lame dumb cool) }
+      let(:words) { %w[awesome lame dumb cool] }
 
       it 'event.* does not match event_some_word' do
         events['event.*'] = proc
@@ -64,18 +64,19 @@ describe Basquiat::Adapters::RabbitMq::Events do
         end
       end
     end
+
     describe '#' do
       context 'matches any number of words' do
         it '# matches all events' do
           events['#'] = proc
-          %w(some.cool.event event cool.event).each do |event|
+          %w[some.cool.event event cool.event].each do |event|
             expect(events[event]).to eq(proc)
           end
         end
 
         it 'matches specific events' do
           events['#.event'] = proc
-          %w(some.cool.event cool.event).each do |event|
+          %w[some.cool.event cool.event].each do |event|
             expect(events[event]).to eq(proc)
           end
           expect { events['event'] }.to raise_error KeyError

data/spec/lib/adapters/rabbitmq/message_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::Message do
+RSpec.describe Basquiat::Adapters::RabbitMq::Message do
   let(:json) do
     { key: 'value', date: Date.new.iso8601 }.to_json
   end

data/spec/lib/adapters/rabbitmq/requeue_strategies/auto_acknowledge_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::AutoAcknowledge do
+RSpec.describe Basquiat::Adapters::RabbitMq::AutoAcknowledge do
   let(:adapter) { Basquiat::Adapters::RabbitMq.new }
   let(:base_options) do
     { connection: { hosts: [ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' }],

data/spec/lib/adapters/rabbitmq/requeue_strategies/base_strategy_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
 RSpec.describe Basquiat::Adapters::RabbitMq::BaseStrategy do

data/spec/lib/adapters/rabbitmq/requeue_strategies/basic_acknowledge_spec.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe 'Requeue Strategies' do
+RSpec.describe 'Requeue Strategies' do
   let(:adapter) { Basquiat::Adapters::RabbitMq.new }
   let(:base_options) do
     { connection: { hosts: [ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' }],
                     port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } },
       publisher: { persistent: true },
-      requeue: { enabled: true, strategy: 'basic_ack' }
-    }
+      requeue: { enabled: true, strategy: 'basic_ack' } }
   end
 
   before(:each) { adapter.adapter_options(base_options) }

data/spec/lib/adapters/rabbitmq/requeue_strategies/dead_lettering_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::DeadLettering do
+RSpec.describe Basquiat::Adapters::RabbitMq::DeadLettering do
   let(:adapter) { Basquiat::Adapters::RabbitMq.new }
   let(:base_options) do
     { connection: { hosts: [ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' }],

data/spec/lib/adapters/rabbitmq/requeue_strategies/delayed_delivery_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
+RSpec.describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
   let(:adapter) { Basquiat::Adapters::RabbitMq.new }
   let(:base_options) do
     { connection: { hosts: [ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' }],

data/spec/lib/adapters/rabbitmq_adapter_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
-require 'spec_helper'
+
 require 'basquiat/adapters/rabbitmq_adapter'
 
-describe Basquiat::Adapters::RabbitMq do
+RSpec.describe Basquiat::Adapters::RabbitMq do
   subject(:adapter) { Basquiat::Adapters::RabbitMq.new }
 
   let(:base_options) do
@@ -32,8 +32,8 @@ describe Basquiat::Adapters::RabbitMq do
     context 'listener' do
       it 'runs the rescue block when an exception happens' do
         coisa = ''
-        adapter.subscribe_to('some.event', ->(_msg) { fail ArgumentError })
-        adapter.listen(block: false, rescue_proc: -> (ex, _msg) { coisa = ex.class.to_s })
+        adapter.subscribe_to('some.event', ->(_msg) { raise ArgumentError })
+        adapter.listen(block: false, rescue_proc: ->(ex, _msg) { coisa = ex.class.to_s })
         adapter.publish('some.event', data: 'coisa')
         sleep 0.3
 

data/spec/lib/adapters/test_adapter_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat::Adapters::Test do
+RSpec.describe Basquiat::Adapters::Test do
   subject(:adapter) { Basquiat::Adapters::Test.new }
 
   context 'publisher' do

data/spec/lib/basquiat_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat do
+RSpec.describe Basquiat do
   it 'should have a version number' do
     expect(Basquiat::VERSION).not_to be_nil
   end

data/spec/lib/interfaces/base_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat::Base do
+RSpec.describe Basquiat::Base do
   # Sample class used for testing
   class SampleClass
     extend Basquiat::Base
@@ -87,7 +86,7 @@ describe Basquiat::Base do
       end
 
       subject.subscribe_to('some.event', :test_method)
-      expect(subject.listen(block: false)).to eq(%w(e e e))
+      expect(subject.listen(block: false)).to eq(%w[e e e])
     end
   end
 end

data/spec/lib/support/configuration_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat::Configuration do
+RSpec.describe Basquiat::Configuration do
   subject(:config) { Basquiat::Configuration.new }
 
   context 'accessors' do

data/spec/lib/support/hash_refinements_spec.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require 'spec_helper'
 
-describe Basquiat::HashRefinements do
+RSpec.describe Basquiat::HashRefinements do
   using Basquiat::HashRefinements
 
   subject(:hash) do

data/spec/lib/support/json_spec.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-describe Basquiat::Json do
+
+RSpec.describe Basquiat::Json do
   it "returns an empty hash if it can't parse the payload" do
     expect(Basquiat::Json.decode('Idaho Potato')).to eq({})
   end

data/spec/spec_helper.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'codeclimate-test-reporter'
 require 'simplecov'
 
-CodeClimate::TestReporter.start
-
 SimpleCov.start do
   add_filter { |source| source.lines_of_code <= 3 }
   add_filter { |source| source.filename =~ /spec/ }
@@ -22,3 +20,16 @@ require 'basquiat'
 
 require 'support/shared_examples/basquiat_adapter_shared_examples'
 require 'support/rabbitmq_queue_matchers'
+
+RSpec.configure do |config|
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+  config.disable_monkey_patching!
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.order = :random
+end

data/spec/support/rabbitmq_queue_matchers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'uri'
 require 'net/http'
 
@@ -7,11 +8,11 @@ class QueueStats
     @queue = queue
     host   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_15672_TCP_ADDR', 'localhost')
     port   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_15672_TCP_PORT', 15_672)
-    @uri   = URI.parse("http://#{host}:#{port}/api/queues/%2F/#{@queue}")
+    @uri   = URI.parse("http://#{host}:#{port}/api/queues/%2f/#{@queue}")
   end
 
   def unacked_messages
-    queue_status.fetch(:messages_unacknowledged)
+    queue_status.fetch(:messages_unacknowledged) { 0 }
   end
 
   private
@@ -40,7 +41,7 @@ end
 
 RSpec::Matchers.define :have_unacked_messages do
   match do |queue|
-    QueueStats.new(queue.name).unacked_messages > 0
+    QueueStats.new(queue.name).unacked_messages.positive?
   end
 
   failure_message_when_negated do |queue|

data/spec/support/shared_examples/basquiat_adapter_shared_examples.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 shared_examples_for 'a Basquiat::Adapter' do
-  [:adapter_options,
-   :base_options,
-   :default_options,
-   :publish,
-   :subscribe_to,
-   :disconnect].each do |meth|
+  %i[adapter_options
+     base_options
+     default_options
+     publish
+     subscribe_to
+     disconnect].each do |meth|
     it meth.to_s do
       expect(adapter).to respond_to(:meth)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basquiat
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Marcello "mereghost" Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metric_fu
+  name: rubycritic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A pluggable library that aims to hide message queue complexity
@@ -360,4 +360,3 @@ test_files:
 - spec/support/basquiat.yml
 - spec/support/rabbitmq_queue_matchers.rb
 - spec/support/shared_examples/basquiat_adapter_shared_examples.rb
-has_rdoc: