fake_sqs 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc20ac34a0c6c8147c3af9692169ae145b7d2e9c
-  data.tar.gz: 2964e38cee5d603014a322e514cfa63989cf66a8
+  metadata.gz: 94412f4b22bef545ab170adea1e4a11221474592
+  data.tar.gz: d76a7b7b49a90681f18620fcbed7732062e9a226
 SHA512:
-  metadata.gz: 8bafd8828d1f473c9a881d4c00a07f9e447bc6153869adbad17ae2d60fb97f5c248558122830ed66635f48b563c5eebb7fd4ce37eba7bc66ea95b6036e8fe6c0
-  data.tar.gz: e1ec826376dfb67c9f1f910903bf6852e66b73f2821014fe11e773aed50cea51251eed804d69ca99ea24cac3c8515786cf0932edc4cb0187314d7d0e2cb069fa
+  metadata.gz: 04e8d176460c83384dfb43c1f5aa669dfedbd68a8168adbe14d7516108271ae736ae1db352fa48bd23d02ced0686f4fa5f4a96a6b8205471af68d0b3ff111486
+  data.tar.gz: b3e49559fadd19e3977e5261b5ba724182ed2f2db5e7576cc66cb62d4731221cc7ba796c3d75a53b46801e9cb1d1be46f08ac0dca803df4f01b29ed529732891

data/README.md

@@ -1,4 +1,4 @@
-# Fake SQS [![Build Status](https://secure.travis-ci.org/iain/fake_sqs.png)](http://travis-ci.org/iain/fake_sqs)
+# Fake SQS [![Build Status](https://api.travis-ci.org/iain/fake_sqs.svg?branch=master)](http://travis-ci.org/iain/fake_sqs) [![Gem Version](https://badge.fury.io/rb/fake_sqs.svg)](https://badge.fury.io/rb/fake_sqs)
 
 Fake SQS is a lightweight server that mocks the Amazon SQS API.
 
@@ -11,13 +11,13 @@ Many features are supported and if you miss something, open a pull.
 ## Installation
 
 ```
-gem install fakesqs
+gem install fake_sqs
 ```
 
 ## Running
 
 ```
-fakesqs --database /path/to/database.yml
+fake_sqs --database /path/to/database.yml
 ```
 
 ## Development

data/lib/fake_sqs/actions/change_message_visibility.rb

@@ -7,14 +7,16 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(queue, params)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         visibility = params.fetch("VisibilityTimeout")
         receipt = params.fetch("ReceiptHandle")
 
-        @queues.get(queue).change_message_visibility( receipt, visibility.to_i )
+        queue.change_message_visibility(receipt, visibility.to_i)
+
         @responder.call :ChangeMessageVisibility
       end
 
     end
   end
-end
+end

data/lib/fake_sqs/actions/change_message_visibility_batch.rb

@@ -7,7 +7,9 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(queue, params)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
+
         keys = params.keys.map do |key|
           case key
             when /^ChangeMessageVisibilityBatchRequestEntry\.(\w+)\.Id$/
@@ -15,19 +17,17 @@ module FakeSQS
           end
         end.compact
 
-        messages = keys.map do |key|
+        ids = keys.map do |key|
           receipt = params.fetch("ChangeMessageVisibilityBatchRequestEntry.#{key}.ReceiptHandle")
           timeout = params.fetch("ChangeMessageVisibilityBatchRequestEntry.#{key}.VisibilityTimeout").to_i
-          @queues.get(queue).change_message_visibility(receipt, timeout)
+          queue.change_message_visibility(receipt, timeout)
           params.fetch("ChangeMessageVisibilityBatchRequestEntry.#{key}.Id")
         end
 
         @responder.call :ChangeMessageVisibilityBatch do |xml|
-          xml.ChangeMessageVisibilityBatchResult do
-            messages.each do |message|
-              xml.ChangeMessageVisibilityBatchResultEntry do
-                xml.Id message
-              end
+          ids.each do |id|
+            xml.ChangeMessageVisibilityBatchResultEntry do
+              xml.Id id
             end
           end
         end
@@ -35,4 +35,4 @@ module FakeSQS
 
     end
   end
-end
+end

data/lib/fake_sqs/actions/delete_message.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
 
         receipt = params.fetch("ReceiptHandle")
         queue.delete_message(receipt)

data/lib/fake_sqs/actions/delete_message_batch.rb

@@ -8,16 +8,14 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         receipts = params.select { |k,v| k =~ /DeleteMessageBatchRequestEntry\.\d+\.ReceiptHandle/ }
 
-        deleted = []
-
-        receipts.each do |key, value|
+        deleted = receipts.each do |key, value|
           id = key.split('.')[1]
-          queue.delete_message(value)
-          deleted << params.fetch("DeleteMessageBatchRequestEntry.#{id}.Id")
+          queue.delete_message(value) # Broken, can only delete in-flight messages
+          params.fetch("DeleteMessageBatchRequestEntry.#{id}.Id")
         end
 
         @responder.call :DeleteMessageBatch do |xml|

data/lib/fake_sqs/actions/delete_queue.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        @queues.delete(name, params)
+      def call(queue_name, params = {})
+        @queues.delete(queue_name, params)
         @responder.call :DeleteQueue
       end
 

data/lib/fake_sqs/actions/list_dead_letter_source_queues.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue_arn = @queues.get(name).arn
+      def call(queue_name, params)
+        queue_arn = @queues.get(queue_name).arn
         queue_urls = @queues.list.select do |queue|
           redrive_policy = queue.attributes.fetch("RedrivePolicy", nil)
           redrive_policy && redrive_policy =~ /deadLetterTargetArn\":\"#{queue_arn}/

data/lib/fake_sqs/actions/purge_queue.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         queue.reset()
         @responder.call :PurgeQueue
       end

data/lib/fake_sqs/actions/receive_message.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         filtered_attribute_names = []
         params.select{|k,v | k =~ /AttributeName\.\d+/}.each do |key, value|
           filtered_attribute_names << value
@@ -36,4 +36,4 @@ module FakeSQS
       end
     end
   end
-end
+end

data/lib/fake_sqs/actions/send_message.rb

@@ -8,8 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         message = queue.send_message(params)
         @responder.call :SendMessage do |xml|
           xml.MD5OfMessageBody message.md5

data/lib/fake_sqs/actions/send_message_batch.rb

@@ -8,9 +8,8 @@ module FakeSQS
         @responder = options.fetch(:responder)
       end
 
-      def call(name, params)
-        queue = @queues.get(name)
-
+      def call(queue_name, params)
+        queue = @queues.get(queue_name)
         messages = params.select { |k,v| k =~ /SendMessageBatchRequestEntry\.\d+\.MessageBody/ }
 
         results = {}

data/lib/fake_sqs/api.rb

@@ -29,7 +29,7 @@ module FakeSQS
       @timer     = Thread.new do
         while @run_timer
           queues.timeout_messages!
-          sleep(5)
+          sleep(0.1)
         end
       end
     end

data/lib/fake_sqs/databases/file.rb

@@ -56,6 +56,7 @@ module FakeSQS
     end
 
     def delete(key)
+      @queue_objects.delete(key)
       storage.delete(key)
     end
 

data/lib/fake_sqs/helper.rb

@@ -0,0 +1,12 @@
+require 'sinatra/base'
+
+module FakeSQS
+  class Helper
+
+    def queue_from_url(queue_url)
+      uri = URI.parse(queue_url)
+      return uri.path.tr('/', '')
+    end
+
+  end
+end

data/lib/fake_sqs/message.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'digest/sha1'
 
 module FakeSQS
   class Message
@@ -52,5 +53,9 @@ module FakeSQS
       }
     end
 
+    def receipt
+      Digest::SHA1.hexdigest self.id
+    end
+
   end
 end

data/lib/fake_sqs/queue.rb

@@ -2,6 +2,7 @@ require 'monitor'
 require 'securerandom'
 require 'fake_sqs/collection_view'
 require 'json'
+
 module FakeSQS
 
   MessageNotInflight = Class.new(RuntimeError)
@@ -47,7 +48,9 @@ module FakeSQS
     def send_message(options = {})
       with_lock do
         message = options.fetch(:message){ message_factory.new(options) }
-        @messages << message
+        if message
+          @messages[message.receipt] = message
+        end
         message
       end
     end
@@ -64,17 +67,16 @@ module FakeSQS
 
       with_lock do
         actual_amount = amount > published_size ? published_size : amount
-        published_messages = @messages.select { |m| m.published? }
+        published_messages = @messages.values.select { |m| m.published? }
 
         actual_amount.times do
           message = published_messages.delete_at(rand(published_size))
-          @messages.delete(message)
+          @messages.delete(message.receipt)
           unless check_message_for_dlq(message, options)
             message.expire_at(visibility_timeout)
             message.receive!
-            receipt = generate_receipt
-            @messages_in_flight[receipt] = message
-            result[receipt] = message
+            @messages_in_flight[message.receipt] = message
+            result[message.receipt] = message
           end
         end
       end
@@ -100,8 +102,8 @@ module FakeSQS
         end
         expired.each do |receipt,message|
           message.expire!
-          @messages << message
-          delete_message(receipt)
+          @messages[receipt] = message
+          @messages_in_flight.delete(receipt)
         end
       end
     end
@@ -113,8 +115,8 @@ module FakeSQS
 
         if visibility == 0
           message.expire!
-          @messages << message
-          delete_message(receipt)
+          @messages[receipt] = message
+          @messages_in_flight.delete(receipt)
         else
           message.expire_at(visibility)
         end
@@ -134,13 +136,14 @@ module FakeSQS
 
     def delete_message(receipt)
       with_lock do
+        @messages.delete(receipt)
         @messages_in_flight.delete(receipt)
       end
     end
 
     def reset
       with_lock do
-        @messages = []
+        @messages = {}
         @messages_view = FakeSQS::CollectionView.new(@messages)
         reset_messages_in_flight
       end
@@ -148,7 +151,8 @@ module FakeSQS
 
     def expire
       with_lock do
-        @messages += @messages_in_flight.values
+        @messages.merge!(@messages_in_flight)
+        @messages_in_flight.clear()
         reset_messages_in_flight
       end
     end
@@ -169,15 +173,11 @@ module FakeSQS
     end
 
     def size
-      messages.size
+      @messages.size
     end
 
     def published_size
-      messages.select { |m| m.published? }.size
-    end
-
-    def generate_receipt
-      SecureRandom.hex
+      @messages.values.select { |m| m.published? }.size
     end
 
     def with_lock

data/lib/fake_sqs/test_integration.rb

@@ -75,7 +75,7 @@ module FakeSQS
     end
 
     def verbose
-      if debug?
+      if options[:verbose]
         "--verbose"
       else
         "--no-verbose"

data/lib/fake_sqs/version.rb

@@ -1,3 +1,3 @@
 module FakeSQS
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/fake_sqs/web_interface.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'fake_sqs/helper'
 require 'fake_sqs/catch_errors'
 require 'fake_sqs/error_response'
 
@@ -37,15 +38,15 @@ module FakeSQS
 
     handle "/", [:get, :post] do
       if params['QueueUrl']
-        queue = URI.parse(params['QueueUrl']).path.gsub(/\//, '')
-        return settings.api.call(action, request, queue, params) unless queue.empty?
+        queue_name = Helper::queue_from_url(params['QueueUrl'])
+        return settings.api.call(action, request, queue_name, params) unless queue_name.empty?
       end
 
       settings.api.call(action, request, params)
     end
 
-    handle "/:queue", [:get, :post] do |queue|
-      settings.api.call(action, request, queue, params)
+    handle "/:queue_name", [:get, :post] do |queue_name|
+      settings.api.call(action, request, queue_name, params)
     end
   end
 end

data/spec/acceptance/message_actions_spec.rb

@@ -11,7 +11,6 @@ RSpec.describe "Actions for Messages", :sqs do
   end
 
   let(:sqs) { Aws::SQS::Client.new }
-
   let(:queue_url) { sqs.get_queue_url(queue_name: QUEUE_NAME).queue_url }
 
   specify "SendMessage" do
@@ -94,13 +93,13 @@ RSpec.describe "Actions for Messages", :sqs do
       queue_url: queue_url,
     ).messages.first
 
+    let_messages_in_flight_expire
+
     sqs.delete_message(
       queue_url: queue_url,
       receipt_handle: message1.receipt_handle,
     )
 
-    let_messages_in_flight_expire
-
     response = sqs.receive_message(
       queue_url: queue_url,
     )
@@ -121,25 +120,26 @@ RSpec.describe "Actions for Messages", :sqs do
       queue_url: queue_url,
       max_number_of_messages: 2,
     )
+    expect(messages_response.messages.size).to eq 2
 
-    entries = messages_response.messages.map { |msg|
-      {
-        id: SecureRandom.uuid,
-        receipt_handle: msg.receipt_handle,
-      }
-    }
+    let_messages_in_flight_expire
 
-    sqs.delete_message_batch(
+    response = sqs.delete_message_batch(
       queue_url: queue_url,
-      entries: entries,
+      entries: messages_response.messages.map { |msg|
+        {
+          id: SecureRandom.uuid,
+          receipt_handle: msg.receipt_handle,
+        }
+      },
     )
+    expect(response.successful.size).to eq(2)
 
-    let_messages_in_flight_expire
-
-    response = sqs.receive_message(
+    messages_response = sqs.receive_message(
       queue_url: queue_url,
+      max_number_of_messages: 2,
     )
-    expect(response.messages.size).to eq 0
+    expect(messages_response.messages.size).to eq 0
   end
 
   specify "PurgeQueue" do
@@ -163,7 +163,7 @@ RSpec.describe "Actions for Messages", :sqs do
   end
 
   specify "DeleteQueue" do
-    sqs.send_message(
+    sent_message = sqs.send_message(
       queue_url: queue_url,
       message_body: "test1"
     )
@@ -171,8 +171,11 @@ RSpec.describe "Actions for Messages", :sqs do
     response = sqs.receive_message(
       queue_url: queue_url,
     )
+    expect(response.messages[0].message_id).to eq sent_message.message_id
     expect(response.messages.size).to eq 1
 
+    let_messages_in_flight_expire
+
     sqs.delete_queue(queue_url: queue_url)
     sqs.create_queue(queue_name: QUEUE_NAME)
 
@@ -185,7 +188,7 @@ RSpec.describe "Actions for Messages", :sqs do
   specify "SendMessageBatch" do
     bodies = %w(a b c)
 
-    sqs.send_message_batch(
+    response = sqs.send_message_batch(
       queue_url: queue_url,
       entries: bodies.map { |bd|
         {
@@ -194,12 +197,12 @@ RSpec.describe "Actions for Messages", :sqs do
         }
       }
     )
+    expect(response.successful.size).to eq(3)
 
     messages_response = sqs.receive_message(
       queue_url: queue_url,
       max_number_of_messages: 3,
     )
-
     expect(messages_response.messages.map(&:body)).to match_array bodies
   end
 
@@ -213,14 +216,14 @@ RSpec.describe "Actions for Messages", :sqs do
 
     message = sqs.receive_message(
       queue_url: queue_url,
+      visibility_timeout: 10,
     ).messages.first
-
     expect(message.body).to eq body
 
     sqs.change_message_visibility(
       queue_url: queue_url,
       receipt_handle: message.receipt_handle,
-      visibility_timeout: 0
+      visibility_timeout: 0,
     )
 
     same_message = sqs.receive_message(
@@ -239,13 +242,14 @@ RSpec.describe "Actions for Messages", :sqs do
 
     message = sqs.receive_message(
       queue_url: queue_url,
+      visibility_timeout: 10,
     ).messages.first
     expect(message.body).to eq body
 
     sqs.change_message_visibility(
       queue_url: queue_url,
       receipt_handle: message.receipt_handle,
-      visibility_timeout: 2
+      visibility_timeout: 1,
     )
 
     nothing = sqs.receive_message(
@@ -253,9 +257,7 @@ RSpec.describe "Actions for Messages", :sqs do
     )
     expect(nothing.messages.size).to eq 0
 
-    # Changed from sleep 5 to sleep 7 due to race conditions in Travis build
-    # see https://github.com/iain/fake_sqs/pull/32
-    sleep(7)
+    sleep(2)
 
     same_message = sqs.receive_message(
       queue_url: queue_url,
@@ -264,27 +266,15 @@ RSpec.describe "Actions for Messages", :sqs do
   end
 
   specify 'should fail if trying to update the visibility_timeout for a message that is not in flight' do
-    body = 'some-sample-message'
-    sqs.send_message(
-      queue_url: queue_url,
-      message_body: body,
-    )
-
-    message = sqs.receive_message(
-      queue_url: queue_url,
-    ).messages.first
-    expect(message.body).to eq body
-
-    sqs.change_message_visibility(
+    response = sqs.send_message(
       queue_url: queue_url,
-      receipt_handle: message.receipt_handle,
-      visibility_timeout: 0
+      message_body: 'some-sample-message',
     )
 
     expect {
       sqs.change_message_visibility(
         queue_url: queue_url,
-        receipt_handle: message.receipt_handle,
+        receipt_handle: response.message_id,
         visibility_timeout: 30
       )
     }.to raise_error(Aws::SQS::Errors::MessageNotInflight)
@@ -292,7 +282,7 @@ RSpec.describe "Actions for Messages", :sqs do
 
   specify 'ChangeMessageVisibilityBatch' do
     bodies = (1..10).map { |n| n.to_s }
-    sqs.send_message_batch(
+    response = sqs.send_message_batch(
       queue_url: queue_url,
       entries: bodies.map { |bd|
         {
@@ -301,15 +291,16 @@ RSpec.describe "Actions for Messages", :sqs do
         }
       }
     )
+    expect(response.successful.size).to eq(10)
+
     message = sqs.receive_message(
       queue_url: queue_url,
       max_number_of_messages: 10,
-      visibility_timeout: 0,
+      visibility_timeout: 1,
     )
-
     expect(message.messages.size).to eq(10)
 
-    sqs.change_message_visibility_batch(
+    response = sqs.change_message_visibility_batch(
       queue_url: queue_url,
       entries: message.messages.map { |m|
         {
@@ -319,12 +310,14 @@ RSpec.describe "Actions for Messages", :sqs do
         }
       }
     )
+    expect(response.successful.size).to eq(10)
+
+    sleep(2)
 
     message = sqs.receive_message(
       queue_url: queue_url,
       max_number_of_messages: 10,
     )
-
     expect(message.messages.size).to eq(0)
   end
 
@@ -367,7 +360,7 @@ RSpec.describe "Actions for Messages", :sqs do
     sqs.change_message_visibility(
       queue_url: queue_url,
       receipt_handle: message.receipt_handle,
-      visibility_timeout: 0
+      visibility_timeout: 0,
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fake_sqs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -191,6 +191,7 @@ files:
 - lib/fake_sqs/databases/memory.rb
 - lib/fake_sqs/error_response.rb
 - lib/fake_sqs/error_responses.yml
+- lib/fake_sqs/helper.rb
 - lib/fake_sqs/message.rb
 - lib/fake_sqs/queue.rb
 - lib/fake_sqs/queue_factory.rb