message-driver 0.5.3 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f4ab79020017c5b2b59cf69e11aac19d8b9d15d8
+  data.tar.gz: 30f1943125aae9641606f66f4c5c29635ce9f048
+SHA512:
+  metadata.gz: a144122993d585b84ba3671f8e9b8fcec7d62ca796810dbc6686acae16bfa48e2210c9a10257a04c1e135e35ca33b2c52ef25e7742c4befee6dc2808bf9e4bb3
+  data.tar.gz: 2c1816479290c629be5af7e55fc47971de09105e7eecd430622768278205e1a21227df113c83797a6feba61583e317377d031c3b8ae6fcb77c5f88078ff8336c

data/.rubocop.yml

@@ -22,6 +22,9 @@ Metrics/LineLength:
 Style/AccessorMethodName:
   Enabled: false
 
+Style/Documentation:
+  Enabled: false
+
 Style/Encoding:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -1,10 +1,14 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-09-15 17:44:35 -0500 using RuboCop version 0.26.0.
+# on 2014-11-12 20:52:38 -0600 using RuboCop version 0.27.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 8
+Metrics/AbcSize:
+  Enabled: false
+
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
@@ -14,7 +18,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 15
+# Offense count: 17
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Enabled: false
@@ -23,16 +27,12 @@ Metrics/MethodLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# Offense count: 63
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 Style/ModuleFunction:
   Enabled: false
 

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
-cache: bundler
+sudo: true
+before_install: gem install bundler
 bundler_args: --without tools darwin
 services:
   - rabbitmq
@@ -7,7 +8,7 @@ before_script:
   - ci/travis_setup
 script: bundle exec rake ci
 rvm:
-  - 2.1
+  - 2.2
   - 2.0.0
   - 1.9.3
   - jruby-19mode
@@ -15,12 +16,33 @@ rvm:
   - rbx-2
 env:
   - ADAPTER=in_memory
-  - ADAPTER=bunny:1.2.2
-  - ADAPTER=bunny:1.3.1
-  - ADAPTER=bunny:1.4.1
-  - ADAPTER=bunny:1.5.0
+  - ADAPTER=bunny:1.7.0
+  - ADAPTER=bunny:2.0.1
+  - ADAPTER=bunny:2.1.0
+  - ADAPTER=bunny:2.2.0
   - ADAPTER=stomp
 matrix:
+  fast_finish: true
   allow_failures:
+    - rvm: rbx-2
     - rvm: jruby-19mode
-      env: ADAPTER=stomp
+    - rvm: 1.9.2
+  exclude:
+    - rvm: 1.9.2
+      env: ADAPTER=bunny:2.0.1
+    - rvm: 1.9.3
+      env: ADAPTER=bunny:2.0.1
+    - rvm: jruby-19mode
+      env: ADAPTER=bunny:2.0.1
+    - rvm: 1.9.2
+      env: ADAPTER=bunny:2.1.0
+    - rvm: 1.9.3
+      env: ADAPTER=bunny:2.1.0
+    - rvm: jruby-19mode
+      env: ADAPTER=bunny:2.1.0
+    - rvm: 1.9.2
+      env: ADAPTER=bunny:2.2.0
+    - rvm: 1.9.3
+      env: ADAPTER=bunny:2.2.0
+    - rvm: jruby-19mode
+      env: ADAPTER=bunny:2.2.0

data/.yardopts

@@ -0,0 +1,4 @@
+--no-private
+lib/**/*.rb
+-
+README.md

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-## 0.5.3 = 2014-10-23
+## 0.6.0 - 2016-01-28
+
+* official support for bunny 2.x
+* support ruby 2.3
+* drop support for bunny < 1.7
+* improved API documentation (still a WIP)
+* fix an issue with confirm_and_wait transactions erroring because there
+  was no open channel
+
+## 0.5.3 - 2014-10-23
 
 * In bunny adapter, avoid sending a tx_commit if we haven't done anything requiring
   a commit inside the transaction block.

data/Gemfile

@@ -29,6 +29,8 @@ group :tools do
   gem 'launchy'
 end
 
+gem 'thread_safe'
+
 require File.expand_path('../test_lib/broker_config', __FILE__)
 
 adapter = BrokerConfig.current_adapter.to_s
@@ -48,7 +50,7 @@ end
 
 case provider
 when :rabbitmq
-  gem 'rabbitmq_http_api_client', '> 1.3.0', github: 'soupmatt/rabbitmq_http_api_client', branch: :master
+  gem 'rabbitmq_http_api_client'
 end
 
 gem 'coveralls', require: false

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 Matt Campbell
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Rakefile

@@ -10,7 +10,9 @@ require 'coveralls/rake/task'
 
 begin
   require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+  RuboCop::RakeTask.new do |t|
+    t.fail_on_error = false
+  end
 rescue LoadError
   puts 'rubocop not present'
   task 'rubocop'
@@ -29,7 +31,7 @@ namespace :spec do
   end
 
   cucumber_opts = "--format progress --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip"
-  cucumber_opts += ' --tag ~@no_ci' if ENV['CI'] == 'true' && ENV['ADAPTER'] && ENV['ADAPTER'].start_with?('bunny')
+  cucumber_opts += ' --tag ~@no_ci' #if ENV['CI'] == 'true' && ENV['ADAPTER'] && ENV['ADAPTER'].start_with?('bunny')
   Cucumber::Rake::Task.new(:features) do |t|
     t.cucumber_opts = cucumber_opts
   end
@@ -40,6 +42,23 @@ end
 desc 'run all the specs'
 task spec: ['rabbitmq:reset_vhost', 'spec:all']
 
+begin
+  require 'yard'
+  require 'launchy'
+
+  YARD::Rake::YardocTask.new(:docs)
+  namespace :docs do
+
+    desc 'open the documentation for this gem in your browser'
+    task open: [:docs] do
+      Launchy.open("file:///#{File.join(Dir.pwd, 'doc', 'index.html')}")
+    end
+  end
+rescue LoadError
+  puts "couldn't load yard gems, doc tasks not available"
+  task :docs
+end
+
 namespace :rabbitmq do
   desc 'Reset rabbit vhost'
   task :reset_vhost do
@@ -57,7 +76,7 @@ end
 
 Coveralls::RakeTask.new
 desc 'run with code coverage'
-task ci: ['spec', 'rubocop', 'coveralls:push']
+task ci: ['spec', 'coveralls:push']
 
 namespace :undertest do
   BrokerConfig.all_adapters.each do |adapter|
@@ -68,4 +87,4 @@ namespace :undertest do
   end
 end
 
-task default: [:spec, :rubocop]
+task default: [:spec]

data/features/.nav

@@ -6,19 +6,19 @@
 - destination_metadata.feature
 - client_acks.feature
 - logging.feature
-- message_consumers (Message Consumers)
+- message_consumers (Message Consumers):
   - basics.feature
   - auto_ack_consumers.feature
   - manual_ack_consumers.feature
   - transactional_ack_consumers.feature
   - prefetch_size.feature
   - subscribe_with_a_block.feature
-- middleware
+- middleware:
   - middleware_basics.feature
   - middleware_ordering.feature
   - middleware_parameters.feature
   - middleware_with_blocks.feature
-- amqp_specific_features (AMQP-Specific Features)
+- amqp_specific_features (AMQP-Specific Features):
   - declaring_amqp_destinations.feature
   - binding_amqp_destinations.feature
   - server_named_desitnations.feature

data/features/CHANGELOG.md

@@ -0,0 +1 @@
+../CHANGELOG.md

data/features/step_definitions/logging_steps.rb

@@ -4,7 +4,7 @@ LOG_FILE_NAME = 'cucumber_log_file.log'
 
 Given(/^I am logging to a log file(?: at the (#{STRING_OR_SYM}) level)?$/) do |level|
   step "an empty file named \"#{LOG_FILE_NAME}\""
-  in_current_dir do
+  cd('.') do
     @logger = Logger.new(LOG_FILE_NAME)
   end
   step "I set the log level to #{level || 'info'}"

data/features/step_definitions/middleware_steps.rb

@@ -1,6 +1,6 @@
 Given('I have a middleware class') do |src|
   write_file('feature_middleware.rb', src)
-  in_current_dir { load './feature_middleware.rb' }
+  cd('.') { load './feature_middleware.rb' }
 end
 
 When(/^I append middleware "(.*?)" to (#{STRING_OR_SYM})$/) do |class_name, dest_name|

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -253,7 +253,7 @@ module MessageDriver
         validate_bunny_version
         @broker = broker
         @config = config
-        @ack_key = Bunny::VERSION >= '1.5.0' ? :manual_ack : :ack
+        @ack_key = :manual_ack
       end
 
       attr_reader :ack_key
@@ -338,7 +338,9 @@ module MessageDriver
           end
           begin
             if @in_confirms_transaction
-              wait_for_confirms(@channel) unless @rollback_only
+              unless @rollback_only || @channel.nil?
+                @channel.wait_for_confirms
+              end
             else
               if is_transactional? && valid? && !@need_channel_reset && @require_commit
                 handle_errors do
@@ -358,12 +360,6 @@ module MessageDriver
           end
         end
 
-        def wait_for_confirms(channel)
-          # FIXME: make the thread-safety of this better once https://github.com/ruby-amqp/bunny/issues/227 is fixed
-          channel.wait_for_confirms until channel.unconfirmed_set.empty?
-        end
-        private :wait_for_confirms
-
         def rollback_transaction
           @rollback_only = true
           commit_transaction
@@ -536,10 +532,10 @@ module MessageDriver
       end
 
       def validate_bunny_version
-        required = Gem::Requirement.create('>= 1.2.2')
+        required = Gem::Requirement.create('>= 1.7.0')
         current = Gem::Version.create(Bunny::VERSION)
         unless required.satisfied_by? current
-          fail MessageDriver::Error, 'bunny 1.2.2 or later is required for the bunny adapter'
+          fail MessageDriver::Error, 'bunny 1.7.0 or later is required for the bunny adapter'
         end
       end
     end

data/lib/message_driver/adapters/in_memory_adapter.rb

@@ -81,8 +81,14 @@ module MessageDriver
       def initialize(broker, _config = {})
         @broker = broker
         @destinations = {}
-        @message_store = Hash.new { |h, k| h[k] = [] }
-        @subscriptions = Hash.new { |h, k| h[k] = [] }
+        begin
+          require 'thread_safe'
+          @message_store = ThreadSafe::Cache.new { |h, k| h[k] = [] }
+          @subscriptions = ThreadSafe::Cache.new { |h, k| h[k] = [] }
+        rescue LoadError
+          @message_store = Hash.new { |h, k| h[k] = [] }
+          @subscriptions = Hash.new { |h, k| h[k] = [] }
+        end
       end
 
       def build_context

data/lib/message_driver/broker.rb

@@ -4,9 +4,18 @@ module MessageDriver
 
     DEFAULT_BROKER_NAME = :default
 
-    attr_reader :adapter, :configuration, :destinations, :consumers, :name
+    attr_reader :adapter
+    attr_reader :configuration
+    attr_reader :name
+
+    # @private
+    attr_reader :destinations, :consumers
 
     class << self
+      # @overload configure(options)
+      # @overload configure(name, options)
+      # @param name [Symbol] when configuring multiple brokers, this symbol will differentiate between brokers
+      # @param options [Hash] options to be passed to the adapter class
       def configure(name = DEFAULT_BROKER_NAME, options)
         if brokers.keys.include? name
           fail BrokerAlreadyConfigured, "there is already a broker named #{name} configured"
@@ -14,10 +23,11 @@ module MessageDriver
         brokers[name] = new(name, options)
       end
 
-      def define(name = DEFAULT_BROKER_NAME)
-        yield broker(name)
-      end
-
+      # @overload broker
+      # @overload broker(name)
+      # @param name [Symbol] the name of the broker you wish to define
+      # @return [Broker] the specified broker
+      # @raise [BrokerNotConfigured] if a broker by that name has not yet been configured
       def broker(name = DEFAULT_BROKER_NAME)
         result = brokers[name]
         if result.nil?
@@ -27,6 +37,17 @@ module MessageDriver
         result
       end
 
+      # Yields the specified broker so that destinations and consumers can be defined on it.
+      # @overload define
+      # @overload define(name)
+      # @param (see #broker)
+      # @yield [Broker] the specified broker
+      # @raise (see #broker)
+      def define(name = DEFAULT_BROKER_NAME)
+        yield broker(name)
+      end
+
+      # @private
       def client(name)
         unless (result = clients[name])
           result = clients[name] = Client.for_broker(name)
@@ -34,24 +55,32 @@ module MessageDriver
         result
       end
 
+      # stops all the brokers
+      # @see #stop
       def stop_all
         each_broker do |brk|
           brk.stop
         end
       end
 
+      # restarts all the brokers
+      # @see #restart
       def restart_all
         each_broker do |brk|
           brk.restart
         end
       end
 
+      # Resets all the brokers for testing purposes.
+      # @see Adapter::Base#reset_after_tests
       def reset_after_tests
         each_broker do |brk|
           brk.adapter.reset_after_tests
         end
       end
 
+      # Stops and un-configures all the brokers
+      # @see #stop
       def reset
         each_broker do |brk|
           begin
@@ -80,6 +109,7 @@ module MessageDriver
       end
     end
 
+    # @private
     def initialize(name = DEFAULT_BROKER_NAME, options)
       @name = name
       @adapter = resolve_adapter(options[:adapter], options)
@@ -90,27 +120,31 @@ module MessageDriver
       logger.debug 'MessageDriver configured successfully!'
     end
 
-    def logger
-      MessageDriver.logger
-    end
-
+    # @return [MessageDriver::Client] the client module for this broker
     def client
       @client ||= self.class.client(name)
     end
 
+    # stops the adapter for this Broker
+    # @see Adapters::Base#stop
     def stop
       @adapter.stop
       @stopped = true
     end
 
+    # @return [Boolean] true if the broker is currently stopped
     def stopped?
       @stopped
     end
 
+    # Restarts the Broker, stopping it first if needed. This results in a new
+    #   adapter instance being constructed.
+    # @return [Adapter::Base] the newly constructed adapter
     def restart
       @adapter.stop unless stopped?
       @adapter = resolve_adapter(@configuration[:adapter], @configuration)
       @stopped = false
+      @adapter
     end
 
     def dynamic_destination(dest_name, dest_options = {}, message_props = {})
@@ -127,6 +161,10 @@ module MessageDriver
       @consumers[key] = block
     end
 
+    # Find a previously declared Destination
+    # @param destination_name [Symbol] the name of the destination
+    # @return [Destination::Base] the requested destination
+    # @raise [MessageDriver::NoSuchDestinationError] if there is no destination with that name
     def find_destination(destination_name)
       destination = @destinations[destination_name]
       if destination.nil?

data/lib/message_driver/client.rb

@@ -1,30 +1,72 @@
 require 'forwardable'
 
 module MessageDriver
+  # The client module is the primary client API for MessageDriver. It can either be
+  # included in a class that is using it, or used directly.
+  #
+  # @example Included as a Module
+  #   class MyClass
+  #     include MessageDriver::Client
+  #
+  #     def do_work
+  #       publish(:my_destination, 'Hi Mom!')
+  #     end
+  #   end
+  #
+  # @example Used Directly
+  #   class DirectClass
+  #     def use_directly
+  #       MesageDriver::Client.find_destination(:my_queue)
+  #     end
+  #   end
   module Client
     include Logging
     extend self
 
-    def publish(destination, body, headers = {}, properties = {})
-      find_destination(destination).publish(body, headers, properties)
+    # @!group Defining and Looking up Destinations
+
+    def dynamic_destination(dest_name, dest_options = {}, message_props = {})
+      current_adapter_context.create_destination(dest_name, dest_options, message_props)
     end
 
-    def pop_message(destination, options = {})
-      find_destination(destination).pop_message(options)
+    # (see MessageDriver::Broker#find_destination)
+    # @note if +destination_name+ is a {Destination::Base}, +find_destination+ will just
+    #   return that destination back
+    def find_destination(destination_name)
+      case destination_name
+      when Destination::Base
+        destination_name
+      else
+        broker.find_destination(destination_name)
+      end
     end
 
-    def subscribe(destination_name, consumer_name, options = {})
-      consumer =  find_consumer(consumer_name)
-      subscribe_with(destination_name, options, &consumer)
+    # @!endgroup
+
+    # @!group Defining and Looking Up Consumers
+
+    def consumer(key, &block)
+      broker.consumer(key, &block)
     end
 
-    def subscribe_with(destination_name, options = {}, &consumer)
-      destination = find_destination(destination_name)
-      current_adapter_context.subscribe(destination, options, &consumer)
+    def find_consumer(consumer)
+      broker.find_consumer(consumer)
     end
 
-    def dynamic_destination(dest_name, dest_options = {}, message_props = {})
-      current_adapter_context.create_destination(dest_name, dest_options, message_props)
+    # @!endgroup
+
+    # @!group Sending Messages
+
+    def publish(destination, body, headers = {}, properties = {})
+      find_destination(destination).publish(body, headers, properties)
+    end
+
+    # @!endgroup
+
+    # @!group Receiving Messages
+
+    def pop_message(destination, options = {})
+      find_destination(destination).pop_message(options)
     end
 
     def ack_message(message, options = {})
@@ -35,22 +77,19 @@ module MessageDriver
       message.nack(options)
     end
 
-    def consumer(key, &block)
-      broker.consumer(key, &block)
+    def subscribe(destination_name, consumer_name, options = {})
+      consumer =  find_consumer(consumer_name)
+      subscribe_with(destination_name, options, &consumer)
     end
 
-    def find_destination(destination)
-      case destination
-      when Destination::Base
-        destination
-      else
-        broker.find_destination(destination)
-      end
+    def subscribe_with(destination_name, options = {}, &consumer)
+      destination = find_destination(destination_name)
+      current_adapter_context.subscribe(destination, options, &consumer)
     end
 
-    def find_consumer(consumer)
-      broker.find_consumer(consumer)
-    end
+    # @!endgroup
+
+    # @!group Transaction Management
 
     def with_message_transaction(options = {})
       wrapper = fetch_context_wrapper
@@ -82,11 +121,15 @@ module MessageDriver
       end
     end
 
+    # @!endgroup
+
+    # @private
     def current_adapter_context(initialize = true)
       ctx = fetch_context_wrapper(initialize)
       ctx.nil? ? nil : ctx.ctx
     end
 
+    # @private
     def with_adapter_context(adapter_context)
       old_ctx = fetch_context_wrapper(false)
       Thread.current[adapter_context_key] = build_context_wrapper(adapter_context)
@@ -97,6 +140,7 @@ module MessageDriver
       end
     end
 
+    # @private
     def clear_context
       wrapper = fetch_context_wrapper(false)
       unless wrapper.nil?
@@ -105,14 +149,17 @@ module MessageDriver
       end
     end
 
+    # @return [Broker] the broker associated with this Client module
     def broker
       Broker.broker(broker_name)
     end
 
+    # @return [Symbol] the name of the broker associated with this Client module
     def broker_name
       Broker::DEFAULT_BROKER_NAME
     end
 
+    # @private
     def for_broker(name)
       Module.new do
         include Client
@@ -125,6 +172,11 @@ module MessageDriver
     end
     module_function :for_broker
 
+    # @return [Client] the client for the specified broker
+    # @example
+    #   class MyClass
+    #     include MessageDriver::Client[:my_broker]
+    #   end
     def [](index)
       Broker.client(index)
     end
@@ -160,6 +212,7 @@ module MessageDriver
       @__adapter_context_key ||= "#{broker_name}_adapter_context".to_sym
     end
 
+    # @private
     class ContextWrapper
       extend Forwardable
 

data/lib/message_driver/logging.rb

@@ -1,6 +1,7 @@
 module MessageDriver
+  # @private
   module Logging
-    extend self
+    module_function
 
     def logger
       MessageDriver.logger

data/lib/message_driver/version.rb

@@ -1,3 +1,4 @@
 module MessageDriver
-  VERSION = '0.5.3'
+  # @return [String] version of the library
+  VERSION = '0.6.0'
 end

data/lib/message_driver.rb

@@ -11,13 +11,18 @@ require 'message_driver/subscription'
 require 'message_driver/adapters/base'
 require 'message_driver/client'
 
+# Easy message queues for ruby
 module MessageDriver
   module_function
 
-  def configure(broker_name = Broker::DEFAULT_BROKER_NAME, options)
-    Broker.configure(broker_name, options)
+  # (see MessageDriver::Broker.configure)
+  def configure(name = Broker::DEFAULT_BROKER_NAME, options)
+    Broker.configure(name, options)
   end
 
+  # @!attribute [rw] logger
+  # defaults to an +INFO+ level logger that logs to +STDOUT+
+  # @return [Logger] the logger +MessageDriver+ will use for logging.
   def logger
     @__logger ||= Logger.new(STDOUT).tap { |l| l.level = Logger::INFO }
   end

data/message-driver.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.1.0'
-  gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'cucumber', '< 2'
+  gem.add_development_dependency 'aruba', '< 0.9'
 end

data/spec/integration/bunny/amqp_integration_spec.rb

@@ -78,4 +78,24 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
       expect(msg.body).to eq('Test Message 2')
     end
   end
+
+  context 'when nothing is done during a transaction' do
+    it 'does not raise an error' do
+      expect do
+        MessageDriver::Client.with_message_transaction do
+          #do nothing
+        end
+      end.not_to raise_error
+    end
+
+    context 'with a wait and confirm transaction' do
+      it 'does not raise an error' do
+        expect do
+          MessageDriver::Client.with_message_transaction(type: :confirm_and_wait) do
+            #do nothing
+          end
+        end.not_to raise_error
+      end
+    end
+  end
 end

data/spec/integration/bunny/bunny_adapter_spec.rb

@@ -15,7 +15,7 @@ module MessageDriver
               stub_const('Bunny::VERSION', version)
               expect do
                 described_class.new(broker, valid_connection_attrs)
-              end.to raise_error MessageDriver::Error, 'bunny 1.2.2 or later is required for the bunny adapter'
+              end.to raise_error MessageDriver::Error, 'bunny 1.7.0 or later is required for the bunny adapter'
             end
           end
           shared_examples "doesn't raise an error" do
@@ -27,13 +27,13 @@ module MessageDriver
               end.to_not raise_error
             end
           end
-          %w(0.8.0  0.9.0 0.9.8 0.10.7 1.0.3 1.1.2 1.2.1).each do |v|
+          %w(0.8.0 0.9.0 0.9.8 0.10.7 1.0.3 1.1.2 1.2.1 1.2.2 1.3.0 1.4.1 1.6.2).each do |v|
             context "bunny version #{v}" do
               let(:version) { v }
               include_examples 'raises an error'
             end
           end
-          %w(1.2.2 1.3.2 1.4.0 1.5.0).each do |v|
+          %w(1.7.0 1.7.1 2.0.1 2.1.0).each do |v|
             context "bunny version #{v}" do
               let(:version) { v }
               include_examples "doesn't raise an error"
@@ -82,21 +82,8 @@ module MessageDriver
       describe '#ack_key' do
         include_context 'a connected bunny adapter'
 
-        context 'when bunny version is 1.5.0 or later' do
-          before do
-            stub_const('Bunny::VERSION', '1.5.0')
-          end
-          it 'should be :manual_ack' do
-            expect(adapter.ack_key).to eq(:manual_ack)
-          end
-        end
-        context 'when bunny version earlier than 1.5.0' do
-          before do
-            stub_const('Bunny::VERSION', '1.4.1')
-          end
-          it 'should be :manual_ack' do
-            expect(adapter.ack_key).to eq(:ack)
-          end
+        it 'should be :manual_ack' do
+          expect(adapter.ack_key).to eq(:manual_ack)
         end
       end
 

data/test_lib/broker_config.rb

@@ -9,6 +9,7 @@ class BrokerConfig
         {
           adapter: :bunny,
           vhost: vhost,
+          timeout: 5000,
           continuation_timeout: 10000
         }
       when 'in_memory'

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: Easy message queues for ruby using AMQ, STOMP and others
 email:
 - message-driver@soupmatt.com
@@ -82,17 +73,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .relish
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".relish"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Guardfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - ci/reset_vhost
@@ -197,30 +189,26 @@ files:
 homepage: https://github.com/message-driver/message-driver
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4081124424208803284
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy message queues for ruby
 test_files:
 - features/.nav

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2013 Matt Campbell
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/features/CHANGELOG.md

@@ -1,88 +0,0 @@
-# Changelog
-
-## 0.5.3 = 2014-10-23
-
-* In bunny adapter, avoid sending a tx_commit if we haven't done anything requiring
-  a commit inside the transaction block.
-
-## 0.5.2 - 2014-10-14
-
-* fix deprecation warning with bunny 1.5.0
-
-## 0.5.1 - 2014-10-08
-
-* put version constant under correct module
-
-## 0.5.0 - 2014-09-17
-
-* add support for checking consumer counts on a queue in bunny and in_memory adapters
-* in_memory adapter now supports multiple subscribers per queue, and does a round-robin
-  through them when sending messages to consumers
-* upgrade to rspec 3
-* Middleware can now be used to automatically pre/post-process messages as they are published to
-  or consumed from a destination
-
-## 0.4.0 - 2014-07-03
-
-* require bunny 1.2.2 or later
-* add support for publish confirmations
-
-## 0.3.0 - 2014-02-26
-
-* Support for handling multiple broker connections
-* require bunny 1.1.3 or later
-* make bunny connections as lazily initialized as possible
-* bunny transactions start lazily
-
-## 0.2.2 - 2014-02-21
-
-* Lots of work on reconnection handling for bunny. Still a work in
-  progress.
-
-## 0.2.1 - 2013-11-13
-
-* Correct an issue in handling Bunny::ConnectionLevelErrors.
-  Bunny::Session will now get properly restarted.
-
-## 0.2.0 - 2013-11-05
-
-* drop support for bunny 0.9.x
-* add support for bunny 1.0.x
-* ability to create subscriptions from a block instead of having to
-  register a consumer
-
-## 0.2.0.rc2 - 2013-10-30
-
-* Features
-    * Prefetch size for bunny consumers
-* Bugs
-    * better error handling for transaction bunny consumers
-
-## 0.2.0.rc1 - 2013-09-23
-
-* Features
-    * Message Consumers, all different flavors
-        * Bunny and InMemory adapters
-    * Client Acks
-        * Bunny adapter
-    * Bunny adapter
-        * much better connection and channel error handling, including
-          reconnecting when broker becomes unreachable
-* Adapters
-    * begin work on Stomp 1.1/1.2 adapter
-
-## 0.1.0 - 2013-04-05
-
-Initial Release
-
-* Features
-    * Publish a message
-    * Broker transactions for publishing
-    * Pop a message
-    * named and dynamic destinations
-    * message_count for destinations
-* Adapters
-    * InMemory
-        * #reset_after_test method for clearing out queues
-    * Bunny (amqp 0.9)
-        * handle connection and channel errors transparently