message-driver 0.6.1 → 0.7.0

data/spec/units/message_driver/broker_spec.rb

@@ -150,7 +150,7 @@ module MessageDriver
       end
 
       it "raises and error if you don't provide a MessageDriver::Adapters::Base" do
-        adapter = Hash.new
+        adapter = {}
 
         expect do
           described_class.new(adapter: adapter)
@@ -335,6 +335,5 @@ module MessageDriver
         end
       end
     end
-
   end
 end

data/spec/units/message_driver/client_spec.rb

@@ -174,7 +174,7 @@ module MessageDriver
               it 'calls rollback instead of commit and raises the error' do
                 expect do
                   subject.with_message_transaction do
-                    fail 'having a tough time'
+                    raise 'having a tough time'
                   end
                 end.to raise_error 'having a tough time'
                 expect(adapter_context).to have_received(:begin_transaction)
@@ -188,7 +188,7 @@ module MessageDriver
                   allow(adapter_context).to receive(:rollback_transaction).and_raise('rollback failed!')
                   expect do
                     subject.with_message_transaction do
-                      fail 'having a tough time'
+                      raise 'having a tough time'
                     end
                   end.to raise_error 'having a tough time'
                   expect(logger).to have_received(:error).with(match('rollback failed!'))
@@ -212,7 +212,7 @@ module MessageDriver
                   expect do
                     subject.with_message_transaction do
                       subject.with_message_transaction do
-                        fail 'having a tough time'
+                        raise 'having a tough time'
                       end
                     end
                   end.to raise_error 'having a tough time'

data/spec/units/message_driver/destination_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 module MessageDriver
   module Destination
     RSpec.describe Base do
-      subject(:destination) { Base.new(nil, nil, nil, nil) }
+      let(:broker) { Broker.configure(:test, adapter: TestAdapter) }
+      let(:adapter) { broker.adapter }
+      subject(:destination) { Base.new(adapter, nil, nil, nil) }
 
       describe '#middlware' do
         it { expect(subject.middleware).to be_a Middleware::MiddlewareStack }
@@ -17,7 +19,7 @@ module MessageDriver
           expect do
             consumer = ->(_) {}
             destination.subscribe(&consumer)
-          end.to raise_error "#subscribe is not supported by #{destination.class}"
+          end.to raise_error "#subscribe is not supported by #{TestAdapter}"
         end
       end
     end

data/spec/units/message_driver/message_spec.rb

@@ -8,14 +8,19 @@ module MessageDriver
         let(:headers) { { foo: :bar, bar: :baz } }
         let(:properties) { { persistent: true, client_ack: true } }
         let(:ctx) { double('adapter_context') }
+        let(:destination) { double('destination') }
 
         context 'sets the body, header and properites on initialization' do
-          subject { described_class.new(ctx, body, headers, properties) }
+          subject { described_class.new(ctx, destination, body, headers, properties) }
 
           describe '#ctx' do
             it { expect(subject.ctx).to be(ctx) }
           end
 
+          describe '#destination' do
+            it { expect(subject.destination).to be(destination) }
+          end
+
           describe '#body' do
             it { expect(subject.body).to eq(body) }
           end
@@ -34,7 +39,7 @@ module MessageDriver
             end
 
             it 'can be provided in the constructor' do
-              msg = described_class.new(ctx, body, headers, properties, 'my_raw_body')
+              msg = described_class.new(ctx, destination, body, headers, properties, 'my_raw_body')
 
               expect(msg.raw_body).to eq('my_raw_body')
               expect(msg.body).to eq(body)
@@ -45,8 +50,9 @@ module MessageDriver
 
       let(:logger) { MessageDriver.logger }
       let(:ctx) { double('adapter_context') }
+      let(:destination) { double('destination') }
       let(:options) { double('options') }
-      subject(:message) { described_class.new(ctx, 'body', {}, {}) }
+      subject(:message) { described_class.new(ctx, destination, 'body', {}, {}) }
 
       describe '#ack' do
         before do

data/test_lib/broker_config.rb

@@ -65,8 +65,6 @@ class BrokerConfig
         5672
       when :stomp
         61613
-      else
-        nil
       end
     end
   end

data/test_lib/provider/base.rb

@@ -11,11 +11,7 @@ class BaseProvider
 
   def pause_if_needed(seconds = 0.1)
     seconds *= 10 if ENV['CI'] == 'true'
-    case BrokerConfig.current_adapter
-    when :in_memory
-    else
-      sleep seconds
-    end
+    sleep seconds unless BrokerConfig.current_adapter == :in_memory
   end
 
   def fetch_messages(destination_name, _opts = {})
@@ -49,7 +45,7 @@ class BaseProvider
     when MessageDriver::Destination::Base
       destination
     else
-      fail "didn't understand destination #{destination.inspect}"
+      raise "didn't understand destination #{destination.inspect}"
     end
   end
 

data/test_lib/provider/rabbitmq.rb

@@ -21,7 +21,7 @@ class RabbitmqProvider < BaseProvider
           if msg.nil?
             break
           else
-            result << build_message(msg)
+            result << build_message(msg, destination)
           end
         end
         break if msgs.nil? || msgs.empty?
@@ -46,10 +46,10 @@ class RabbitmqProvider < BaseProvider
 
   private
 
-  def build_message(data)
+  def build_message(data, destination)
     props = data.properties.dup
     headers = props.delete(:headers)
-    MessageDriver::Message::Base.new(Context, data.payload, headers, props)
+    MessageDriver::Message::Base.new(Context, destination, data.payload, headers, props)
   end
 
   def vhost

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.14.1
 description: Easy message queues for ruby using AMQ, STOMP and others
 email:
 - message-driver@soupmatt.com
@@ -88,7 +88,6 @@ files:
 - README.md
 - Rakefile
 - ci/reset_vhost
-- ci/travis_setup
 - examples/basic_producer_and_consumer/Gemfile
 - examples/basic_producer_and_consumer/common.rb
 - examples/basic_producer_and_consumer/consumer.rb
@@ -165,12 +164,14 @@ files:
 - spec/integration/in_memory/in_memory_adapter_spec.rb
 - spec/integration/stomp/stomp_adapter_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/override_method_matcher.rb
 - spec/support/shared/adapter_examples.rb
 - spec/support/shared/client_ack_examples.rb
 - spec/support/shared/context_examples.rb
 - spec/support/shared/destination_examples.rb
 - spec/support/shared/subscription_examples.rb
 - spec/support/shared/transaction_examples.rb
+- spec/support/test_adapter.rb
 - spec/support/utils.rb
 - spec/units/message_driver/adapters/base_spec.rb
 - spec/units/message_driver/broker_spec.rb
@@ -198,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Easy message queues for ruby
@@ -261,12 +262,14 @@ test_files:
 - spec/integration/in_memory/in_memory_adapter_spec.rb
 - spec/integration/stomp/stomp_adapter_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/override_method_matcher.rb
 - spec/support/shared/adapter_examples.rb
 - spec/support/shared/client_ack_examples.rb
 - spec/support/shared/context_examples.rb
 - spec/support/shared/destination_examples.rb
 - spec/support/shared/subscription_examples.rb
 - spec/support/shared/transaction_examples.rb
+- spec/support/test_adapter.rb
 - spec/support/utils.rb
 - spec/units/message_driver/adapters/base_spec.rb
 - spec/units/message_driver/broker_spec.rb
@@ -277,4 +280,3 @@ test_files:
 - spec/units/message_driver/middleware/block_middleware_spec.rb
 - spec/units/message_driver/middleware/middleware_stack_spec.rb
 - spec/units/message_driver/subscription_spec.rb
-has_rdoc: 

data/ci/travis_setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ "$ADAPTER" = "stomp" ]; then
-  sudo rabbitmq-plugins enable rabbitmq_stomp
-  sudo service rabbitmq-server restart
-  sleep 3
-fi

data/features/CHANGELOG.md

@@ -1,102 +0,0 @@
-# Changelog
-
-## 0.6.1 - 2016-01-28
-
-* fix an issue that prevents gems built under ruby 2.3.0 to be installed
-  under ruby 2.3.0 by rebuilding the gem under ruby 2.2
-
-## 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.
-
-## 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