basquiat 1.2.0 → 1.3.0.pre.1

data/spec/lib/adapters/rabbitmq_adapter_spec.rb

@@ -5,8 +5,8 @@ describe Basquiat::Adapters::RabbitMq do
   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 } }],
+    { 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 } }
   end
 
@@ -29,33 +29,37 @@ describe Basquiat::Adapters::RabbitMq do
     end
 
     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.publish('some.event', data: 'coisa')
+        sleep 0.7
+
+        expect(coisa).to eq('ArgumentError')
+      end
+
       it '#subscribe_to some event' do
         message = ''
-        adapter.subscribe_to('some.event',
-                             ->(msg) { message << msg[:data].upcase! })
+        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
+        adapter.publish('some.event', data: 'message')
+        sleep 0.7
 
-        expect(message).to eq('COISA')
+        expect(message).to eq('MESSAGE')
       end
     end
 
-    it '#subscribe_to other event with #' do
+    it '#subscribe_to other.event with #' do
       message_received = ''
-      subject.subscribe_to('other.event.#',
-                           lambda do |msg|
-                             msg[:data].upcase!
-                             message_received = msg
-                           end)
+      subject.subscribe_to('other.event.#', ->(msg) { message_received = msg[:data].upcase })
       subject.listen(block: false)
 
-      subject.publish('other.event.extra.info', data: 'some stuff')
-      sleep 0.3 # Wait for the listening thread.
+      subject.publish('other.event.test', data: 'some stuff')
+      sleep 0.7
 
-      expect(message_received).to eq(data: 'SOME STUFF')
+      expect(message_received).to eq('SOME STUFF')
     end
-
   end
 
   def remove_queues_and_exchanges

data/spec/lib/basquiat_spec.rb

@@ -1,12 +1,6 @@
 require 'spec_helper'
 
 describe Basquiat do
-  after(:all) do
-    Basquiat.configure do |config|
-      config.config_file = File.expand_path('../../support/basquiat.yml', __FILE__)
-    end
-  end
-
   it 'should have a version number' do
     expect(Basquiat::VERSION).not_to be_nil
   end

data/spec/lib/interfaces/base_spec.rb

@@ -1,19 +1,20 @@
 require 'spec_helper'
 
-# Sample class used for testing
-class SampleClass
-  extend Basquiat::Base
-  self.event_adapter = Basquiat::Adapters::Test
-end
-
 describe Basquiat::Base do
+  # Sample class used for testing
+  class SampleClass
+    extend Basquiat::Base
+    self.adapter = Basquiat::Adapters::Test
+  end
+
   subject { SampleClass }
 
-  it '.event_adapter' do
+  it '.event_adapter= / .adapter=' do
     expect(subject).to respond_to(:event_adapter=)
+    expect(subject).to respond_to(:adapter=)
   end
 
-  it '.event_source(option_hash)' do
+  it '.adapter_options(option_hash)' do
     expect(subject).to respond_to(:adapter_options)
   end
 
@@ -45,8 +46,8 @@ describe Basquiat::Base do
 
     it 'publishes to the configured queue and exchanges' do
       expect do
-        subject.publish('test.message', message: 'useful test message')
-      end.to change { subject.adapter.events('test.message').size }.by(1)
+        defaults.publish('test.message', message: 'useful test message')
+      end.to change { defaults.adapter.events('test.message').size }.by(1)
     end
   end
 
@@ -88,13 +89,4 @@ describe Basquiat::Base do
       expect(subject.listen(block: false)).to eq(%w(e e e))
     end
   end
-
-  it 'trigger an event after processing a message' do
-    subject.publish('some.event', 'some message')
-    subject.instance_eval <<-METHCALL
-    subscribe_to 'some.event', ->(msg) { publish('other.event', "Redirected \#{msg}") }
-    METHCALL
-    expect { subject.listen(block: false) }.to_not raise_error
-    expect(subject.adapter.events('other.event').size).to eq(1)
-  end
 end

data/spec/lib/support/configuration_spec.rb

@@ -62,12 +62,4 @@ describe Basquiat::Configuration do
 
     expect(config.exchange_name).to eq('super.nice_exchange')
   end
-
-  it '#reload_classes' do
-    class MyTest
-      extend Basquiat::Base
-    end
-
-    config.reload_classes
-  end
 end

data/spec/lib/support/hash_refinements_spec.rb

@@ -14,8 +14,8 @@ describe Basquiat::HashRefinements do
   end
 
   it '#deep_merge with nested different hashes' do
-    base   = { queue: { options: { some: 'value' } } }
-    other  = { queue: { options: { another: 'setting' } } }
+    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

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $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/ }
@@ -17,9 +17,5 @@ end
 ENV['BASQUIAT_ENV'] = 'test'
 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

@@ -1,9 +1,12 @@
+require 'uri'
+require 'net/http'
+
 class QueueStats
   def initialize(queue)
     @queue = queue
-    host   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_25672_TCP_ADDR', 'localhost')
+    host   = ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_15672_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}"
+    @uri   = URI.parse("http://#{host}:#{port}/api/queues/%2F/#{@queue}")
   end
 
   def unacked_messages
@@ -17,7 +20,10 @@ class QueueStats
   end
 
   def fetch
-    `curl -sXGET -H 'Accepts: application/json' #{@uri}`
+    req = Net::HTTP::Get.new @uri
+    req.basic_auth('guest', 'guest')
+    res = Net::HTTP.start(@uri.host, @uri.port) { |http| http.request(req) }
+    res.body
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basquiat
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.pre.1
 platform: ruby
 authors:
 - Marcello "mereghost" Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: guard-yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: stomp
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: metric_fu
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: metric_fu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,14 +248,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Basquiat is a library that intends to abstract all the complexity of working with message queues
+description: 'Basquiat is a library that intends to abstract all the complexity of
+  working with message queues
+
+'
 email:
 - marcello.rocha@gmail.com.br
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".metrics"
 - ".reek"
@@ -282,6 +285,7 @@ files:
 - 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/auto_acknowledge.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
@@ -305,8 +309,10 @@ files:
 - 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/auto_acknowledge_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/requeue_strategies/delayed_delivery_spec.rb
 - spec/lib/adapters/rabbitmq_adapter_spec.rb
 - spec/lib/adapters/test_adapter_spec.rb
 - spec/lib/basquiat_spec.rb
@@ -333,9 +339,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -349,8 +355,10 @@ test_files:
 - 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/auto_acknowledge_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/requeue_strategies/delayed_delivery_spec.rb
 - spec/lib/adapters/rabbitmq_adapter_spec.rb
 - spec/lib/adapters/test_adapter_spec.rb
 - spec/lib/basquiat_spec.rb
@@ -362,3 +370,4 @@ test_files:
 - spec/support/basquiat.yml
 - spec/support/rabbitmq_queue_matchers.rb
 - spec/support/shared_examples/basquiat_adapter_shared_examples.rb
+has_rdoc: