freddy 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94ba387f99174d17ab66ed7caacbcc342a11a5f
-  data.tar.gz: debfccbc498a8262ad843b7f3dcb9af9e5e1dc12
+  metadata.gz: 7b44c437c95066c2386f67bc9077fb0194376958
+  data.tar.gz: 8e4dc3ae45c00ff027a7eccd10609c77f146b715
 SHA512:
-  metadata.gz: 0c9c4661349d96dd99ec104c5e3737cdb8f818beaf3c49f4450efadead9db70c1b6ab6493b9e93f08e142ac0bf32d5d5ccebe5e73bf2ed1a223c85ed9828a6b5
-  data.tar.gz: d2024c91c580911db393ddaca913db397f72a1bc7961256dd53451609840c12f8c1ef618d1c02861ed4801752658ae756364b60b239772fdac34c21eb3ad0625
+  metadata.gz: 8fc4ef697700812b814402e02892a5aea60348e6e8550f21de356fe68d22e2c354c785a5f09b18184c61de373b0e03bb203f6aa8f57c4e34d33c1c0dab2fbfcd
+  data.tar.gz: cd13ca536d3b50a2f650d9bfc6f32639b23273f3233de316ea1e87825aa73d6eebdeec816114bd149c245c9406238dcbb5458777b3bf4042e81be55e1d6bdd44

data/freddy.gemspec

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

data/lib/freddy/producers/send_and_wait_response_producer.rb

@@ -22,33 +22,18 @@ class Freddy
         @response_consumer.consume(@response_queue, &method(:handle_response))
       end
 
-      def produce(destination, payload, properties)
-        timeout_in_seconds = properties.fetch(:timeout_in_seconds)
-        container = SyncResponseContainer.new
-        async_request destination, payload, container, properties
-        container.wait_for_response(timeout_in_seconds)
-      end
-
-      private
-
-      def async_request(destination, payload, container, timeout_in_seconds:, delete_on_timeout:, **properties)
+      def produce(destination, payload, timeout_in_seconds:, delete_on_timeout:, **properties)
         correlation_id = SecureRandom.uuid
 
+        container = SyncResponseContainer.new(
+          on_timeout(correlation_id, destination, timeout_in_seconds)
+        )
+
         @request_manager.store(correlation_id,
           callback: container,
           destination: destination
         )
 
-        container.on_timeout do
-          @logger.warn "Request timed out waiting response from #{destination}, correlation id #{correlation_id}"
-          Utils.notify 'RequestTimeout', "Request timed out waiting for response from #{destination}", {
-            correlation_id: correlation_id,
-            destination: destination,
-            timeout_in_seconds: timeout_in_seconds
-          }
-          @request_manager.delete(correlation_id)
-        end
-
         if delete_on_timeout
           properties[:expiration] = (timeout_in_seconds * 1000).to_i
         end
@@ -68,6 +53,8 @@ class Freddy
         # need to lock these.
         @topic_exchange.publish json_payload, properties.dup
         @exchange.publish json_payload, properties.dup
+
+        container.wait_for_response(timeout_in_seconds)
       end
 
       def handle_response(delivery)
@@ -88,6 +75,23 @@ class Freddy
                       "with correlation_id #{delivery.correlation_id}"
         request[:callback].call(delivery.payload, delivery)
       end
+
+      def on_timeout(correlation_id, destination, timeout_in_seconds)
+        Proc.new do
+          @logger.warn "Request timed out waiting response from #{destination}"\
+                       ", correlation id #{correlation_id}"
+
+          Utils.notify 'RequestTimeout',
+            "Request timed out waiting for response from #{destination}",
+            {
+              correlation_id: correlation_id,
+              destination: destination,
+              timeout_in_seconds: timeout_in_seconds
+            }
+
+          @request_manager.delete(correlation_id)
+        end
+      end
     end
   end
 end

data/lib/freddy/sync_response_container.rb

@@ -3,32 +3,31 @@ require 'timeout'
 
 class Freddy
   class SyncResponseContainer
-    def initialize
+    def initialize(on_timeout)
       @mutex = Mutex.new
       @resource = ConditionVariable.new
+      @on_timeout = on_timeout
     end
 
     def call(response, delivery)
+      if response.nil?
+        raise StandardError, 'unexpected nil value for response'
+      end
+
       @response = response
       @delivery = delivery
       @mutex.synchronize { @resource.signal }
     end
 
-    def on_timeout(&block)
-      @on_timeout = block
-    end
-
     def wait_for_response(timeout)
-      @mutex.synchronize { @resource.wait(@mutex, timeout) }
+      @mutex.synchronize { @response || @resource.wait(@mutex, timeout) }
 
-      if !defined?(@response)
+      if !@response
         @on_timeout.call
         raise TimeoutError.new(
           error: 'RequestTimeout',
           message: 'Timed out waiting for response'
         )
-      elsif @response.nil?
-        raise StandardError, 'unexpected nil value for response'
       elsif !@delivery || @delivery.type == 'error'
         raise InvalidRequestError.new(@response)
       else

data/spec/freddy/sync_response_container_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
 
 describe Freddy::SyncResponseContainer do
-  let(:container) { described_class.new }
-
-  before do
-    container.on_timeout {}
-  end
+  let(:container) { described_class.new(on_timeout) }
+  let(:on_timeout) { Proc.new {} }
 
   context 'when timeout' do
     subject { container.wait_for_response(0.01) }
@@ -21,19 +18,12 @@ describe Freddy::SyncResponseContainer do
     end
   end
 
-  context 'when nil resonse' do
+  context 'when nil response' do
     let(:delivery) { {} }
 
-    before do
-      Thread.new do
-        default_sleep
-        container.call(nil, delivery)
-      end
-    end
-
     it 'raises timeout error' do
       expect {
-        container.wait_for_response(2)
+        container.call(nil, delivery)
       }.to raise_error(StandardError, 'unexpected nil value for response')
     end
   end
@@ -44,6 +34,8 @@ describe Freddy::SyncResponseContainer do
     let(:delivery) { OpenStruct.new(type: 'success') }
 
     context 'when called after #call' do
+      let(:max_wait_time_in_seconds) { 0.5 }
+
       before do
         container.call(response, delivery)
       end
@@ -51,6 +43,12 @@ describe Freddy::SyncResponseContainer do
       it 'returns response' do
         expect(container.wait_for_response(timeout)).to eq(response)
       end
+
+      it 'does not wait for timeout' do
+        expect {
+          container.wait_for_response(timeout)
+        }.to change(Time, :now).by_at_most(max_wait_time_in_seconds)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler