freddy 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca77c9b3fbbe1d36a577b1f83dac5403d622951
-  data.tar.gz: 173f636703aa687c57ab451739736aa55e082021
+  metadata.gz: 0d677aed926ebfba37c90931e9cf1945e68b9b25
+  data.tar.gz: cf670f4b31d6d15434edf9f53876cf447f6a4b5a
 SHA512:
-  metadata.gz: 6eb122206afd0ed15c142b8b70a63f68501033be27e54cc4c459f7f028daf03bf9b697efd46bea521348ce38e04c5f59b936d0e0174cda572499b26456e0116c
-  data.tar.gz: 388f18d7af6a373c9952a4a36b2e4a32ccefa78ff160511993da9b18f6b4b06a527036ab648f63230d06bdf36ee644be5b2a4bf6fb0f9444bcc6f7595acc56ed
+  metadata.gz: 71e4c1cfe3a93a877fd05f04962c2c63b14e9bf9d5b14bbef0657855e649d30aa90c152c224d059030932e98c5e7b80c7474cf8238eb6425965ed138f9d62837
+  data.tar.gz: 2f84c367f1b5d2bfb6108962343c92ef8dc160479bd79d14b1bdf166ef6f4fa9608a5a71e9299664a9b00b09cab1102f2e1b93c859d383544099ac2c27da1e8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freddy (0.3.2)
+    freddy (0.3.3)
       bunny (= 1.6.3)
       hamster (~> 1.0.1.pre.rc3)
       symbolizer

data/README.md

@@ -145,7 +145,7 @@ The underlying bunny implementation uses 1 responder thread by default. This mea
 
 This is especially devious when using `deliver_with_response` in a responder because `deliver_with_response` creates a new anonymous responder which will not receive the response if the parent responder uses a sleep call.
 
-To resolve this problem *freddy* uses 4 responder threads by default (configurable by `responder_thread_count`). Note that this means that ordered message processing is not guaranteed by default. Read more from <http://rubybunny.info/articles/concurrency.html>.
+To resolve this problem *freddy* creates separate threads for processing. Read more from <http://rubybunny.info/articles/concurrency.html>.
 
 ## Credits
 

data/freddy.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "freddy"
-  spec.version       = '0.3.2'
+  spec.version       = '0.3.3'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy.rb

@@ -50,7 +50,7 @@ class Freddy
     bunny = Bunny.new(bunny_config)
     bunny.start
 
-    channel = bunny.create_channel(nil, bunny_config[:responder_thread_count] || 4)
+    channel = bunny.create_channel
     new(channel, logger)
   end
 

data/lib/freddy/consumer.rb

@@ -21,9 +21,11 @@ class Freddy
 
     def consume_from_queue(queue, options = {}, &block)
       consumer = queue.subscribe options do |delivery_info, properties, payload|
-        parsed_payload = parse_payload(payload)
-        log_receive_event(queue.name, parsed_payload)
-        block.call parsed_payload, Delivery.new(delivery_info, properties)
+        Thread.new do
+          parsed_payload = parse_payload(payload)
+          log_receive_event(queue.name, parsed_payload)
+          block.call parsed_payload, Delivery.new(delivery_info, properties)
+        end
       end
       @logger.debug "Consuming messages on #{queue.name}"
       ResponderHandler.new consumer, @channel
@@ -32,7 +34,9 @@ class Freddy
     def tap_into(pattern, &block)
       queue = @channel.queue("", exclusive: true).bind(@topic_exchange, routing_key: pattern)
       consumer = queue.subscribe do |delivery_info, properties, payload|
-        block.call parse_payload(payload), delivery_info.routing_key
+        Thread.new do
+          block.call parse_payload(payload), delivery_info.routing_key
+        end
       end
       @logger.debug "Tapping into messages that match #{pattern}"
       ResponderHandler.new consumer, @channel

data/spec/integration/concurrency_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe 'Concurrency' do
+  let(:freddy) { Freddy.build(logger, config) }
+
+  it 'supports nested calls in #respond_to' do
+    freddy.respond_to 'Concurrency1' do |payload, msg_handler|
+      begin
+        result = freddy.deliver_with_response 'Concurrency2', msg: 'noop'
+        msg_handler.success(result)
+      rescue Freddy::ErrorResponse => e
+        msg_handler.error(e.response)
+      end
+    end
+
+    freddy.respond_to 'Concurrency2' do |payload, msg_handler|
+      begin
+        result = freddy.deliver_with_response 'Concurrency3', msg: 'noop'
+        msg_handler.success(result)
+      rescue Freddy::ErrorResponse => e
+        msg_handler.error(e.response)
+      end
+    end
+
+    freddy.respond_to 'Concurrency3' do |payload, msg_handler|
+      msg_handler.success({from: 'Concurrency3'})
+    end
+
+    result =
+      begin
+        freddy.deliver_with_response 'Concurrency1', msg: 'noop'
+      rescue Freddy::ErrorResponse => e
+        e.response
+      end
+
+    expect(result).to eq(from: 'Concurrency3')
+  end
+
+  it 'supports nested calls in #tap_into' do
+    received1 = false
+    received2 = false
+
+    freddy.tap_into 'concurrency.*.queue1' do
+      result = freddy.deliver_with_response 'TapConcurrency', msg: 'noop'
+      expect(result).to eq(from: 'TapConcurrency')
+      received1 = true
+    end
+
+    freddy.respond_to 'TapConcurrency' do |payload, msg_handler|
+      msg_handler.success({from: 'TapConcurrency'})
+      received2 = true
+    end
+
+    freddy.deliver 'concurrency.q.queue1', msg: 'noop'
+
+    wait_for { received1 && received2 }
+
+    expect(received1).to be(true)
+    expect(received2).to be(true)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - spec/freddy/message_handler_spec.rb
 - spec/freddy/request_spec.rb
 - spec/freddy/responder_handler_spec.rb
+- spec/integration/concurrency_spec.rb
 - spec/integration/logging_spec.rb
 - spec/spec_helper.rb
 homepage: 
@@ -146,5 +147,6 @@ test_files:
 - spec/freddy/message_handler_spec.rb
 - spec/freddy/request_spec.rb
 - spec/freddy/responder_handler_spec.rb
+- spec/integration/concurrency_spec.rb
 - spec/integration/logging_spec.rb
 - spec/spec_helper.rb