basquiat 1.1.1 → 1.2.0

data/spec/lib/adapters/rabbitmq_adapter_spec.rb

@@ -2,78 +2,68 @@ require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
 describe Basquiat::Adapters::RabbitMq do
-  subject { Basquiat::Adapters::RabbitMq.new }
-
-  it_behaves_like 'a Basquiat::Adapter'
+  subject(:adapter) { Basquiat::Adapters::RabbitMq.new }
 
   let(:base_options) do
-    { servers: [{ host: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' },
-                  port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } }] }
-  end
-
-  before(:each) do
-    subject.adapter_options(base_options)
-  end
-
-  after(:each) do
-    remove_queues_and_exchanges
+    { servers:   [{ host: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_ADDR') { 'localhost' },
+                    port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } }],
+      publisher: { persistent: true } }
   end
 
-  context 'failover' do
-    let(:failover_settings) do
-      base_options[:servers].unshift({ host: 'localhost', port: 1234 })
-      base_options.merge(failover: { default_timeout: 0.2, max_retries: 2 })
+  context 'RabbitMQ interactions' do
+    before(:each) do
+      adapter.adapter_options(base_options)
+      adapter.reset_connection
     end
 
-    it 'tries a reconnection after a few seconds' do
-      subject.adapter_options(servers:  [host: 'localhost', port: 1234],
-                              failover: { default_timeout: 0.2, max_retries: 1 })
-      expect { subject.connect }.to raise_exception(Bunny::TCPConnectionFailed)
+    after(:each) do
+      remove_queues_and_exchanges
     end
 
-    it 'uses another server after all retries on a single one' do
-      subject.adapter_options(failover_settings)
-      expect { subject.connect }.to_not raise_error
-      expect(subject.connection_uri).to match(/5672/)
+    context 'publisher' do
+      it '#publish [enqueue a message]' do
+        expect do
+          adapter.publish('messages.welcome', data: 'A Nice Welcome Message')
+        end.to_not raise_error
+      end
     end
-  end
 
-  it '#connected?' do
-    expect(subject.connected?).to be_nil
-    subject.connect
-    expect(subject.connected?).to_not be_nil
-  end
+    context 'listener' do
+      it '#subscribe_to some event' do
+        message = ''
+        adapter.subscribe_to('some.event',
+                             ->(msg) { message << msg[:data].upcase! })
+        adapter.listen(block: false)
+        adapter.publish('some.event', data: 'coisa')
+        sleep 0.7 # Wait for the listening thread
 
-  context 'publisher' do
-    it '#publish [enqueue a message]' do
-      expect do
-        subject.publish('messages.welcome', data: 'A Nice Welcome Message')
-      end.to_not raise_error
+        expect(message).to eq('COISA')
+      end
     end
-  end
 
-  context 'listener' do
-    it '#subscribe_to some event' do
+    it '#subscribe_to other event with #' do
       message_received = ''
-      subject.subscribe_to('some.event', lambda do |msg|
-                                         msg[:data].upcase!
-                                         message_received = msg
-                                       end)
+      subject.subscribe_to('other.event.#',
+                           lambda do |msg|
+                             msg[:data].upcase!
+                             message_received = msg
+                           end)
       subject.listen(block: false)
 
-      subject.publish('some.event', data: 'coisa')
-      sleep 0.1 # Wait for the listening thread.
+      subject.publish('other.event.extra.info', data: 'some stuff')
+      sleep 0.3 # Wait for the listening thread.
 
-      expect(message_received).to eq(data: 'COISA')
+      expect(message_received).to eq(data: 'SOME STUFF')
     end
+
   end
 
   def remove_queues_and_exchanges
-    subject.send(:queue).delete
-    subject.send(:exchange).delete
+    adapter.session.queue.delete
+    adapter.session.exchange.delete
   rescue Bunny::TCPConnectionFailed
     true
   ensure
-    subject.send(:disconnect)
+    adapter.send(:disconnect)
   end
 end

data/spec/lib/adapters/test_adapter_spec.rb

@@ -1,59 +1,55 @@
 require 'spec_helper'
 
 describe Basquiat::Adapters::Test do
-  subject { Basquiat::Adapters::Test.new }
-  it_behaves_like 'a Basquiat::Adapter'
+  subject(:adapter) { Basquiat::Adapters::Test.new }
 
   context 'publisher' do
     it '#publish [enqueue a message]' do
       expect do
-        subject.publish('messages.welcome', value: 'A Nice Welcome Message')
-      end.to change { subject.events('messages.welcome').size }.by(1)
-      expect(subject.events('messages.welcome')[0]).to match(/A Nice Welcome Message/)
+        adapter.publish('messages.welcome', value: 'A Nice Welcome Message')
+      end.to change { adapter.events('messages.welcome').size }.by(1)
+      expect(adapter.events('messages.welcome')[0]).to match(/A Nice Welcome Message/)
     end
   end
 
   context 'listener' do
     before(:each) do
-      subject.publish('some.event', data: 'some message')
+      adapter.publish('some.event', data: 'some message')
     end
 
     it '#subscribe_to some event' do
-      subject.subscribe_to('some.event', ->(msg) { msg.values.map(&:upcase) })
-      expect(subject.listen).to eq(['SOME MESSAGE'])
+      adapter.subscribe_to('some.event', ->(msg) { msg.values.map(&:upcase) })
+      expect(adapter.listen).to eq(['SOME MESSAGE'])
     end
 
     it '#subscribe_to multiple events' do
-      subject.instance_eval <<-METHCALL
+      adapter.instance_eval <<-METHCALL
         subscribe_to('some.event', ->(msg) { publish 'some.other', data: msg.values.first.upcase; msg })
       METHCALL
-      subject.subscribe_to('some.other', ->(msg) { msg.values.first.downcase })
-      expect(subject.listen).to eq(data: 'some message')
-      expect(subject.events('some.other')[0]).to match(/SOME MESSAGE/)
-      expect(subject.listen).to eq('some message')
+      adapter.subscribe_to('some.other', ->(msg) { msg.values.first.downcase })
+      expect(adapter.listen).to eq(data: 'some message')
+      expect(adapter.events('some.other')[0]).to match(/SOME MESSAGE/)
+      expect(adapter.listen).to eq('some message')
     end
   end
 
   describe '#clean' do
     context 'when no event has been published' do
-
       it 'should have no event registered' do
         Basquiat::Adapters::Test.clean
-
         expect(Basquiat::Adapters::Test.events).to be_empty
       end
     end
 
     context 'when some events have been published' do
       before do
-        subject.publish('some.message', value: 'A Nice Welcome Message')
-        subject.publish('some.message', value: 'A Nasty Welcome Message')
-        subject.publish('other.message', value: 'A Random Welcome Message')
+        adapter.publish('some.message', value: 'A Nice Welcome Message')
+        adapter.publish('some.message', value: 'A Nasty Welcome Message')
+        adapter.publish('other.message', value: 'A Random Welcome Message')
       end
 
       it 'should have no event registered' do
         Basquiat::Adapters::Test.clean
-
         expect(Basquiat::Adapters::Test.events).to be_empty
       end
     end

data/spec/lib/support/configuration_spec.rb

@@ -58,7 +58,7 @@ describe Basquiat::Configuration do
 
   it 'settings provided on the config file have lower precedence' do
     config.exchange_name = 'super.nice_exchange'
-    config.config_file = File.join(File.dirname(__FILE__), '../../support/basquiat.yml')
+    config.config_file   = File.join(File.dirname(__FILE__), '../../support/basquiat.yml')
 
     expect(config.exchange_name).to eq('super.nice_exchange')
   end

data/spec/lib/support/hash_refinements_spec.rb

@@ -8,11 +8,18 @@ describe Basquiat::HashRefinements do
   end
 
   it '#deep_merge' do
-    hash.deep_merge({ 'hash' => { 'inner_key' => 7, 'other_inner_key' => 10 } })
+    hash.deep_merge('hash' => { 'inner_key' => 7, 'other_inner_key' => 10 })
     expect(hash['hash']).to have_key('other_inner_key')
     expect(hash['hash']['inner_key']).to eq(7)
   end
 
+  it '#deep_merge with nested different hashes' do
+    base   = { queue: { options: { some: 'value' } } }
+    other  = { queue: { options: { another: 'setting' } } }
+    base.deep_merge(other)
+    expect(base[:queue][:options].keys).to contain_exactly(:some, :another)
+  end
+
   it '#symbolize_keys' do
     symbol_hash = hash.symbolize_keys
     expect(symbol_hash).to have_key(:array)
@@ -20,5 +27,4 @@ describe Basquiat::HashRefinements do
     expect(symbol_hash).to have_key(:hash)
     expect(symbol_hash[:hash]).to have_key(:inner_key)
   end
-
 end

data/spec/spec_helper.rb

@@ -6,10 +6,12 @@ SimpleCov.start do
   add_filter { |source| source.lines_of_code <= 3 }
   add_filter { |source| source.filename =~ /spec/ }
 
-  add_group('Adapters') { |source| source.filename =~ /basquiat\/adapters/ }
-  add_group('Interfaces') { |source| source.filename =~ /basquiat\/interfaces/ }
-  add_group('Support') { |source| source.filename =~ /basquiat\/support/ }
-  add_group('Main Gem File') { |source| source.filename =~ %r{\/lib\/basquiat\.rb$} }
+  add_group('Adapters') { |source| source.filename =~ %r{lib/basquiat/adapters} }
+  add_group('RabbitMQ') { |source| source.filename =~ %r{lib/basquiat/adapters/rabbitmq} }
+  add_group('Errors') { |source| source.filename =~ %r{lib/basquiat/errors} }
+  add_group('Interfaces') { |source| source.filename =~ %r{lib/basquiat/interfaces} }
+  add_group('Main') { |source| source.filename =~ %r{lib/basquiat\.rb$} }
+  add_group('Support') { |source| source.filename =~ %r{lib/basquiat/support} }
 end
 
 ENV['BASQUIAT_ENV'] = 'test'
@@ -17,6 +19,7 @@ require 'basquiat'
 
 Basquiat.configure do |config|
   config.config_file = File.expand_path('../support/basquiat.yml', __FILE__)
+  config.logger      = Logger.new('log/basquiat_test.log')
 end
-
 require 'support/shared_examples/basquiat_adapter_shared_examples'
+require 'support/rabbitmq_queue_matchers'

data/spec/support/rabbitmq_queue_matchers.rb

@@ -0,0 +1,53 @@
+class QueueStats
+  def initialize(queue)
+    @queue = queue
+    host   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_25672_TCP_ADDR', 'localhost')
+    port   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_15672_TCP_PORT', 15_672)
+    @uri   = "http://guest:guest@#{host}:#{port}/api/queues/%2F/#{@queue}"
+  end
+
+  def unacked_messages
+    queue_status.fetch(:messages_unacknowledged)
+  end
+
+  private
+
+  def queue_status
+    @message ||= MultiJson.load(fetch, symbolize_keys: true)
+  end
+
+  def fetch
+    `curl -sXGET -H 'Accepts: application/json' #{@uri}`
+  end
+end
+
+RSpec::Matchers.define :have_n_unacked_messages do |expected| # number of unacked messages
+  match do |queue| # queue
+    expected == QueueStats.new(queue.name).unacked_messages
+  end
+
+  failure_message do |queue|
+    "expected #{expected} unacked messages but got #{QueueStats.new(queue.name).unacked_messages}"
+  end
+end
+
+RSpec::Matchers.define :have_unacked_messages do
+  match do |queue|
+    QueueStats.new(queue.name).unacked_messages > 0
+  end
+
+  failure_message_when_negated do |queue|
+    "expected #{queue.name} to have 0 unacked messages but got #{QueueStats.new(queue.name).unacked_messages}"
+  end
+end
+
+# convenience method
+def remove_queues_and_exchanges(adapter)
+  # Ugly as hell. Probably transform into a proper method in session
+  adapter.session.channel.queues.each_pair { |_, queue| queue.delete }
+  adapter.session.channel.exchanges.each_pair { |_, ex| ex.delete }
+rescue Bunny::TCPConnectionFailed
+  true
+ensure
+  adapter.reset_connection
+end

data/spec/support/shared_examples/basquiat_adapter_shared_examples.rb

@@ -1,23 +1,12 @@
 shared_examples_for 'a Basquiat::Adapter' do
-  it '#adapter_options(opts)' do
-    expect(subject).to respond_to(:adapter_options)
-  end
-
-  it '#publish' do
-    expect(subject).to respond_to(:publish)
-  end
-
-  it '#default_options [template for option initialization]' do
-    expect(subject).to respond_to(:default_options)
-  end
-
-  it '#subscribe_to' do
-    expect(subject).to respond_to(:subscribe_to)
-  end
-
-  it 'merges the options with the default ones' do
-    opts = subject.instance_variable_get(:@options)
-    subject.adapter_options(nice_option: '127.0.0.2')
-    expect(opts[:nice_option]).to eq('127.0.0.2')
+  [:adapter_options,
+   :base_options,
+   :default_options,
+   :publish,
+   :subscribe_to,
+   :disconnect].each do |meth|
+    it "#{meth}" do
+      expect(adapter).to respond_to(:meth)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basquiat
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Marcello "mereghost" Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -230,25 +258,40 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".metrics"
+- ".reek"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - basquiat.gemspec
+- basquiat_docker.sh
 - docker-compose.yml
 - docker/Dockerfile
-- docker/basquiat_start.sh
+- docker/guard_start.sh
 - lib/basquiat.rb
 - lib/basquiat/adapters.rb
 - lib/basquiat/adapters/base_adapter.rb
+- lib/basquiat/adapters/base_message.rb
+- lib/basquiat/adapters/rabbitmq/configuration.rb
+- lib/basquiat/adapters/rabbitmq/connection.rb
+- lib/basquiat/adapters/rabbitmq/events.rb
+- lib/basquiat/adapters/rabbitmq/message.rb
+- lib/basquiat/adapters/rabbitmq/requeue_strategies.rb
+- lib/basquiat/adapters/rabbitmq/requeue_strategies/base_strategy.rb
+- lib/basquiat/adapters/rabbitmq/requeue_strategies/basic_acknowledge.rb
+- lib/basquiat/adapters/rabbitmq/requeue_strategies/dead_lettering.rb
+- lib/basquiat/adapters/rabbitmq/requeue_strategies/delayed_delivery.rb
+- lib/basquiat/adapters/rabbitmq/session.rb
 - lib/basquiat/adapters/rabbitmq_adapter.rb
 - lib/basquiat/adapters/test_adapter.rb
+- lib/basquiat/errors.rb
+- lib/basquiat/errors/strategy_not_registered.rb
+- lib/basquiat/errors/subclass_responsibility.rb
 - lib/basquiat/interfaces/base.rb
 - lib/basquiat/rails/railtie.rb
 - lib/basquiat/support.rb
@@ -257,6 +300,13 @@ files:
 - lib/basquiat/support/json.rb
 - lib/basquiat/version.rb
 - spec/lib/adapters/base_adapter_spec.rb
+- spec/lib/adapters/base_message_spec.rb
+- spec/lib/adapters/rabbitmq/configuration_spec.rb
+- spec/lib/adapters/rabbitmq/connection_spec.rb
+- spec/lib/adapters/rabbitmq/events_spec.rb
+- spec/lib/adapters/rabbitmq/message_spec.rb
+- spec/lib/adapters/rabbitmq/requeue_strategies/basic_acknowledge_spec.rb
+- spec/lib/adapters/rabbitmq/requeue_strategies/dead_lettering_spec.rb
 - spec/lib/adapters/rabbitmq_adapter_spec.rb
 - spec/lib/adapters/test_adapter_spec.rb
 - spec/lib/basquiat_spec.rb
@@ -266,8 +316,9 @@ files:
 - spec/lib/support/json_spec.rb
 - spec/spec_helper.rb
 - spec/support/basquiat.yml
+- spec/support/rabbitmq_queue_matchers.rb
 - spec/support/shared_examples/basquiat_adapter_shared_examples.rb
-homepage: http://www.vagas.com.br/
+homepage: http://github.com/VAGAScom/basquiat
 licenses:
 - MIT
 metadata: {}
@@ -287,12 +338,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A pluggable library that aims to hide message queue complexity
 test_files:
 - spec/lib/adapters/base_adapter_spec.rb
+- spec/lib/adapters/base_message_spec.rb
+- spec/lib/adapters/rabbitmq/configuration_spec.rb
+- spec/lib/adapters/rabbitmq/connection_spec.rb
+- spec/lib/adapters/rabbitmq/events_spec.rb
+- spec/lib/adapters/rabbitmq/message_spec.rb
+- spec/lib/adapters/rabbitmq/requeue_strategies/basic_acknowledge_spec.rb
+- spec/lib/adapters/rabbitmq/requeue_strategies/dead_lettering_spec.rb
 - spec/lib/adapters/rabbitmq_adapter_spec.rb
 - spec/lib/adapters/test_adapter_spec.rb
 - spec/lib/basquiat_spec.rb
@@ -302,4 +360,5 @@ test_files:
 - spec/lib/support/json_spec.rb
 - spec/spec_helper.rb
 - spec/support/basquiat.yml
+- spec/support/rabbitmq_queue_matchers.rb
 - spec/support/shared_examples/basquiat_adapter_shared_examples.rb