Merge pull request #529 from DripEmail/master

Memoization of boolean causes extra calls to SQS

lib/shoryuken/queue.rb

@@ -44,7 +44,10 @@ def receive_messages(options)
     end
 
     def fifo?
-      @_fifo ||= queue_attributes.attributes[FIFO_ATTR] == 'true'
+      # Make sure the memoization work with boolean to avoid multiple calls to SQS
+      # see https://github.com/phstc/shoryuken/pull/529
+      return @_fifo if defined?(@_fifo)
+      @_fifo = queue_attributes.attributes[FIFO_ATTR] == 'true'
     end
 
     private

spec/shoryuken/queue_spec.rb

@@ -193,9 +193,8 @@ def call(options)
   end
 
   describe '#fifo?' do
+    let(:attribute_response) { double 'Aws::SQS::Types::GetQueueAttributesResponse' }
     before do
-      attribute_response = double 'Aws::SQS::Types::GetQueueAttributesResponse'
-
       allow(attribute_response).to(
         receive(:attributes).and_return('FifoQueue' => fifo.to_s, 'ContentBasedDeduplication' => 'true')
       )
@@ -209,12 +208,30 @@ def call(options)
       let(:fifo) { true }
 
       specify { expect(subject.fifo?).to be }
+
+      it 'memoizes response' do
+        expect(sqs).to(
+          receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response)
+        ).exactly(1).times
+
+        subject.fifo?
+        subject.fifo?
+      end
     end
 
     context 'when queue is not FIFO' do
       let(:fifo) { false }
 
       specify { expect(subject.fifo?).to_not be }
+
+      it 'memoizes response' do
+        expect(sqs).to(
+          receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response)
+        ).exactly(1).times
+
+        subject.fifo?
+        subject.fifo?
+      end
     end
   end
 end