message-driver 0.6.1 → 0.7.0

data/lib/message_driver/adapters/in_memory_adapter.rb

@@ -27,49 +27,56 @@ module MessageDriver
       end
 
       class Destination < MessageDriver::Destination::Base
-        def subscription
-          adapter.subscription_for(name)
+        def subscriptions
+          adapter.subscriptions_for(name)
         end
 
-        def message_count
+        def handle_message_count
           message_queue.size
         end
 
-        def consumer_count
-          adapter.consumer_count_for(name)
+        def handle_pop_message(ctx, options = {})
+          _fetch_message(ctx, options)
         end
 
-        def pop_message(_options = {})
-          message = message_queue.shift
-          if message.nil?
-            nil
-          else
-            raw_body = message.body
-            b, h, p = middleware.on_consume(message.body, message.headers, message.properties)
-            Message.new(nil, b, h, p, raw_body)
-          end
-        end
-
-        def subscribe(options = {}, &consumer)
+        def handle_subscribe(options = {}, &consumer)
           subscription = Subscription.new(adapter, self, consumer, options)
           adapter.add_subscription_for(name, subscription)
-          deliver_messages(subscription)
+          _deliver_messages
           subscription
         end
 
-        def publish(body, headers = {}, properties = {})
+        def handle_publish(body, headers = {}, properties = {})
           raw_body = body
           b, h, p = middleware.on_publish(body, headers, properties)
-          msg = Message.new(nil, b, h, p, raw_body)
+          msg = Message.new(nil, self, b, h, p, raw_body)
           message_queue << msg
-          deliver_messages(subscription) if subscription
+          _deliver_messages
         end
 
         private
 
-        def deliver_messages(sub)
-          until (msg = pop_message).nil?
-            sub.deliver_message(msg)
+        def next_subscription
+          adapter.next_subscription_for(name)
+        end
+
+        def _fetch_message(ctx, _options = {})
+          message = message_queue.shift
+          if message.nil?
+            nil
+          else
+            raw_body = message.body
+            b, h, p = middleware.on_consume(message.body, message.headers, message.properties)
+            Message.new(ctx, self, b, h, p, raw_body)
+          end
+        end
+
+        def _deliver_messages
+          unless subscriptions.empty?
+            until (msg = _fetch_message(current_adapter_context)).nil?
+              sub = next_subscription # this actually cycles through the subscriptions
+              sub.deliver_message(msg)
+            end
           end
         end
 
@@ -99,22 +106,31 @@ module MessageDriver
         destination = Destination.new(self, name, dest_options, message_props)
         @destinations[name] = destination
       end
+      alias handle_create_destination create_destination
 
       class InMemoryContext < ContextBase
         extend Forwardable
 
-        def_delegators :adapter, :create_destination
+        def_delegators :adapter, :handle_create_destination
 
-        def publish(destination, body, headers = {}, properties = {})
-          destination.publish(body, headers, properties)
+        def handle_publish(destination, body, headers = {}, properties = {})
+          destination.handle_publish(body, headers, properties)
         end
 
-        def pop_message(destination, options = {})
-          destination.pop_message(options)
+        def handle_pop_message(destination, options = {})
+          destination.handle_pop_message(self, options)
         end
 
-        def subscribe(destination, options = {}, &consumer)
-          destination.subscribe(options, &consumer)
+        def handle_subscribe(destination, options = {}, &consumer)
+          destination.handle_subscribe(options, &consumer)
+        end
+
+        def handle_message_count(destination)
+          destination.handle_message_count
+        end
+
+        def handle_consumer_count(destination)
+          adapter.consumer_count_for(destination.name)
         end
 
         def supports_subscriptions?
@@ -138,10 +154,16 @@ module MessageDriver
         @message_store[name]
       end
 
-      def subscription_for(name)
-        sub = @subscriptions[name].shift
-        @subscriptions[name].push sub
-        sub
+      def subscriptions_for(name)
+        @subscriptions[name]
+      end
+
+      def next_subscription_for(name)
+        unless (subs = @subscriptions[name]).empty?
+          sub = subs.shift
+          subs.push sub
+          sub
+        end
       end
 
       def add_subscription_for(name, subscription)

data/lib/message_driver/adapters/stomp_adapter.rb

@@ -12,9 +12,9 @@ module MessageDriver
     class StompAdapter < Base
       class Message < MessageDriver::Message::Base
         attr_reader :stomp_message
-        def initialize(ctx, stomp_message)
+        def initialize(ctx, destination, stomp_message)
           @stomp_message = stomp_message
-          super(ctx, stomp_message.body, stomp_message.headers, {})
+          super(ctx, destination, stomp_message.body, stomp_message.headers, {})
         end
       end
 
@@ -48,21 +48,21 @@ module MessageDriver
 
         def_delegators :adapter, :with_connection, :poll_timeout
 
-        # def subscribe(destination, consumer)
+        # def handle_subscribe(destination, consumer)
         # destination.subscribe(&consumer)
         # end
 
-        def create_destination(name, dest_options = {}, message_props = {})
+        def handle_create_destination(name, dest_options = {}, message_props = {})
           Destination.new(adapter, name, dest_options, message_props)
         end
 
-        def publish(destination, body, headers = {}, _properties = {})
+        def handle_publish(destination, body, headers = {}, _properties = {})
           with_connection do |connection|
             connection.publish(destination.queue_path, body, headers)
           end
         end
 
-        def pop_message(destination, options = {})
+        def handle_pop_message(destination, options = {})
           with_connection do |connection|
             sub_id = connection.uuid
             msg = nil
@@ -76,7 +76,7 @@ module MessageDriver
               end
             end
             connection.unsubscribe(destination.queue_path, options, sub_id)
-            Message.new(self, msg) if msg
+            Message.new(self, destination, msg) if msg
           end
         end
 
@@ -107,7 +107,7 @@ module MessageDriver
 
       def open_connection
         conn = Stomp::Connection.new(@config)
-        fail MessageDriver::ConnectionError, conn.connection_frame.to_s unless conn.open?
+        raise MessageDriver::ConnectionError, conn.connection_frame.to_s unless conn.open?
         conn
       end
 
@@ -115,8 +115,8 @@ module MessageDriver
         required = Gem::Requirement.create('~> 1.3.1')
         current = Gem::Version.create(Stomp::Version::STRING)
         unless required.satisfied_by? current
-          fail 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

@@ -18,7 +18,7 @@ module MessageDriver
       # @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"
+          raise BrokerAlreadyConfigured, "there is already a broker named #{name} configured"
         end
         brokers[name] = new(name, options)
       end
@@ -31,8 +31,8 @@ module MessageDriver
       def broker(name = DEFAULT_BROKER_NAME)
         result = brokers[name]
         if result.nil?
-          fail BrokerNotConfigured,
-               "There is no broker named #{name} configured. The configured brokers are #{brokers.keys}"
+          raise BrokerNotConfigured,
+                "There is no broker named #{name} configured. The configured brokers are #{brokers.keys}"
         end
         result
       end
@@ -58,17 +58,13 @@ module MessageDriver
       # stops all the brokers
       # @see #stop
       def stop_all
-        each_broker do |brk|
-          brk.stop
-        end
+        each_broker(&:stop)
       end
 
       # restarts all the brokers
       # @see #restart
       def restart_all
-        each_broker do |brk|
-          brk.restart
-        end
+        each_broker(&:restart)
       end
 
       # Resets all the brokers for testing purposes.
@@ -90,6 +86,7 @@ module MessageDriver
           end
         end
         brokers.clear
+        clients.clear
       end
 
       private
@@ -157,7 +154,7 @@ module MessageDriver
     end
 
     def consumer(key, &block)
-      fail 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
 
@@ -168,14 +165,14 @@ module MessageDriver
     def find_destination(destination_name)
       destination = @destinations[destination_name]
       if destination.nil?
-        fail MessageDriver::NoSuchDestinationError, "no destination #{destination_name} has been configured"
+        raise MessageDriver::NoSuchDestinationError, "no destination #{destination_name} has been configured"
       end
       destination
     end
 
     def find_consumer(consumer_name)
       consumer = @consumers[consumer_name]
-      fail MessageDriver::NoSuchConsumerError, "no consumer #{consumer_name} has been configured" if consumer.nil?
+      raise MessageDriver::NoSuchConsumerError, "no consumer #{consumer_name} has been configured" if consumer.nil?
       consumer
     end
 
@@ -184,7 +181,7 @@ module MessageDriver
     def resolve_adapter(adapter, options)
       case adapter
       when nil
-        fail 'you must specify an adapter'
+        raise 'you must specify an adapter'
       when Symbol, String
         resolve_adapter(find_adapter_class(adapter), options)
       when Class
@@ -192,7 +189,7 @@ module MessageDriver
       when MessageDriver::Adapters::Base
         adapter
       else
-        fail "adapter must be a MessageDriver::Adapters::Base, but this object is a #{adapter.class}"
+        raise "adapter must be a MessageDriver::Adapters::Base, but this object is a #{adapter.class}"
       end
     end
 
@@ -202,11 +199,11 @@ module MessageDriver
       adapter_method = "#{adapter_name}_adapter"
 
       unless respond_to?(adapter_method)
-        fail ['the adapter',
-              adapter_name,
-              'must provide',
-              "MessageDriver::Broker##{adapter_method}",
-              'that returns the adapter class'].join(' ')
+        raise ['the adapter',
+               adapter_name,
+               'must provide',
+               "MessageDriver::Broker##{adapter_method}",
+               'that returns the adapter class'].join(' ')
       end
 
       send(adapter_method)

data/lib/message_driver/client.rb

@@ -21,7 +21,7 @@ module MessageDriver
   #   end
   module Client
     include Logging
-    extend self
+    extend self # rubocop:disable Style/ModuleFunction
 
     # @!group Defining and Looking up Destinations
 
@@ -78,7 +78,7 @@ module MessageDriver
     end
 
     def subscribe(destination_name, consumer_name, options = {})
-      consumer =  find_consumer(consumer_name)
+      consumer = find_consumer(consumer_name)
       subscribe_with(destination_name, options, &consumer)
     end
 
@@ -186,11 +186,7 @@ module MessageDriver
     def fetch_context_wrapper(initialize = true)
       wrapper = Thread.current[adapter_context_key]
       if wrapper.nil? || !wrapper.valid?
-        if initialize
-          wrapper = build_context_wrapper
-        else
-          wrapper = nil
-        end
+        wrapper = (build_context_wrapper if initialize)
         Thread.current[adapter_context_key] = wrapper
       end
       wrapper

data/lib/message_driver/destination.rb

@@ -23,15 +23,15 @@ module MessageDriver
       end
 
       def message_count
-        fail "#message_count is not supported by #{self.class}"
+        current_adapter_context.message_count(self)
       end
 
-      def subscribe(_options = {}, &_consumer)
-        fail "#subscribe is not supported by #{self.class}"
+      def subscribe(options = {}, &consumer)
+        current_adapter_context.subscribe(self, options, &consumer)
       end
 
       def consumer_count
-        fail "#consumer_count is not supported by #{self.class}"
+        current_adapter_context.consumer_count(self)
       end
 
       def middleware

data/lib/message_driver/message.rb

@@ -3,10 +3,11 @@ module MessageDriver
     class Base
       include Logging
 
-      attr_reader :ctx, :body, :raw_body, :headers, :properties
+      attr_reader :ctx, :destination, :body, :raw_body, :headers, :properties
 
-      def initialize(ctx, body, headers, properties, raw_body = nil)
+      def initialize(ctx, destination, body, headers, properties, raw_body = nil)
         @ctx = ctx
+        @destination = destination
         @body = body
         @headers = headers
         @properties = properties

data/lib/message_driver/middleware/block_middleware.rb

@@ -5,7 +5,7 @@ module MessageDriver
 
       def initialize(destination, opts)
         super(destination)
-        fail ArgumentError, 'you must provide at least one of :on_publish and :on_consume' \
+        raise ArgumentError, 'you must provide at least one of :on_publish and :on_consume' \
           unless opts.keys.any? { |k| [:on_publish, :on_consume].include? k }
         @on_publish_block = opts[:on_publish]
         @on_consume_block = opts[:on_consume]

data/lib/message_driver/subscription.rb

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

data/lib/message_driver/version.rb

@@ -1,4 +1,4 @@
 module MessageDriver
   # @return [String] version of the library
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'.freeze
 end

data/message-driver.gemspec

@@ -14,14 +14,14 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($RS)
-  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
+  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 = %w(lib)
 
-  gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 3.1.0'
-  gem.add_development_dependency 'cucumber', '< 2'
-  gem.add_development_dependency 'aruba', '< 0.9'
+  gem.add_development_dependency 'rspec', '~> 3.5.0'
+  gem.add_development_dependency 'cucumber', '~> 2.4.0'
+  gem.add_development_dependency 'aruba', '~> 0.14.1'
 end

data/spec/integration/bunny/amqp_integration_spec.rb

@@ -6,11 +6,13 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
   context "when a queue can't be found" do
     let(:queue_name) { 'my.lost.queue' }
     it 'raises a MessageDriver::QueueNotFound error' do
+      # rubocop:disable Style/MultilineBlockChain
       expect do
         broker.dynamic_destination(queue_name, passive: true)
       end.to raise_error(MessageDriver::QueueNotFound) do |err|
         expect(err.nested).to be_a Bunny::NotFound
       end
+      # rubocop:enable
     end
   end
 
@@ -54,7 +56,7 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
       expect do
         MessageDriver::Client.with_message_transaction do
           destination.publish('Test Message')
-          fail 'unhandled error'
+          raise 'unhandled error'
         end
       end.to raise_error 'unhandled error'
       expect(destination.pop_message).to be_nil
@@ -64,7 +66,7 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
       expect do
         MessageDriver::Client.with_message_transaction do
           destination.publish('Test Message 1')
-          fail 'unhandled error'
+          raise 'unhandled error'
         end
       end.to raise_error 'unhandled error'
       expect(destination.pop_message).to be_nil
@@ -83,7 +85,7 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
     it 'does not raise an error' do
       expect do
         MessageDriver::Client.with_message_transaction do
-          #do nothing
+          # do nothing
         end
       end.not_to raise_error
     end
@@ -92,7 +94,7 @@ RSpec.describe 'AMQP Integration', :bunny, type: :integration do
       it 'does not raise an error' do
         expect do
           MessageDriver::Client.with_message_transaction(type: :confirm_and_wait) do
-            #do nothing
+            # do nothing
           end
         end.not_to raise_error
       end