basquiat 1.3.0.pre.1 → 1.3.0

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+require 'spec_helper'
+require 'basquiat/adapters/rabbitmq_adapter'
+
+RSpec.describe Basquiat::Adapters::RabbitMq::BaseStrategy do
+  subject(:strategy) { Basquiat::Adapters::RabbitMq::BaseStrategy.new(Object.new) }
+
+  it 'needs to be extended' do
+    expect { strategy.run('messages') }.to raise_error Basquiat::Errors::SubclassResponsibility
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
@@ -5,20 +6,26 @@ 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 } }
+                    port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } },
+      publisher: { persistent: true },
+      requeue: { enabled: true, strategy: 'basic_ack' }
+    }
   end
 
   before(:each) { adapter.adapter_options(base_options) }
   after(:each) { remove_queues_and_exchanges(adapter) }
 
-  describe 'BasickAcknowledge (aka the default)' do
+  describe 'BasickAcknowledge' do
+    it 'certify that BasicAcknowledge is being used' do
+      expect(adapter.strategy.class).to eq Basquiat::Adapters::RabbitMq::BasicAcknowledge
+    end
+
     it 'acks a message by default' do
       adapter.subscribe_to('some.event', ->(_) { 'Everything is AWESOME!' })
       adapter.listen(block: false)
 
       adapter.publish('some.event', data: 'stupid message')
-      sleep 0.5 # Wait for the listening thread.
+      sleep 0.3 # Wait for the listening thread.
 
       expect(adapter.session.queue.message_count).to eq(0)
       expect(adapter.session.queue).to_not have_unacked_messages
@@ -29,7 +36,7 @@ describe 'Requeue Strategies' do
       adapter.listen(block: false)
 
       adapter.publish('some.event', data: 'stupid message')
-      sleep 0.5 # Wait for the listening thread.
+      sleep 0.3 # Wait for the listening thread.
 
       expect(adapter.session.queue.message_count).to eq(0)
       expect(adapter.session.queue).to_not have_unacked_messages

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
@@ -5,13 +6,13 @@ 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' }],
-                    port:  ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } },
+                    port: ENV.fetch('BASQUIAT_RABBITMQ_1_PORT_5672_TCP_PORT') { 5672 } },
       publisher: { persistent: true } }
   end
 
   before(:each) do
     adapter.adapter_options(base_options)
-    adapter.adapter_options(requeue: { enabled: true, strategy: 'dead_lettering' })
+    adapter.adapter_options(requeue: { enabled: true, strategy: 'dead_lettering', options: { ttl: 100 } })
   end
 
   after(:each) { remove_queues_and_exchanges(adapter) }
@@ -31,12 +32,12 @@ describe Basquiat::Adapters::RabbitMq::DeadLettering do
     channel = session.channel
     expect(channel.queues.keys).to include('basquiat.dlq')
     expect(channel.queues['basquiat.dlq'].arguments)
-      .to match(hash_including('x-dead-letter-exchange' => session.exchange.name, 'x-message-ttl' => 1000))
+      .to match(hash_including('x-dead-letter-exchange' => session.exchange.name, 'x-message-ttl' => 100))
     expect(session.queue.arguments).to match(hash_including('x-dead-letter-exchange' => 'basquiat.dlx'))
 
     expect do
       channel.exchanges['basquiat.dlx'].publish('some message', routing_key: 'some.event')
-      sleep 0.1
+      sleep 0.01
     end.to change { channel.queues['basquiat.dlq'].message_count }.by(1)
   end
 
@@ -53,7 +54,7 @@ describe Basquiat::Adapters::RabbitMq::DeadLettering do
       end
     end
 
-    it 'this queue then process the message' do
+    it 'from this queue then process the message' do
       sample = 0
       adapter.subscribe_to('sample.message',
                            lambda do |msg|
@@ -64,18 +65,20 @@ describe Basquiat::Adapters::RabbitMq::DeadLettering do
       adapter.listen(block: false)
       adapter.publish('sample.message', key: 'message')
 
-      sleep 3
+      sleep 0.5
       expect(sample).to eq(3)
     end
 
-    it 'another queue then drop the message' do
+    it 'from another queue then drop the message' do
       ack_count = 0
-      sample    = 0
+      sample = 0
 
       other = Basquiat::Adapters::RabbitMq.new
-      other.adapter_options(base_options.merge(queue:
-                                                        { name: 'other_queue' },
-                                               requeue: { enabled: true, strategy: 'dead_lettering', ttl: 5 }))
+      other.adapter_options(base_options.merge(queue: { name: 'other_queue' },
+                                               requeue: { enabled: true,
+                                                          strategy: 'dead_lettering',
+                                                          options: { ttl: 100 } }))
+
       other.subscribe_to('sample.message', ->(_msg) { ack_count += 1 })
 
       adapter.subscribe_to('sample.message',
@@ -88,7 +91,7 @@ describe Basquiat::Adapters::RabbitMq::DeadLettering do
       adapter.listen(block: false)
       adapter.publish('sample.message', key: 'message')
 
-      sleep 3
+      sleep 0.5
       remove_queues_and_exchanges(other)
       expect(ack_count).to eq(1)
       expect(sample).to eq(3)

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
@@ -6,13 +7,12 @@ describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
   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 } }
+      publisher:  { persistent: true } }
   end
 
   before(:each) do
     adapter.adapter_options(base_options)
-    adapter.class.register_strategy :ddl, Basquiat::Adapters::RabbitMq::DelayedDelivery
-    adapter.adapter_options(requeue: { enabled: true, strategy: 'ddl' })
+    adapter.adapter_options(requeue: { enabled: true, strategy: 'delayed_delivery', options: { retries: 3 } })
     adapter.strategy # initialize the strategy
   end
 
@@ -26,8 +26,7 @@ describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
   it 'creates the timeout queues' do
     channel = adapter.session.channel
     expect(channel.queues.keys).to contain_exactly('basquiat.ddlq_1', 'basquiat.ddlq_2', 'basquiat.ddlq_4',
-                                                   'basquiat.ddlq_8', 'basquiat.ddlq_16', 'basquiat.queue',
-                                                   'basquiat.ddlq_rejected')
+                                                   'basquiat.queue', 'basquiat.ddlq_rejected')
   end
 
   it 'set the message ttl and dead letter exchange for the delayed queues' do
@@ -36,7 +35,7 @@ describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
     expect(channel.queues['basquiat.ddlq_1'].arguments)
       .to match(hash_including('x-dead-letter-exchange' => session.exchange.name, 'x-message-ttl' => 1_000))
 
-    expect(channel.queues['basquiat.ddlq_8'].arguments['x-message-ttl']).to eq(8_000)
+    expect(channel.queues['basquiat.ddlq_4'].arguments['x-message-ttl']).to eq(4_000)
   end
 
   it 'binds the delayed queues' do
@@ -78,7 +77,7 @@ describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
       adapter.listen(block: false)
 
       expect do
-        session.publish('32000.basquiat.queue.some.event', data: 'some message')
+        session.publish('4000.basquiat.queue.some.event', data: 'some message')
         sleep 0.3
       end.to change { session.channel.queues['basquiat.ddlq_rejected'].message_count }.by(1)
     end
@@ -97,7 +96,7 @@ describe Basquiat::Adapters::RabbitMq::DelayedDelivery do
                            end)
       adapter.listen(block: false)
       session.publish('some.event', data: 'some message')
-      sleep 1.3
+      sleep 0.5
       expect(analysed).to eq(1)
       expect(session.queue).to_not have_unacked_messages
     end

data/spec/lib/adapters/rabbitmq_adapter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 require 'basquiat/adapters/rabbitmq_adapter'
 
@@ -34,7 +35,7 @@ describe Basquiat::Adapters::RabbitMq do
         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
+        sleep 0.3
 
         expect(coisa).to eq('ArgumentError')
       end
@@ -44,7 +45,7 @@ describe Basquiat::Adapters::RabbitMq do
         adapter.subscribe_to('some.event', ->(msg) { message = msg[:data].upcase })
         adapter.listen(block: false)
         adapter.publish('some.event', data: 'message')
-        sleep 0.7
+        sleep 0.3
 
         expect(message).to eq('MESSAGE')
       end
@@ -56,7 +57,7 @@ describe Basquiat::Adapters::RabbitMq do
       subject.listen(block: false)
 
       subject.publish('other.event.test', data: 'some stuff')
-      sleep 0.7
+      sleep 0.3
 
       expect(message_received).to eq('SOME STUFF')
     end

data/spec/lib/adapters/test_adapter_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'spec_helper'
 
 describe Basquiat::Adapters::Test do

data/spec/lib/basquiat_spec.rb

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

data/spec/lib/interfaces/base_spec.rb

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

data/spec/lib/support/configuration_spec.rb

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

data/spec/lib/support/hash_refinements_spec.rb

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

data/spec/lib/support/json_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 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({})

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
+# 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/ }

data/spec/support/rabbitmq_queue_matchers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'uri'
 require 'net/http'
 

data/spec/support/shared_examples/basquiat_adapter_shared_examples.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 shared_examples_for 'a Basquiat::Adapter' do
   [:adapter_options,
    :base_options,
@@ -5,7 +6,7 @@ shared_examples_for 'a Basquiat::Adapter' do
    :publish,
    :subscribe_to,
    :disconnect].each do |meth|
-    it "#{meth}" do
+    it meth.to_s do
       expect(adapter).to respond_to(:meth)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basquiat
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Marcello "mereghost" Rocha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -258,24 +258,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".gitignore"
-- ".metrics"
-- ".reek"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - basquiat.gemspec
-- basquiat_docker.sh
-- docker-compose.yml
-- docker/Dockerfile
-- docker/guard_start.sh
 - lib/basquiat.rb
 - lib/basquiat/adapters.rb
 - lib/basquiat/adapters/base_adapter.rb
@@ -310,6 +298,7 @@ files:
 - 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/base_strategy_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
@@ -339,12 +328,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A pluggable library that aims to hide message queue complexity
@@ -356,6 +345,7 @@ test_files:
 - 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/base_strategy_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

data/.codeclimate.yml

@@ -1,50 +0,0 @@
-# This is a sample .codeclimate.yml configured for Engine analysis on Code
-# Climate Platform. For an overview of the Code Climate Platform, see here:
-# http://docs.codeclimate.com/article/300-the-codeclimate-platform
-
-# Under the engines key, you can configure which engines will analyze your repo.
-# Each key is an engine name. For each value, you need to specify enabled: true
-# to enable the engine as well as any other engines-specific configuration.
-
-# For more details, see here:
-# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
-
-# For a list of all available engines, see here:
-# http://docs.codeclimate.com/article/296-engines-available-engines
-
-engines:
-# to turn on an engine, add it here and set enabled to `true`
-# to turn off an engine, set enabled to `false` or remove it
-  rubocop:
-    enabled: true
-  golint:
-    enabled: false
-  gofmt:
-    enabled: false
-  eslint:
-    enabled: false
-  csslint:
-    enabled: false
-
-# Engines can analyze files and report issues on them, but you can separately
-# decide which files will receive ratings based on those issues. This is
-# specified by path patterns under the ratings key.
-
-# For more details see here:
-# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
-
-# Note: If the ratings key is not specified, this will result in a 0.0 GPA on your dashboard.
-
-# ratings:
-#   paths:
-#   - app/**
-#   - lib/**
-#   - "**.rb"
-#   - "**.go"
-
-# You can globally exclude files from being analyzed by any engine using the
-# exclude_paths key.
-
-#exclude_paths:
-#- spec/**/*
-#- vendor/**/*

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea
-bin
-docker/Gemfile
-log
-.tags*
-doc

data/.metrics

@@ -1,6 +0,0 @@
-MetricFu::Configuration.run do |config|
-  config.configure_metric(:cane) do |cane|
-    cane.line_length = 120
-    cane.no_doc = 'y'
-  end
-end

data/.reek

@@ -1,2 +0,0 @@
-IrresponsibleModule:
-  enabled: false

data/.rspec

@@ -1,5 +0,0 @@
---format documentation
---color
---fail-fast
---order rand
---require spec_helper

data/.rubocop.yml

@@ -1,14 +0,0 @@
-AllCops:
-  Exclude:
-    - 'bin/*'
-    - 'docker/*'
-    - 'Guardfile'
-    - 'basquiat.gemspec'
-Metrics/LineLength:
-  Max: 119
-
-Style/AlignHash:
-  EnforcedHashRocketStyle: table
-
-Style/Documentation:
-  Enabled: false

data/.ruby-gemset

@@ -1 +0,0 @@
-basquiat

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.2.3

data/basquiat_docker.sh

@@ -1,35 +0,0 @@
-#!/bin/sh
-function bundle_list() {
-    bundle list
-}
-
-function generate_gemfile() {
-    bundle_list | awk '
-    BEGIN {
-        FS=" "
-        print "source \"https://rubygems.org\"";
-        format = "gem \"%s\", \"%s\"\r\n";
-    }
-    {
-        if ($2 == "bundler") {
-            next;
-        }
-        if ($1 == "*") {
-            match($3, "[^()]+");
-            version = substr($3,RSTART,RLENGTH);
-            printf format, $2, version;
-        }
-    }' > docker/Gemfile
-}
-
-function stop_and_remove_containers {
-    docker-compose stop rabbitmq
-    docker rm basquiat_basquiat_run_1
-    docker rm --volumes=true basquiat_rabbitmq_1 
-}
-
-generate_gemfile
-docker-compose start rabbitmq
-docker-compose run --service-ports basquiat
-
-trap stop_and_remove_containers EXIT SIGINT SIGTERM SIGKILL

data/docker/Dockerfile

@@ -1,15 +0,0 @@
-FROM mereghost/ruby:2.2.2
-
-RUN useradd -mg users -G network dev
-VOLUME /basquiat
-WORKDIR /basquiat
-
-ENV REFRESHED_AT 2015-03-29
-USER dev
-COPY Gemfile /tmp/Gemfile
-
-#This is needed by bundler =/
-ENV GEM_HOME=/home/dev/.gem
-RUN cd /tmp && bundle install
-
-EXPOSE 8808

data/docker/guard_start.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-cd /basquiat
-bin/guard start -c --no-notify -p

data/docker-compose.yml

@@ -1,15 +0,0 @@
-basquiat:
-  build: docker
-  command: /basquiat/docker/guard_start.sh
-  volumes:
-    - ./:/basquiat
-  links:
-    - rabbitmq
-  ports:
-    - "8808"
-
-rabbitmq:
-  image: rabbitmq:3-management
-  ports:
-    - "15672"
-    - "5672"