freddy 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a41652a44eeac100da5b263e45cacf1d4d18bac
-  data.tar.gz: 42e617e90df278bb931646a89281fde4e155be51
+  metadata.gz: 8aee28c6b8c64e053dfd864eb43e05f4d350606c
+  data.tar.gz: 3cf659c4cb47be3b564fe992da89603c6c3649cf
 SHA512:
-  metadata.gz: 006202ca3ddeb5670e824319dad63e1e980bc733a8a4a667f8a5faa1544a5f0af6c828515bc8ceb3f38fdf9f8f332fd3c09e4d6a8feb07522bf0dc256bd12253
-  data.tar.gz: 7f0d305730a3a7824302c87bfc95845f75e68f646b6554d73edcc1484752a9431f4095be73b54292c85a7c06f2e266c77e743830e9877ba8aa89e3de30886244
+  metadata.gz: fcc93283eb0ff7d457ab33f4f4c87d1c6969a60b3fc7bda09b21cd4fa88fa198089d1b4317bab95bfb2b88a7ab6df2abb29af1bc42116954fa9bfa23027f84db
+  data.tar.gz: 46079754f78b019f506445d46040ff846e02568acd497a053dd0c1067a44a4329b18d5c3beefa8abfab7b0d55dcde9effc5e616112a15f54497a46818ee3313e

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '0.4.8'
+  spec.version       = '0.4.9'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy.rb

@@ -42,7 +42,7 @@ class Freddy
     @channel  = connection.create_channel
     @consume_thread_pool = Thread.pool(max_concurrency)
     @producer = Producer.new channel, logger
-    @consumer = Consumer.new channel, logger, @consume_thread_pool, @producer
+    @consumer = Consumer.new logger, @consume_thread_pool, @producer, @connection
     @request  = Request.new channel, logger, @producer, @consumer
   end
   private :initialize

data/lib/freddy/consumer.rb

@@ -7,10 +7,11 @@ require_relative 'consumers/response_consumer'
 
 class Freddy
   class Consumer
-    def initialize(channel, logger, consume_thread_pool, producer)
-      @channel, @logger = channel, logger
-      @tap_into_consumer = Consumers::TapIntoConsumer.new(consume_thread_pool, channel)
-      @respond_to_consumer = Consumers::RespondToConsumer.new(consume_thread_pool, channel, producer, @logger)
+    def initialize(logger, consume_thread_pool, producer, connection)
+      @logger = logger
+      @connection = connection
+      @tap_into_consumer = Consumers::TapIntoConsumer.new(consume_thread_pool)
+      @respond_to_consumer = Consumers::RespondToConsumer.new(consume_thread_pool, producer, @logger)
       @response_consumer = Consumers::ResponseConsumer.new(@logger)
     end
 
@@ -21,12 +22,12 @@ class Freddy
 
     def tap_into(pattern, &block)
       @logger.debug "Tapping into messages that match #{pattern}"
-      @tap_into_consumer.consume(pattern, &block)
+      @tap_into_consumer.consume(pattern, @connection.create_channel, &block)
     end
 
     def respond_to(destination, &block)
       @logger.info "Listening for requests on #{destination}"
-      @respond_to_consumer.consume(destination, &block)
+      @respond_to_consumer.consume(destination, @connection.create_channel, &block)
     end
   end
 end

data/lib/freddy/consumers/respond_to_consumer.rb

@@ -1,18 +1,14 @@
 class Freddy
   module Consumers
     class RespondToConsumer
-      def initialize(consume_thread_pool, channel, producer, logger)
+      def initialize(consume_thread_pool, producer, logger)
         @consume_thread_pool = consume_thread_pool
-        @channel = channel
         @producer = producer
         @logger = logger
-        @response_queue_lock = Mutex.new
       end
 
-      def consume(destination, &block)
-        ensure_response_queue_exists
-
-        consumer = consume_from_destination(destination) do |delivery|
+      def consume(destination, channel, &block)
+        consumer = consume_from_destination(destination, channel) do |delivery|
           log_receive_event(destination, delivery)
 
           handler_class = MessageHandlers.for_type(delivery.type)
@@ -27,8 +23,8 @@ class Freddy
 
       private
 
-      def consume_from_destination(destination, &block)
-        @channel.queue(destination).subscribe do |delivery|
+      def consume_from_destination(destination, channel, &block)
+        channel.queue(destination).subscribe do |delivery|
           process_message(delivery, &block)
         end
       end
@@ -46,14 +42,6 @@ class Freddy
           @logger.debug "Received message on #{destination} with payload #{delivery.payload} with correlation_id #{delivery.correlation_id}"
         end
       end
-
-      def ensure_response_queue_exists
-        return @response_queue if defined?(@response_queue)
-
-        @response_queue_lock.synchronize do
-          @response_queue = @channel.queue('', exclusive: true)
-        end
-      end
     end
   end
 end

data/lib/freddy/consumers/tap_into_consumer.rb

@@ -1,18 +1,15 @@
-require 'thread'
-
 class Freddy
   module Consumers
     class TapIntoConsumer
-      def initialize(consume_thread_pool, channel)
+      def initialize(consume_thread_pool)
         @consume_thread_pool = consume_thread_pool
-        @channel = channel
-        @topic_exchange = @channel.topic(Freddy::FREDDY_TOPIC_EXCHANGE_NAME)
-        @mutex = Mutex.new
       end
 
-      def consume(pattern, &block)
-        consumer = @mutex.synchronize do
-          create_consumer(pattern, &block)
+      def consume(pattern, channel, &block)
+        queue = create_queue(pattern, channel)
+
+        consumer = queue.subscribe do |delivery|
+          process_message(delivery, &block)
         end
 
         ResponderHandler.new(consumer, @consume_thread_pool)
@@ -20,17 +17,12 @@ class Freddy
 
       private
 
+      def create_queue(pattern, channel)
+        topic_exchange = channel.topic(Freddy::FREDDY_TOPIC_EXCHANGE_NAME)
 
-      def create_consumer(pattern, &block)
-        create_queue(pattern).subscribe do |delivery|
-          process_message(delivery, &block)
-        end
-      end
-
-      def create_queue(pattern)
-        @channel
+        channel
           .queue('', exclusive: true)
-          .bind(@topic_exchange, routing_key: pattern)
+          .bind(topic_exchange, routing_key: pattern)
       end
 
       def process_message(delivery, &block)

data/spec/integration/concurrency_spec.rb

@@ -73,4 +73,15 @@ describe 'Concurrency' do
 
     expect(results.count).to eq(10)
   end
+
+  it 'supports adding multiple #respond_to listeners' do
+    results = 10.times.map do |id|
+      Thread.new do
+        freddy1.respond_to "respond_to.listener.#{id}" do
+        end
+      end
+    end.map(&:join)
+
+    expect(results.count).to eq(10)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Urmas Talimaa