fake_sqs 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '063098d4ed74f09793d0bde5c6fb857256893bec'
-  data.tar.gz: 7ae4304c0a2d4d2a55c579730641d13a86a0656b
+  metadata.gz: fc20ac34a0c6c8147c3af9692169ae145b7d2e9c
+  data.tar.gz: 2964e38cee5d603014a322e514cfa63989cf66a8
 SHA512:
-  metadata.gz: 9b19a220db375f3b500ede5450c91b51d9a4023e19253f0fe3f842867c25335d0a9977b176ad1589bd0d24f5d1e62d597ea70e9a584b624008f27ba246a48ddf
-  data.tar.gz: 5ef566736e06d3ebe61e43e7c2b680df2e59a008a253a0b71776ed534bb8921bea6affa5460da71a87b022f563df96be65b6c957b1ddcf0df8867bfd76376892
+  metadata.gz: 8bafd8828d1f473c9a881d4c00a07f9e447bc6153869adbad17ae2d60fb97f5c248558122830ed66635f48b563c5eebb7fd4ce37eba7bc66ea95b6036e8fe6c0
+  data.tar.gz: e1ec826376dfb67c9f1f910903bf6852e66b73f2821014fe11e773aed50cea51251eed804d69ca99ea24cac3c8515786cf0932edc4cb0187314d7d0e2cb069fa

data/fake_sqs.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.license       = "MIT"
 
+
+  gem.add_dependency "rack", "~> 2.0"
   gem.add_dependency "sinatra", "~> 2.0"
   gem.add_dependency "builder", "~> 3.2"
 

data/lib/fake_sqs/actions/create_queue.rb

@@ -6,13 +6,14 @@ module FakeSQS
         @server    = options.fetch(:server)
         @queues    = options.fetch(:queues)
         @responder = options.fetch(:responder)
+        @request   = options.fetch(:request)
       end
 
       def call(params)
         name = params.fetch("QueueName")
         queue = @queues.create(name, params)
         @responder.call :CreateQueue do |xml|
-          xml.QueueUrl @server.url_for(queue.name)
+          xml.QueueUrl @server.url_for(queue.name, {:host => @request.host, :port => @request.port})
         end
       end
 

data/lib/fake_sqs/actions/get_queue_url.rb

@@ -6,13 +6,14 @@ module FakeSQS
         @server    = options.fetch(:server)
         @queues    = options.fetch(:queues)
         @responder = options.fetch(:responder)
+        @request   = options.fetch(:request)
       end
 
       def call(params)
         name = params.fetch("QueueName")
         queue = @queues.get(name, params)
         @responder.call :GetQueueUrl do |xml|
-          xml.QueueUrl @server.url_for(queue.name)
+          xml.QueueUrl @server.url_for(queue.name, {:host => @request.host, :port => @request.port})
         end
       end
 

data/lib/fake_sqs/actions/list_queues.rb

@@ -6,13 +6,14 @@ module FakeSQS
         @server    = options.fetch(:server)
         @queues    = options.fetch(:queues)
         @responder = options.fetch(:responder)
+        @request   = options.fetch(:request)
       end
 
       def call(params)
         found = @queues.list(params)
         @responder.call :ListQueues do |xml|
           found.each do |queue|
-            xml.QueueUrl @server.url_for(queue.name)
+            xml.QueueUrl @server.url_for(queue.name, {:host => @request.host, :port => @request.port})
           end
         end
       end

data/lib/fake_sqs/api.rb

@@ -34,9 +34,9 @@ module FakeSQS
       end
     end
 
-    def call(action, *args)
+    def call(action, request, *args)
       if FakeSQS::Actions.const_defined?(action)
-        action = FakeSQS::Actions.const_get(action).new(options)
+        action = FakeSQS::Actions.const_get(action).new(options.merge({:request => request}))
         queues.transaction do
           action.call(*args)
         end

data/lib/fake_sqs/error_response.rb

@@ -16,7 +16,7 @@ module FakeSQS
     end
 
     def body
-      xml = Builder::XmlMarkup.new(:index => 4)
+      xml = Builder::XmlMarkup.new()
       xml.ErrorResponse do
         xml.Error do
           xml.Type type

data/lib/fake_sqs/error_responses.yml

@@ -24,7 +24,6 @@ NoSuchVersion: 400
 NonExistentQueue: 400
 NotAuthorizedToUseVersion: 401
 QueueDeletedRecently: 400
-QueueNameExists: 400
 ReadCountOutOfRange: 400
 ReceiptHandleIsInvalid: 400
 RequestExpired: 400

data/lib/fake_sqs/queue.rb

@@ -1,3 +1,4 @@
+require 'monitor'
 require 'securerandom'
 require 'fake_sqs/collection_view'
 require 'json'

data/lib/fake_sqs/queues.rb

@@ -1,6 +1,5 @@
 module FakeSQS
 
-  QueueNameExists  = Class.new(RuntimeError)
   NonExistentQueue = Class.new(RuntimeError)
 
   class Queues

data/lib/fake_sqs/responder.rb

@@ -5,7 +5,7 @@ module FakeSQS
   class Responder
 
     def call(name, &block)
-      xml = Builder::XmlMarkup.new(:indent => 4)
+      xml = Builder::XmlMarkup.new()
       xml.tag! "#{name}Response" do
         if block
           xml.tag! "#{name}Result" do

data/lib/fake_sqs/server.rb

@@ -8,7 +8,10 @@ module FakeSQS
       @port = options.fetch(:port)
     end
 
-    def url_for(queue_id)
+    def url_for(queue_id, options = {})
+      host = options[:host] || @host
+      port = options[:port] || @port
+
       "http://#{host}:#{port}/#{queue_id}"
     end
 

data/lib/fake_sqs/test_integration.rb

@@ -25,7 +25,7 @@ module FakeSQS
     def start!
       args = [ binfile, "-p", port.to_s, verbose, logging, "--database", database, { :out => out, :err => out } ].flatten.compact
       @pid = Process.spawn(*args)
-      wait_until_up
+      wait_until_up(Time.now + start_timeout)
     end
 
     def stop
@@ -70,6 +70,10 @@ module FakeSQS
       options.fetch(:database)
     end
 
+    def start_timeout
+      options[:start_timeout] || 2
+    end
+
     def verbose
       if debug?
         "--verbose"
@@ -86,10 +90,10 @@ module FakeSQS
       end
     end
 
-    def wait_until_up(deadline = Time.now + 2)
+    def wait_until_up(deadline)
       fail "FakeSQS didn't start in time" if Time.now > deadline
       unless up?
-        sleep 0.01
+        sleep 0.1
         wait_until_up(deadline)
       end
     end

data/lib/fake_sqs/version.rb

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

data/lib/fake_sqs/web_interface.rb

@@ -36,17 +36,16 @@ module FakeSQS
     end
 
     handle "/", [:get, :post] do
-      params['logger'] = logger
       if params['QueueUrl']
         queue = URI.parse(params['QueueUrl']).path.gsub(/\//, '')
-        return settings.api.call(action, queue, params) unless queue.empty?
+        return settings.api.call(action, request, queue, params) unless queue.empty?
       end
 
-      settings.api.call(action, params)
+      settings.api.call(action, request, params)
     end
 
     handle "/:queue", [:get, :post] do |queue|
-      settings.api.call(action, queue, params)
+      settings.api.call(action, request, queue, params)
     end
   end
 end

data/spec/integration_spec_helper.rb

@@ -11,8 +11,9 @@ puts "\n\e[34mRunning specs with database \e[33m#{db}\e[0m"
 
 $fake_sqs = FakeSQS::TestIntegration.new(
   database: db,
-  sqs_endpoint: "localhost",
+  sqs_endpoint: "0.0.0.0",
   sqs_port: 4568,
+  start_timeout: 2,
 )
 
 RSpec.configure do |config|

data/spec/unit/api_spec.rb

@@ -19,9 +19,9 @@ RSpec.describe FakeSQS::API do
     allow(queues).to receive(:transaction).and_yield
     api = FakeSQS::API.new(:queues => queues)
 
-    response = api.call("TheAction", {:foo => "bar"})
+    response = api.call("TheAction", {}, {:foo => "bar"})
 
-    expect(response[:options]).to eq :queues => queues
+    expect(response[:options]).to eq :queues => queues, :request => {}
     expect(response[:params]).to eq :foo => "bar"
   end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fake_sqs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement