fake_sqs 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb815a43a9c8361770d93419e8516519de9b0e65
-  data.tar.gz: df4679c9d5b121a6b0a18d811d3839104ab4415b
+  metadata.gz: '063098d4ed74f09793d0bde5c6fb857256893bec'
+  data.tar.gz: 7ae4304c0a2d4d2a55c579730641d13a86a0656b
 SHA512:
-  metadata.gz: 7326b4cc8acfcd59a6e08a84050bf14b3a30da1ce6e263ae44a0ec0cfcfd96acff1845675990dc74e9172617af1ff8506dc8b0a02f249ed65a492b31e8d6cf25
-  data.tar.gz: 1898c50cfbb473f5b29100efdb99f8aa0deff88a4e9a8cbe37112af08266c51ca5de178fd907eb517c2240c76d7b6ae65b41d14b22d60c1414a106a2ea4f183c
+  metadata.gz: 9b19a220db375f3b500ede5450c91b51d9a4023e19253f0fe3f842867c25335d0a9977b176ad1589bd0d24f5d1e62d597ea70e9a584b624008f27ba246a48ddf
+  data.tar.gz: 5ef566736e06d3ebe61e43e7c2b680df2e59a008a253a0b71776ed534bb8921bea6affa5460da71a87b022f563df96be65b6c957b1ddcf0df8867bfd76376892

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.DS_Store
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -1,6 +1,4 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.2.2

data/LICENSE.md

@@ -0,0 +1,20 @@
+# MIT License
+
+Copyright (c) 2012 Iain Hecker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,190 +1,28 @@
 # Fake SQS [![Build Status](https://secure.travis-ci.org/iain/fake_sqs.png)](http://travis-ci.org/iain/fake_sqs)
 
-Inspired by [Fake DynamoDB] [fake_dynamo], this is an AWS SQS compatible
-message queue that can be ran locally. This makes it ideal for integration
-testing, just like you would have a local database running. Fake SQS doesn't
-persist anything, not even the queues themselves. You'll have to create the
-queues everytime you start it.
+Fake SQS is a lightweight server that mocks the Amazon SQS API.
 
-This implementation is **not complete** yet, but should be useful already.
+It is extremely useful for testing SQS applications in a sandbox environment without actually
+making calls to Amazon, which not only requires a network connection, but also costs
+money.
 
-Done so far are:
+Many features are supported and if you miss something, open a pull.
 
-* Creating queues
-* Deleting queues
-* Listing queues (with prefixes)
-* Get queue url via the name
-* Send messages (and in batch)
-* Receive messages (and in batch)
-* Deleting messages (and in batch)
-* Changing queue attributes (but not all, and no validation)
-* Setting visibility timeouts for messages
-* Purge Queue
-
-Certain bits are left off on purpose, to make it easier to work with, such as:
-
-* No checking on access keys or signatures
-* No 60 second delay between deleting a queue and recreating it.
-
-Other parts are just not done yet:
-
-* Permissions
-* Error handling
-
-So, actually, just the basics are implemented at this point.
-
-PS. There is also [Fake SNS] [fake_sns].
-
-## Usage
-
-To install:
-
-```
-$ gem install fake_sqs
-```
-
-To start:
-
-```
-$ fake_sqs
-```
-
-To configure, see the options in the help:
-
-```
-$ fake_sqs --help
-```
-
-By default, FakeSQS uses an in-memory database (just a hash actually). To make
-it persistant, run with:
-
-```
-$ fake_sqs --database /path/to/database.yml
-```
-
-Messages are not persisted, just the queues.
-
-This is an example of how to configure the official [aws-sdk gem] [aws-sdk], to
-let it talk to Fake SQS.
-
-``` ruby
-AWS.config(
-  :use_ssl           => false,
-  :sqs_endpoint      => "localhost",
-  :sqs_port          => 4568,
-  :access_key_id     => "access key id",
-  :secret_access_key => "secret access key"
-)
-```
-
-```javascript
-var aws = require('aws-sdk');
-var sqs = new aws.SQS({
-  endpoint: 'http://localhost:4568',
-  apiVersion: '2012-11-05',
-  accessKeyId: 'access key id',
-  secretAccessKey: 'secret access key',
-  region: 'region'
-});
-```
-
-If you have the configuration options for other libraries, please give them to
-me.
-
-To reset the entire server, during tests for example, send a DELETE request to
-the server. For example:
-
-```
-$ curl -X DELETE http://localhost:4568/
-```
-
-Within SQS, after receiving, messages will be available again automatically
-after a certain time. While this is not implemented (for now at least), you can
-trigger this behavior at at will, with a PUT request.
+## Installation
 
 ```
-$ curl -X PUT http://localhost:4568/
-```
-
-
-### Test Integration
-
-When making integration tests for your app, you can easily include Fake SQS.
-
-Here are the methods you need to run FakeSQS programmatically.
-
-``` ruby
-require "fake_sqs/test_integration"
-
-# globally, before the test suite starts:
-AWS.config(
-  use_ssl:            false,
-  sqs_endpoint:       "localhost",
-  sqs_port:           4568,
-  access_key_id:      "fake access key",
-  secret_access_key:  "fake secret key",
-)
-fake_sqs = FakeSQS::TestIntegration.new
-
-# before each test that requires SQS:
-fake_sqs.start
-
-# at the end of the suite:
-at_exit {
-  fake_sqs.stop
-}
+gem install fakesqs
 ```
 
-By starting it like this it will start when needed, and reset between each test.
-
-Here's an example for RSpec to put in `spec/spec_helper.rb`:
-
-``` ruby
-AWS.config(
-  use_ssl:            false,
-  sqs_endpoint:       "localhost",
-  sqs_port:           4568,
-  access_key_id:      "fake access key",
-  secret_access_key:  "fake secret key",
-)
+## Running
 
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.before(:suite) { $fake_sqs = FakeSQS::TestIntegration.new }
-  config.before(:each, :sqs) { $fake_sqs.start }
-  config.after(:suite) { $fake_sqs.stop }
-end
 ```
-
-Now you can use the `:sqs metadata to enable SQS integration:
-
-``` ruby
-describe "something with sqs", :sqs do
-  it "should work" do
-    queue = AWS::SQS.new.queues.create("my-queue")
-  end
-end
+fakesqs --database /path/to/database.yml
 ```
 
 ## Development
 
-Run all the specs:
-
 ```
-$ rake
+bundle install
+rake
 ```
-
-This will run the unit tests, then the acceptance tests for both types of
-storage (in-memory and on disk).
-
-When debugging an acceptance test, you can run it like this, which will redirect
-output to the console:
-
-```
-$ DEBUG=true SQS_DATABASE=tmp/sqs.yml rspec spec/acceptance
-```
-
-
-  [fake_dynamo]: https://github.com/ananthakumaran/fake_dynamo
-  [aws-sdk]: https://github.com/amazonwebservices/aws-sdk-for-ruby
-  [fake_sns]: https://github.com/yourkarma/fake_sns

data/fake_sqs.gemspec

@@ -8,7 +8,6 @@ Gem::Specification.new do |gem|
   gem.version       = FakeSQS::VERSION
   gem.authors       = ["iain"]
   gem.email         = ["iain@iain.nl"]
-  gem.description   = %q{Provides a fake SQS server that you can run locally to test against}
   gem.summary       = %q{Provides a fake SQS server that you can run locally to test against}
   gem.homepage      = "https://github.com/iain/fake_sqs"
 
@@ -18,15 +17,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
-  gem.add_dependency "sinatra"
-  gem.add_dependency "builder"
-
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "aws-sdk", "~> 2.0"
-  gem.add_development_dependency "faraday"
-  gem.add_development_dependency "thin"
-  gem.add_development_dependency "verbose_hash_fetch"
-  gem.add_development_dependency "activesupport"
+  gem.add_dependency "sinatra", "~> 2.0"
+  gem.add_dependency "builder", "~> 3.2"
 
+  gem.add_development_dependency "rspec", "~> 3.6"
+  gem.add_development_dependency "rake", "~> 12.0"
+  gem.add_development_dependency "rack-test", "~> 0.7"
+  gem.add_development_dependency "aws-sdk", "~> 2.10"
+  gem.add_development_dependency "thin", "~> 1.7"
+  gem.add_development_dependency "verbose_hash_fetch", "~> 0.0"
+  gem.add_development_dependency "activesupport", "~> 5.1"
 end

data/lib/fake_sqs.rb

@@ -9,8 +9,8 @@ require 'fake_sqs/queues'
 require 'fake_sqs/responder'
 require 'fake_sqs/server'
 require 'fake_sqs/version'
-require 'fake_sqs/memory_database'
-require 'fake_sqs/file_database'
+require 'fake_sqs/databases/file'
+require 'fake_sqs/databases/memory'
 
 module FakeSQS
 

data/lib/fake_sqs/actions/change_message_visibility.rb

@@ -3,7 +3,6 @@ module FakeSQS
     class ChangeMessageVisibility
 
       def initialize(options = {})
-        @server    = options.fetch(:server)
         @queues    = options.fetch(:queues)
         @responder = options.fetch(:responder)
       end

data/lib/fake_sqs/actions/change_message_visibility_batch.rb

@@ -0,0 +1,38 @@
+module FakeSQS
+  module Actions
+    class ChangeMessageVisibilityBatch
+
+      def initialize(options = {})
+        @queues = options.fetch(:queues)
+        @responder = options.fetch(:responder)
+      end
+
+      def call(queue, params)
+        keys = params.keys.map do |key|
+          case key
+            when /^ChangeMessageVisibilityBatchRequestEntry\.(\w+)\.Id$/
+              $1
+          end
+        end.compact
+
+        messages = 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)
+          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
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fake_sqs/actions/list_dead_letter_source_queues.rb

@@ -0,0 +1,25 @@
+module FakeSQS
+  module Actions
+    class ListDeadLetterSourceQueues
+
+      def initialize(options = {})
+        @server    = options.fetch(:server)
+        @queues    = options.fetch(:queues)
+        @responder = options.fetch(:responder)
+      end
+
+      def call(name, params)
+        queue_arn = @queues.get(name).arn
+        queue_urls = @queues.list.select do |queue|
+          redrive_policy = queue.attributes.fetch("RedrivePolicy", nil)
+          redrive_policy && redrive_policy =~ /deadLetterTargetArn\":\"#{queue_arn}/
+        end
+        @responder.call :ListDeadLetterSourceQueues do |xml|
+          queue_urls.each do |queue|
+            xml.QueueUrl @server.url_for(queue.name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fake_sqs/actions/receive_message.rb

@@ -10,7 +10,11 @@ module FakeSQS
 
       def call(name, params)
         queue = @queues.get(name)
-        messages = queue.receive_message(params)
+        filtered_attribute_names = []
+        params.select{|k,v | k =~ /AttributeName\.\d+/}.each do |key, value|
+          filtered_attribute_names << value
+        end
+        messages = queue.receive_message(params.merge(queues: @queues))
         @responder.call :ReceiveMessage do |xml|
           messages.each do |receipt, message|
             xml.Message do
@@ -18,11 +22,18 @@ module FakeSQS
               xml.ReceiptHandle receipt
               xml.MD5OfBody message.md5
               xml.Body message.body
+              message.attributes.each do |name, value|
+                if filtered_attribute_names.include?("All") || filtered_attribute_names.include?(name)
+                  xml.Attribute do
+                    xml.Name name
+                    xml.Value value
+                  end
+                end
+              end
             end
           end
         end
       end
-
     end
   end
-end
+end

data/lib/fake_sqs/api.rb

@@ -1,4 +1,5 @@
 require 'fake_sqs/actions/change_message_visibility'
+require 'fake_sqs/actions/change_message_visibility_batch'
 require 'fake_sqs/actions/create_queue'
 require 'fake_sqs/actions/delete_queue'
 require 'fake_sqs/actions/list_queues'
@@ -11,6 +12,7 @@ require 'fake_sqs/actions/purge_queue'
 require 'fake_sqs/actions/send_message_batch'
 require 'fake_sqs/actions/get_queue_attributes'
 require 'fake_sqs/actions/set_queue_attributes'
+require 'fake_sqs/actions/list_dead_letter_source_queues'
 
 module FakeSQS
 

data/lib/fake_sqs/message.rb

@@ -3,19 +3,29 @@ require 'securerandom'
 module FakeSQS
   class Message
 
-    attr_reader :body, :id, :md5
+    attr_reader :body, :id, :md5, :delay_seconds, :approximate_receive_count,
+    :sender_id, :approximate_first_receive_timestamp, :sent_timestamp
     attr_accessor :visibility_timeout
 
     def initialize(options = {})
       @body = options.fetch("MessageBody")
       @id = options.fetch("Id") { SecureRandom.uuid }
       @md5 = options.fetch("MD5") { Digest::MD5.hexdigest(@body) }
+      @sender_id = options.fetch("SenderId") { SecureRandom.uuid.delete('-').upcase[0...21] }
+      @approximate_receive_count = 0
+      @sent_timestamp = Time.now.to_i * 1000
+      @delay_seconds = options.fetch("DelaySeconds", 0).to_i
     end
 
     def expire!
       self.visibility_timeout = nil
     end
 
+    def receive!
+      @approximate_first_receive_timestamp ||= Time.now.to_i * 1000
+      @approximate_receive_count += 1
+    end
+
     def expired?( limit = Time.now )
       self.visibility_timeout.nil? || self.visibility_timeout < limit
     end
@@ -24,11 +34,21 @@ module FakeSQS
       self.visibility_timeout = Time.now + seconds
     end
 
+    def published?
+      if self.delay_seconds && self.delay_seconds > 0
+        elapsed_seconds = Time.now.to_i - (self.sent_timestamp.to_i / 1000)
+        elapsed_seconds >= self.delay_seconds
+      else
+        true
+      end
+    end
+
     def attributes
       {
-        "MessageBody" => body,
-        "Id" => id,
-        "MD5" => md5,
+        "SenderId" => sender_id,
+        "ApproximateFirstReceiveTimestamp" => approximate_first_receive_timestamp,
+        "ApproximateReceiveCount"=> approximate_receive_count,
+        "SentTimestamp"=> sent_timestamp
       }
     end
 

data/lib/fake_sqs/queue.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
 require 'fake_sqs/collection_view'
-
+require 'json'
 module FakeSQS
 
   MessageNotInflight = Class.new(RuntimeError)
@@ -38,14 +38,14 @@ module FakeSQS
     def attributes
       queue_attributes.merge(
         "QueueArn" => arn,
-        "ApproximateNumberOfMessages" => @messages.size,
+        "ApproximateNumberOfMessages" => published_size,
         "ApproximateNumberOfMessagesNotVisible" => @messages_in_flight.size,
       )
     end
 
     def send_message(options = {})
       with_lock do
-        message = message_factory.new(options)
+        message = options.fetch(:message){ message_factory.new(options) }
         @messages << message
         message
       end
@@ -53,6 +53,7 @@ module FakeSQS
 
     def receive_message(options = {})
       amount = Integer options.fetch("MaxNumberOfMessages") { "1" }
+      visibility_timeout = Integer options.fetch("VisibilityTimeout") { default_visibility_timeout }
 
       fail ReadCountOutOfRange, amount if amount > 10
 
@@ -61,14 +62,19 @@ module FakeSQS
       result = {}
 
       with_lock do
-        actual_amount = amount > size ? size : amount
+        actual_amount = amount > published_size ? published_size : amount
+        published_messages = @messages.select { |m| m.published? }
 
         actual_amount.times do
-          message = @messages.delete_at(rand(size))
-          message.expire_at(default_visibility_timeout)
-          receipt = generate_receipt
-          @messages_in_flight[receipt] = message
-          result[receipt] = message
+          message = published_messages.delete_at(rand(published_size))
+          @messages.delete(message)
+          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
+          end
         end
       end
 
@@ -111,7 +117,17 @@ module FakeSQS
         else
           message.expire_at(visibility)
         end
+      end
+    end
 
+    def check_message_for_dlq(message, options={})
+      if redrive_policy = queue_attributes["RedrivePolicy"] && JSON.parse(queue_attributes["RedrivePolicy"])
+        dlq = options[:queues].list.find{|queue| queue.arn == redrive_policy["deadLetterTargetArn"]}
+        if dlq && message.approximate_receive_count >= redrive_policy["maxReceiveCount"].to_i
+          dlq.send_message(message: message)
+          message.expire!
+          true
+        end
       end
     end
 
@@ -155,6 +171,10 @@ module FakeSQS
       messages.size
     end
 
+    def published_size
+      messages.select { |m| m.published? }.size
+    end
+
     def generate_receipt
       SecureRandom.hex
     end

data/lib/fake_sqs/test_integration.rb

@@ -55,7 +55,7 @@ module FakeSQS
     end
 
     def up?
-      @pid && connection.get("/").code.to_s == "200"
+      @pid && connection.get("/ping").code.to_s == "200"
     rescue Errno::ECONNREFUSED
       false
     end

data/lib/fake_sqs/version.rb

@@ -1,3 +1,3 @@
 module FakeSQS
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/fake_sqs/web_interface.rb

@@ -1,21 +1,27 @@
 require 'sinatra/base'
+require 'fake_sqs/catch_errors'
+require 'fake_sqs/error_response'
 
 module FakeSQS
   class WebInterface < Sinatra::Base
 
+    def self.handle(path, verbs, &block)
+      verbs.each do |verb|
+        send(verb, path, &block)
+      end
+    end
+
     configure do
       use FakeSQS::CatchErrors, response: ErrorResponse
     end
 
     helpers do
-
       def action
         params.fetch("Action")
       end
-
     end
 
-    get "/" do
+    get "/ping" do
       200
     end
 
@@ -29,7 +35,7 @@ module FakeSQS
       200
     end
 
-    post "/" do
+    handle "/", [:get, :post] do
       params['logger'] = logger
       if params['QueueUrl']
         queue = URI.parse(params['QueueUrl']).path.gsub(/\//, '')
@@ -39,9 +45,8 @@ module FakeSQS
       settings.api.call(action, params)
     end
 
-    post "/:queue" do |queue|
+    handle "/:queue", [:get, :post] do |queue|
       settings.api.call(action, queue, params)
     end
-
   end
 end

data/spec/acceptance/message_actions_spec.rb

@@ -35,14 +35,55 @@ RSpec.describe "Actions for Messages", :sqs do
     )
 
     response = sqs.receive_message(
-      queue_url: queue_url,
+      queue_url: queue_url
     )
 
     expect(response.messages.size).to eq 1
-
     expect(response.messages.first.body).to eq body
   end
 
+  specify "ReceiveMessage with attribute_names parameters" do
+    body = "test 123"
+
+    sqs.send_message(
+      queue_url: queue_url,
+      message_body: body
+    )
+
+    sent_time = Time.now.to_i * 1000
+
+    response = sqs.receive_message(
+      queue_url: queue_url,
+      attribute_names: ["All"]
+    )
+
+    received_time = Time.now.to_i * 1000
+
+    expect(response.messages.first.attributes.reject{|k,v| k == "SenderId"}).to eq({
+      "SentTimestamp" => sent_time.to_s,
+      "ApproximateReceiveCount" => "1",
+      "ApproximateFirstReceiveTimestamp" => received_time.to_s
+    })
+    expect(response.messages.first.attributes["SenderId"]).to be_kind_of(String)
+    expire_message(response.messages.first)
+
+    response = sqs.receive_message(
+      queue_url: queue_url
+    )
+    expect(response.messages.first.attributes).to eq({})
+    expire_message(response.messages.first)
+
+    response = sqs.receive_message(
+      queue_url: queue_url,
+      attribute_names: ["SentTimestamp", "ApproximateReceiveCount", "ApproximateFirstReceiveTimestamp"]
+    )
+    expect(response.messages.first.attributes).to eq({
+      "SentTimestamp" => sent_time.to_s,
+      "ApproximateReceiveCount" => "3",
+      "ApproximateFirstReceiveTimestamp" => received_time.to_s
+    })
+  end
+
   specify "DeleteMessage" do
     sqs.send_message(
       queue_url: queue_url,
@@ -121,6 +162,26 @@ RSpec.describe "Actions for Messages", :sqs do
     expect(response.messages.size).to eq 0
   end
 
+  specify "DeleteQueue" do
+    sqs.send_message(
+      queue_url: queue_url,
+      message_body: "test1"
+    )
+
+    response = sqs.receive_message(
+      queue_url: queue_url,
+    )
+    expect(response.messages.size).to eq 1
+
+    sqs.delete_queue(queue_url: queue_url)
+    sqs.create_queue(queue_name: QUEUE_NAME)
+
+    response = sqs.receive_message(
+      queue_url: queue_url,
+    )
+    expect(response.messages.size).to eq 0
+  end
+
   specify "SendMessageBatch" do
     bodies = %w(a b c)
 
@@ -169,7 +230,6 @@ RSpec.describe "Actions for Messages", :sqs do
   end
 
   specify 'set message timeout and wait for message to come' do
-
     body = 'some-sample-message'
 
     sqs.send_message(
@@ -193,7 +253,9 @@ RSpec.describe "Actions for Messages", :sqs do
     )
     expect(nothing.messages.size).to eq 0
 
-    sleep(5)
+    # 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)
 
     same_message = sqs.receive_message(
       queue_url: queue_url,
@@ -228,8 +290,85 @@ RSpec.describe "Actions for Messages", :sqs do
     }.to raise_error(Aws::SQS::Errors::MessageNotInflight)
   end
 
+  specify 'ChangeMessageVisibilityBatch' do
+    bodies = (1..10).map { |n| n.to_s }
+    sqs.send_message_batch(
+      queue_url: queue_url,
+      entries: bodies.map { |bd|
+        {
+          id: SecureRandom.uuid,
+          message_body: bd,
+        }
+      }
+    )
+    message = sqs.receive_message(
+      queue_url: queue_url,
+      max_number_of_messages: 10,
+      visibility_timeout: 0,
+    )
+
+    expect(message.messages.size).to eq(10)
+
+    sqs.change_message_visibility_batch(
+      queue_url: queue_url,
+      entries: message.messages.map { |m|
+        {
+          id: m.message_id,
+          receipt_handle: m.receipt_handle,
+          visibility_timeout: 10,
+        }
+      }
+    )
+
+    message = sqs.receive_message(
+      queue_url: queue_url,
+      max_number_of_messages: 10,
+    )
+
+    expect(message.messages.size).to eq(0)
+  end
+
+  specify 'should be moved to configured DLQ after maxReceiveCount if RedrivePolicy is set' do
+    dlq_queue_url = sqs.create_queue(queue_name: "TestSourceQueueDLQ").queue_url
+
+    dlq_arn = sqs.get_queue_attributes(queue_url: dlq_queue_url).attributes.fetch("QueueArn")
+    sqs.set_queue_attributes(
+      queue_url: queue_url,
+      attributes: {
+        "RedrivePolicy" => "{\"deadLetterTargetArn\":\"#{dlq_arn}\",\"maxReceiveCount\":2}"
+      }
+    )
+
+    message_id = sqs.send_message(
+      queue_url: queue_url,
+      message_body: "test",
+    ).message_id
+
+
+    2.times do
+      message = sqs.receive_message(queue_url: queue_url)
+      expect(message.messages.size).to eq(1)
+      expect(message.messages.first.message_id).to eq(message_id)
+      expire_message(message.messages.first)
+    end
+
+    expect(sqs.receive_message(queue_url: queue_url).messages.size).to eq(0)
+
+    message = sqs.receive_message(queue_url: dlq_queue_url)
+    expect(message.messages.size).to eq(1)
+    expect(message.messages.first.message_id).to eq(message_id)
+  end
+
   def let_messages_in_flight_expire
     $fake_sqs.expire
   end
 
+  def expire_message(message)
+    sqs.change_message_visibility(
+      queue_url: queue_url,
+      receipt_handle: message.receipt_handle,
+      visibility_timeout: 0
+    )
+  end
+
 end

data/spec/acceptance/queue_actions_spec.rb

@@ -39,6 +39,22 @@ RSpec.describe "Actions for Queues", :sqs do
     ]
   end
 
+  specify "ListDeadLetterSourceQueues" do
+    dlq_queue_url = sqs.create_queue(queue_name: "source-list-DLQ").queue_url
+    dlq_arn = sqs.get_queue_attributes(queue_url: dlq_queue_url).attributes.fetch("QueueArn")
+    source_queue_urls = []
+    2.times do |time|
+      queue_url = sqs.create_queue(queue_name: "source-list-#{time}").queue_url
+      sqs.set_queue_attributes(queue_url: queue_url, 
+        attributes: {
+          "RedrivePolicy" => "{\"deadLetterTargetArn\":\"#{dlq_arn}\",\"maxReceiveCount\":10}"
+        }
+      )
+       source_queue_urls << queue_url
+    end
+    expect(sqs.list_dead_letter_source_queues(queue_url: dlq_queue_url).queue_urls).to eq source_queue_urls
+  end
+
   specify "DeleteQueue" do
     url = sqs.create_queue(queue_name: "test-delete").queue_url
     expect(sqs.list_queues.queue_urls.size).to eq 1

data/spec/integration_spec_helper.rb

@@ -1,13 +1,6 @@
 require "aws-sdk"
 require "fake_sqs/test_integration"
 
-# Aws.config[:credentials] = {
-#   :use_ssl           => false,
-#   :sqs_endpoint      => "localhost",
-#   :sqs_port          => 4568,
-#   :access_key_id     => "fake access key",
-#   :secret_access_key => "fake secret key",
-# }
 Aws.config.update(
   region: "us-east-1",
   credentials: Aws::Credentials.new("fake", "fake"),

data/spec/unit/message_spec.rb

@@ -29,6 +29,15 @@ RSpec.describe FakeSQS::Message do
 
   end
 
+  describe "#delay_seconds" do
+
+    it "is generated" do
+      message = create_message({"DelaySeconds" => 10})
+      expect(message.delay_seconds).to eq 10
+    end
+
+  end
+
   describe 'visibility_timeout' do
 
     let :message do

data/spec/unit/queue_spec.rb

@@ -32,6 +32,15 @@ RSpec.describe FakeSQS::Queue do
       send_message(options)
     end
 
+    it "should set the message's SentTimestamp attribute" do
+      expect(send_message.attributes["SentTimestamp"]).to eq (Time.now.to_i * 1000)
+    end
+
+    it "should set the SenderId of the sender" do
+      sender_id = send_message.attributes["SenderId"]
+      expect(sender_id).to be_a String
+      expect(sender_id.length).to eq 21
+    end
   end
 
   describe "#receive_message" do
@@ -42,6 +51,17 @@ RSpec.describe FakeSQS::Queue do
       expect(received.values.first).to eq sent
     end
 
+    it "gets the message with 'DelaySeconds' option" do
+      delay_seconds = 3
+      sent = send_message({ "DelaySeconds" => delay_seconds })
+      received = receive_message
+      expect(received.values.first).to be_nil
+
+      allow(Time).to receive(:now).and_return(Time.now + delay_seconds)
+      received = receive_message
+      expect(received.values.first).to eq sent
+    end
+
     it "gets you a random message" do
       indexes = { :first => 0, :second => 0 }
       sample_group = 1_000
@@ -116,6 +136,25 @@ RSpec.describe FakeSQS::Queue do
       expect(receive_message).to eq({})
     end
 
+    it "should increment the ApproximateReceiveCount" do
+      sent_message = send_message
+      expect(sent_message.attributes["ApproximateReceiveCount"]).to eq 0
+      queue.change_message_visibility(receive_message.keys.first, 0)
+      expect(sent_message.attributes["ApproximateReceiveCount"]).to eq 1
+      receive_message
+      expect(sent_message.attributes["ApproximateReceiveCount"]).to eq 2
+    end
+
+    it "should set the ApproximateFirstReceiveTimestamp only when the message is first received" do
+      sent_message = send_message
+      expect(sent_message.attributes["ApproximateFirstReceiveTimestamp"]).to eq nil
+      receive_time = (Time.now.to_i * 1000)
+      queue.change_message_visibility(receive_message.keys.first, 0)
+      expect(sent_message.attributes["ApproximateFirstReceiveTimestamp"]).to eq receive_time
+      sleep 1
+      receive_message
+      expect(sent_message.attributes["ApproximateFirstReceiveTimestamp"]).to eq receive_time
+    end
   end
 
   describe "#delete_message" do

data/spec/unit/queues_spec.rb

@@ -1,5 +1,5 @@
 require 'fake_sqs/queues'
-require 'fake_sqs/memory_database'
+require 'fake_sqs/databases/memory'
 
 RSpec.describe FakeSQS::Queues do
 

data/spec/unit/web_interface_spec.rb

@@ -0,0 +1,15 @@
+require 'fake_sqs/web_interface'
+require 'rack/test'
+
+RSpec.describe FakeSQS::WebInterface do
+  include Rack::Test::Methods
+
+  def app
+    FakeSQS::WebInterface
+  end
+
+  it "responds to GET /ping" do
+    get "/ping"
+    expect(last_response).to be_ok
+  end
+end

metadata

@@ -1,142 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: fake_sqs
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-02 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: verbose_hash_fetch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Provides a fake SQS server that you can run locally to test against
+        version: '5.1'
+description: 
 email:
 - iain@iain.nl
 executables:
@@ -148,19 +148,21 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- MIT-LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - bin/fake_sqs
 - fake_sqs.gemspec
 - lib/fake_sqs.rb
 - lib/fake_sqs/actions/change_message_visibility.rb
+- lib/fake_sqs/actions/change_message_visibility_batch.rb
 - lib/fake_sqs/actions/create_queue.rb
 - lib/fake_sqs/actions/delete_message.rb
 - lib/fake_sqs/actions/delete_message_batch.rb
 - lib/fake_sqs/actions/delete_queue.rb
 - lib/fake_sqs/actions/get_queue_attributes.rb
 - lib/fake_sqs/actions/get_queue_url.rb
+- lib/fake_sqs/actions/list_dead_letter_source_queues.rb
 - lib/fake_sqs/actions/list_queues.rb
 - lib/fake_sqs/actions/purge_queue.rb
 - lib/fake_sqs/actions/receive_message.rb
@@ -171,10 +173,10 @@ files:
 - lib/fake_sqs/catch_errors.rb
 - lib/fake_sqs/collection_view.rb
 - lib/fake_sqs/daemonize.rb
+- lib/fake_sqs/databases/file.rb
+- lib/fake_sqs/databases/memory.rb
 - lib/fake_sqs/error_response.rb
 - lib/fake_sqs/error_responses.yml
-- lib/fake_sqs/file_database.rb
-- lib/fake_sqs/memory_database.rb
 - lib/fake_sqs/message.rb
 - lib/fake_sqs/queue.rb
 - lib/fake_sqs/queue_factory.rb
@@ -199,6 +201,7 @@ files:
 - spec/unit/queues_spec.rb
 - spec/unit/responder_spec.rb
 - spec/unit/show_output_spec.rb
+- spec/unit/web_interface_spec.rb
 homepage: https://github.com/iain/fake_sqs
 licenses:
 - MIT
@@ -219,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides a fake SQS server that you can run locally to test against
@@ -238,4 +241,4 @@ test_files:
 - spec/unit/queues_spec.rb
 - spec/unit/responder_spec.rb
 - spec/unit/show_output_spec.rb
-has_rdoc: 
+- spec/unit/web_interface_spec.rb

data/MIT-LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2012 iain
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.