propono 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ff92b911ef9f4ae48012a57710e6dc36f4afa7
-  data.tar.gz: da17719ba6d0d5b9914892e36156af76888df5e0
+  metadata.gz: ebd5041633b366a91b045b834a08db2bcb2df8e4
+  data.tar.gz: c09df86c5c5de0b9d4322bf91ed28c894217231e
 SHA512:
-  metadata.gz: 4188aeee17c98854395491b0453b5f51161209473f9ccc9a2692e499f529ba19d5eaa777ecb874ad1b8b5b61057110b0e8cfc940c0cd9c8ec9f9da67a42f7eeb
-  data.tar.gz: 01ab6936c889bf091dac35b44a3bee9351a597f4ddc1fd5cb378b752027c926e86461dc66bf0a434022e4e86f9a0b4f7938635d0d56027e32ca09ccd5f522db0
+  metadata.gz: 441f02bdbe0d8cca77f73405330bccf7fdb3e3c1f304fb45c274bc84e95c892030042127a304720b86ec703b6c4ca2319e529567b339096a648b25880f8a33c2
+  data.tar.gz: 438ac5c85ccfba9774141eba4e9ad42b405e47d0adec8bb033f0415aa19551f36e6326c46df58deb871170a4ce6feb1866cefdd8bb409ea6ecd8a7fce7a5dd95

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.5.0 / 2015-03-16
+* [BUGFIX] Fix inability to use queue if the message visibility timeout has changed.
+
 # 1.4.0 / 2014-07-12
 * [FEATURE] Move symbolize_keys to Propono namespace to avoid ActiveSupport conflict (:blue_heart: @tardate)
 * [BUGFIX] Drain integration tests drain queues before starting (:blue_heart: @tardate)

data/lib/propono/services/queue_creator.rb

@@ -14,9 +14,15 @@ module Propono
     end
 
     def find_or_create
-      result = sqs.create_queue(@name)
-      body = result.body
-      url = body.fetch('QueueUrl') { raise QueueCreatorError.new("No QueueUrl returned from SQS") }
+      urls = sqs.list_queues("QueueNamePrefix" => @name).body["QueueUrls"]
+      url = urls.select{|x|x =~ /#{@name}$/}.first
+
+      unless url
+        result = sqs.create_queue(@name)
+        body = result.body
+        url = body.fetch('QueueUrl') { raise QueueCreatorError.new("No QueueUrl returned from SQS") }
+      end
+
       Queue.new(url)
     end
   end

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/components/queue_subscription_test.rb

@@ -31,7 +31,7 @@ module Propono
 
       queue_name = subscription.send(:queue_name)
 
-      sqs = mock()
+      sqs = Fog::AWS::SQS::Mock.new
       sqs.expects(:create_queue).with(queue_name).returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
       sqs.expects(:create_queue).with(queue_name + '-failed').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
       sqs.expects(:create_queue).with(queue_name + '-corrupt').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))

data/test/services/queue_creator_test.rb

@@ -3,8 +3,26 @@ require File.expand_path('../../test_helper', __FILE__)
 module Propono
   class QueueCreatorTest < Minitest::Test
 
-    def test_create_topic_called_on_sqs
-      sqs = mock()
+    def test_finds_existing_url
+      name = "foobar"
+      url = "http://#{name}"
+      sqs = Fog::AWS::SQS::Mock.new
+      sqs.stubs(:list_queues)
+      sqs.expects(:list_queues).
+        with("QueueNamePrefix" => "#{name}").
+        returns(
+          mock(body: { "QueueUrls" => [url]})
+        )
+
+      creator = QueueCreator.new(name)
+      creator.stubs(sqs: sqs)
+
+      queue = creator.find_or_create
+      assert_equal url, queue.url
+    end
+
+    def test_create_queue_called_on_sqs
+      sqs = Fog::AWS::SQS::Mock.new
       sqs.expects(:create_queue).with("foobar").returns(mock(body: { "QueueUrl" => "Foobar"}))
 
       creator = QueueCreator.new("foobar")
@@ -16,7 +34,8 @@ module Propono
     def test_returns_url
       url = "malcs_happy_queue"
       result = mock(body: { "QueueUrl" => url})
-      sqs = mock(create_queue: result)
+      sqs = Fog::AWS::SQS::Mock.new
+      sqs.expects(create_queue: result)
 
       creator = QueueCreator.new("foobar")
       creator.stubs(sqs: sqs)
@@ -27,7 +46,8 @@ module Propono
 
     def test_should_raise_exception_if_no_queue_returned
       result = mock(body: {})
-      sqs = mock(create_queue: result)
+      sqs = Fog::AWS::SQS::Mock.new
+      sqs.expects(create_queue: result)
 
       creator = QueueCreator.new("foobar")
       creator.stubs(sqs: sqs)

data/test/test_helper.rb

@@ -46,6 +46,15 @@ class Fog::AWS::SNS::Mock
 end
 
 class Fog::AWS::SQS::Mock
+  def list_queues(*args)
+    foo = Object.new
+    class << foo
+      def body
+        {"QueueUrls" => []}
+      end
+    end
+    foo
+  end
   def create_queue(*args)
   end
   def set_queue_attributes(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog