message-driver 0.3.0 → 0.4.0

data/lib/message_driver/adapters/in_memory_adapter.rb

@@ -9,7 +9,6 @@ module MessageDriver
 
   module Adapters
     class InMemoryAdapter < Base
-
       class Message < MessageDriver::Message::Base
       end
 
@@ -30,7 +29,6 @@ module MessageDriver
       end
 
       class Destination < MessageDriver::Destination::Base
-
         def subscription
           adapter.subscription_for(name)
         end
@@ -39,7 +37,7 @@ module MessageDriver
           message_queue.size
         end
 
-        def pop_message(options={})
+        def pop_message(_options={})
           message_queue.shift
         end
 
@@ -63,16 +61,17 @@ module MessageDriver
         end
 
         private
+
         def message_queue
           adapter.message_queue_for(name)
         end
       end
 
-      def initialize(broker, config={})
+      def initialize(broker, _config={})
         @broker = broker
         @destinations = {}
         @message_store = Hash.new { |h,k| h[k] = [] }
-        @subscriptions = Hash.new
+        @subscriptions = {}
       end
 
       def build_context

data/lib/message_driver/adapters/stomp_adapter.rb

@@ -10,7 +10,6 @@ module MessageDriver
 
   module Adapters
     class StompAdapter < Base
-
       class Message < MessageDriver::Message::Base
         attr_reader :stomp_message
         def initialize(ctx, stomp_message)
@@ -20,7 +19,6 @@ module MessageDriver
       end
 
       class Destination < MessageDriver::Destination::Base
-
       end
 
       attr_reader :config, :poll_timeout
@@ -32,7 +30,7 @@ module MessageDriver
         @config = config.symbolize_keys
         connect_headers = @config[:connect_headers] ||= {}
         connect_headers.symbolize_keys
-        connect_headers[:"accept-version"] = "1.1,1.2"
+        connect_headers[:"accept-version"] = '1.1,1.2'
 
         vhost = @config.delete(:vhost)
         connect_headers[:host] = vhost if vhost
@@ -50,13 +48,13 @@ module MessageDriver
         #end
 
         def create_destination(name, dest_options={}, message_props={})
-          unless name.start_with?("/")
+          unless name.start_with?('/')
             name = "/queue/#{name}"
           end
           Destination.new(adapter, name, dest_options, message_props)
         end
 
-        def publish(destination, body, headers={}, properties={})
+        def publish(destination, body, headers={}, _properties={})
           with_connection do |connection|
             connection.publish(destination.name, body, headers)
           end
@@ -119,7 +117,7 @@ module MessageDriver
         required = Gem::Requirement.create('~> 1.3.1')
         current = Gem::Version.create(Stomp::Version::STRING)
         unless required.satisfied_by? current
-          raise MessageDriver::Error, "stomp 1.3.1 or a later version of the 1.3.x series is required for the stomp adapter"
+          raise MessageDriver::Error, 'stomp 1.3.1 or a later version of the 1.3.x series is required for the stomp adapter'
         end
       end
     end

data/lib/message_driver/broker.rb

@@ -27,7 +27,7 @@ module MessageDriver
       end
 
       def client(name)
-        unless result = clients[name]
+        unless (result = clients[name])
           result = clients[name] = Client.for_broker(name)
         end
         result
@@ -63,6 +63,7 @@ module MessageDriver
       end
 
       private
+
       def brokers
         @brokers ||= { }
       end
@@ -85,7 +86,7 @@ module MessageDriver
       @configuration = options
       @destinations = {}
       @consumers = {}
-      logger.debug "MessageDriver configured successfully!"
+      logger.debug 'MessageDriver configured successfully!'
     end
 
     def logger
@@ -123,7 +124,7 @@ module MessageDriver
     end
 
     def consumer(key, &block)
-      raise MessageDriver::Error, "you must provide a block" unless block_given?
+      raise MessageDriver::Error, 'you must provide a block' unless block_given?
       @consumers[key] = block
     end
 
@@ -144,7 +145,7 @@ module MessageDriver
     def resolve_adapter(adapter, options)
       case adapter
       when nil
-        raise "you must specify an adapter"
+        raise 'you must specify an adapter'
       when Symbol, String
         resolve_adapter(find_adapter_class(adapter), options)
       when Class

data/lib/message_driver/client.rb

@@ -54,7 +54,7 @@ module MessageDriver
       broker.find_consumer(consumer)
     end
 
-    def with_message_transaction(options={}, &block)
+    def with_message_transaction(options={})
       wrapper = fetch_context_wrapper
       wrapper.increment_transaction_depth
       begin
@@ -76,7 +76,7 @@ module MessageDriver
             yield
           end
         else
-          logger.debug("this adapter does not support transactions")
+          logger.debug('this adapter does not support transactions')
           yield
         end
       ensure
@@ -89,7 +89,7 @@ module MessageDriver
       ctx.nil? ? nil : ctx.ctx
     end
 
-    def with_adapter_context(adapter_context, &block)
+    def with_adapter_context(adapter_context)
       old_ctx, Thread.current[adapter_context_key] = fetch_context_wrapper(false), build_context_wrapper(adapter_context)
       begin
         yield
@@ -114,13 +114,13 @@ module MessageDriver
       Broker::DEFAULT_BROKER_NAME
     end
 
-    def for_broker(_broker_name)
-      Module.new do |mod|
+    def for_broker(name)
+      Module.new do
         include Client
         extend self
 
         define_method :broker_name do
-          _broker_name
+          name
         end
       end
     end

data/lib/message_driver/destination.rb

@@ -18,7 +18,7 @@ module MessageDriver
         adapter.broker.client.pop_message(self, options)
       end
 
-      def after_initialize(adapter_context)
+      def after_initialize(_adapter_context)
         #does nothing, feel free to override as needed
       end
 
@@ -26,7 +26,7 @@ module MessageDriver
         raise "#message_count is not supported by #{self.class}"
       end
 
-      def subscribe(&consumer)
+      def subscribe(&_consumer)
         raise "#subscribe is not supported by #{self.class}"
       end
     end

data/lib/message_driver/errors.rb

@@ -1,7 +1,4 @@
-vendor = File.expand_path('../vendor', __FILE__)
-$:.unshift(vendor) unless $:.include?(vendor)
-
-require 'nesty'
+require 'vendor/nesty'
 
 module MessageDriver
   class Error < StandardError; end

data/lib/message_driver/logging.rb

@@ -7,7 +7,7 @@ module MessageDriver
     end
 
     def exception_to_str(e)
-      (["#{e.class}: #{e.to_s}"] + e.backtrace).join("\n  ")
+      (["#{e.class}: #{e}"] + e.backtrace).join("\n  ")
     end
 
     def message_with_exception(message, e)

data/lib/message_driver/message.rb

@@ -16,7 +16,7 @@ module MessageDriver
         if ctx.supports_client_acks?
           ctx.ack_message(self, options)
         else
-          logger.debug("this adapter does not support client acks")
+          logger.debug('this adapter does not support client acks')
         end
       end
 
@@ -24,7 +24,7 @@ module MessageDriver
         if ctx.supports_client_acks?
           ctx.nack_message(self, options)
         else
-          logger.debug("this adapter does not support client acks")
+          logger.debug('this adapter does not support client acks')
         end
       end
     end

data/lib/message_driver/subscription.rb

@@ -12,7 +12,7 @@ module MessageDriver
       end
 
       def unsubscribe
-        raise "must be implemented in subclass"
+        raise 'must be implemented in subclass'
       end
     end
   end

data/lib/message_driver/version.rb

@@ -1,5 +1,5 @@
 module Message
   module Driver
-    VERSION = "0.3.0"
+    VERSION = '0.4.0'
   end
 end

data/lib/vendor/nesty.rb

@@ -0,0 +1 @@
+require 'vendor/nesty/nested_error'

data/lib/vendor/nesty/nested_error.rb

@@ -0,0 +1,28 @@
+module MessageDriver
+  module Nesty
+    module NestedError
+      attr_reader :nested, :raw_backtrace
+
+      def initialize(msg = nil, nested)
+        super(msg)
+        @nested = nested
+      end
+
+      def set_backtrace(backtrace)
+        @raw_backtrace = backtrace
+        if nested
+          backtrace = backtrace - nested_raw_backtrace
+          backtrace += ["#{nested.backtrace.first}: #{nested.message} (#{nested.class.name})"]
+          backtrace += nested.backtrace[1..-1] || []
+        end
+        super(backtrace)
+      end
+
+      private
+
+      def nested_raw_backtrace
+        nested.respond_to?(:raw_backtrace) ? nested.raw_backtrace : nested.backtrace
+      end
+    end
+  end
+end

data/message-driver.gemspec

@@ -4,24 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'message_driver/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "message-driver"
+  gem.name          = 'message-driver'
   gem.version       = Message::Driver::VERSION
-  gem.authors       = ["Matt Campbell"]
-  gem.email         = ["message-driver@soupmatt.com"]
-  gem.description   = %q{Easy message queues for ruby using AMQ, STOMP and others}
-  gem.summary       = %q{Easy message queues for ruby}
-  gem.homepage      = "https://github.com/message-driver/message-driver"
-  gem.license       = "MIT"
+  gem.authors       = ['Matt Campbell']
+  gem.email         = ['message-driver@soupmatt.com']
+  gem.description   = 'Easy message queues for ruby using AMQ, STOMP and others'
+  gem.summary       = 'Easy message queues for ruby'
+  gem.homepage      = 'https://github.com/message-driver/message-driver'
+  gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($RS)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = %w(lib)
 
   gem.required_ruby_version = '>= 1.9.2'
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.14.0"
-  gem.add_development_dependency "cucumber"
-  gem.add_development_dependency "aruba"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
+  gem.add_development_dependency 'cucumber'
+  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'rubocop'
 end

data/spec/integration/bunny/amqp_integration_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe "AMQP Integration", :bunny, type: :integration do
+describe 'AMQP Integration', :bunny, type: :integration do
   let!(:broker) { MessageDriver::Broker.configure BrokerConfig.config }
 
   context "when a queue can't be found" do
-    let(:queue_name) { "my.lost.queue" }
-    it "raises a MessageDriver::QueueNotFound error" do
+    let(:queue_name) { 'my.lost.queue' }
+    it 'raises a MessageDriver::QueueNotFound error' do
       expect {
         broker.dynamic_destination(queue_name, passive: true)
       }.to raise_error(MessageDriver::QueueNotFound) do |err|
@@ -15,40 +15,40 @@ describe "AMQP Integration", :bunny, type: :integration do
     end
   end
 
-  context "when a channel level exception occurs" do
-    it "raises a MessageDriver::WrappedError error" do
+  context 'when a channel level exception occurs' do
+    it 'raises a MessageDriver::WrappedError error' do
       expect {
-        broker.dynamic_destination("not.a.queue", passive: true)
+        broker.dynamic_destination('not.a.queue', passive: true)
       }.to raise_error(MessageDriver::WrappedError) { |err| err.nested.should be_a Bunny::ChannelLevelException }
     end
 
-    it "reestablishes the channel transparently" do
+    it 'reestablishes the channel transparently' do
       expect {
-        broker.dynamic_destination("not.a.queue", passive: true)
+        broker.dynamic_destination('not.a.queue', passive: true)
       }.to raise_error(MessageDriver::WrappedError)
       expect {
-        broker.dynamic_destination("", exclusive: true)
+        broker.dynamic_destination('', exclusive: true)
       }.to_not raise_error
     end
 
-    context "when in a transaction" do
-      it "sets the channel_context as rollback-only until the transaction is finished" do
+    context 'when in a transaction' do
+      it 'sets the channel_context as rollback-only until the transaction is finished' do
         MessageDriver::Client.with_message_transaction do
           expect {
-            broker.dynamic_destination("not.a.queue", passive: true)
+            broker.dynamic_destination('not.a.queue', passive: true)
           }.to raise_error(MessageDriver::WrappedError)
           expect {
-            broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination('', exclusive: true)
           }.to raise_error(MessageDriver::TransactionRollbackOnly)
         end
         expect {
-          broker.dynamic_destination("", exclusive: true)
+          broker.dynamic_destination('', exclusive: true)
         }.to_not raise_error
       end
     end
   end
 
-  context "when the broker connection fails", pending: "these spec are busted" do
+  context 'when the broker connection fails', pending: 'these spec are busted' do
     def disrupt_connection
       #yes, this is very implementation specific
       broker.adapter.connection.instance_variable_get(:@transport).close
@@ -58,85 +58,85 @@ describe "AMQP Integration", :bunny, type: :integration do
       broker.dynamic_destination(queue_name, exclusive: true)
     end
 
-    it "raises a MessageDriver::ConnectionError" do
-      dest = create_destination("test_queue")
+    it 'raises a MessageDriver::ConnectionError' do
+      dest = create_destination('test_queue')
       disrupt_connection
       expect {
-        dest.publish("Reconnection Test")
+        dest.publish('Reconnection Test')
       }.to raise_error(MessageDriver::ConnectionError) do |err|
         expect(err.nested).to be_a Bunny::NetworkErrorWrapper
       end
     end
 
-    it "seemlessly reconnects" do
-      dest = create_destination("seemless.reconnect.queue")
+    it 'seemlessly reconnects' do
+      dest = create_destination('seemless.reconnect.queue')
       disrupt_connection
       expect {
-        dest.publish("Reconnection Test 1")
+        dest.publish('Reconnection Test 1')
       }.to raise_error(MessageDriver::ConnectionError)
-      dest = create_destination("seemless.reconnect.queue")
-      dest.publish("Reconnection Test 2")
+      dest = create_destination('seemless.reconnect.queue')
+      dest.publish('Reconnection Test 2')
       msg = dest.pop_message
       expect(msg).to_not be_nil
-      expect(msg.body).to eq("Reconnection Test 2")
+      expect(msg.body).to eq('Reconnection Test 2')
     end
 
-    context "when in a transaction" do
-      it "raises a MessageDriver::ConnectionError" do
+    context 'when in a transaction' do
+      it 'raises a MessageDriver::ConnectionError' do
         expect {
           MessageDriver::Client.with_message_transaction do
             disrupt_connection
-            broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination('', exclusive: true)
           end
         }.to raise_error(MessageDriver::ConnectionError)
       end
 
-      it "sets the channel_context as rollback-only until the transaction is finished" do
+      it 'sets the channel_context as rollback-only until the transaction is finished' do
         MessageDriver::Client.with_message_transaction do
           disrupt_connection
           expect {
-            broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination('', exclusive: true)
           }.to raise_error(MessageDriver::ConnectionError)
           expect {
-            broker.dynamic_destination("", exclusive: true)
+            broker.dynamic_destination('', exclusive: true)
           }.to raise_error(MessageDriver::TransactionRollbackOnly)
         end
         expect {
-          broker.dynamic_destination("", exclusive: true)
+          broker.dynamic_destination('', exclusive: true)
         }.to_not raise_error
       end
     end
   end
 
-  context "when an unhandled expection occurs in a transaction" do
-    let(:destination) { broker.dynamic_destination("", exclusive: true) }
+  context 'when an unhandled expection occurs in a transaction' do
+    let(:destination) { broker.dynamic_destination('', exclusive: true) }
 
-    it "rolls back the transaction" do
+    it 'rolls back the transaction' do
       expect {
         MessageDriver::Client.with_message_transaction do
-          destination.publish("Test Message")
-          raise "unhandled error"
+          destination.publish('Test Message')
+          raise 'unhandled error'
         end
-      }.to raise_error "unhandled error"
+      }.to raise_error 'unhandled error'
       expect(destination.pop_message).to be_nil
     end
 
-    it "allows the next transaction to continue" do
+    it 'allows the next transaction to continue' do
       expect {
         MessageDriver::Client.with_message_transaction do
-          destination.publish("Test Message 1")
-          raise "unhandled error"
+          destination.publish('Test Message 1')
+          raise 'unhandled error'
         end
-      }.to raise_error "unhandled error"
+      }.to raise_error 'unhandled error'
       expect(destination.pop_message).to be_nil
 
       MessageDriver::Client.with_message_transaction do
-        destination.publish("Test Message 2")
+        destination.publish('Test Message 2')
       end
 
       msg = destination.pop_message
       expect(msg).to_not be_nil
-      expect(msg.body).to eq("Test Message 2")
+      expect(msg.body).to eq('Test Message 2')
     end
   end
 end