propono 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e24f186302b02c6e3a2896ab707fbbcc2cd6b447
-  data.tar.gz: 813ea1ee8356ae861fc0f5b77f84eb08b5497b26
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTg5ZWEwODk0YTc2YWVmNDA4NTAxMDMwMjM2M2ZhNWI0NGFjMmFjMg==
+  data.tar.gz: !binary |-
+    NjhlZjgyNDhlMTNmYWI2ODdjZTc5OTcyNmZlMzdiYmQ2M2NmZmVjMg==
 SHA512:
-  metadata.gz: 28b340921d2d6681824f219864f1875c9f3136670ea869aa621a8a3a5d23326a4fcac618abb39e1313b8075497906a95fa7d5da573839f01766b82436019f1b7
-  data.tar.gz: 0adc3c6ef53887926106b62c60ca6a4fd0800a5519ffd48bd9ea792ecc0320404d37d679668955d81fdb5e0d50e9760369e5074b35c864d4c64447d18136b974
+  metadata.gz: !binary |-
+    YTlmNzBhNGQ0NGM3OTMyMzZmMmRiYWVkNTZjMTRjZDRhM2MwY2VkZjdhZGZl
+    ODU0MDJlNDk4MjE2YmQ4MTA4ZmRmOTEwNGFlZjJlZDE4OWIyOGZmYzlkODhl
+    NGE5YzY0NTg5YThkZTM1NjQ0MjRjNTQ3NTViZjY4YzMzOTQ5YjE=
+  data.tar.gz: !binary |-
+    OWEyZWZjNDRjYzdjNTExYTk5NzI1M2U0NmI3OTdiYmI3ZGU0MmFiOThmZGVj
+    MmNlODQyZDNiMWFhZDQwNjljOGEwZjJiOWIzZGY5Njc2Y2JkZDY0NDc0ODE0
+    NWM1N2E0YWQzOWFlY2U5N2QwNTg4MmJkZmZlMDliYzQyYWM5NGM=

data/lib/propono/components/queue_subscription.rb

@@ -20,7 +20,7 @@ module Propono
       @topic = TopicCreator.find_or_create(@topic_id)
       @queue = QueueCreator.find_or_create(queue_name)
       sns.subscribe(@topic.arn, @queue.arn, 'sqs')
-      sqs.set_queue_attributes(@queue.url, "Policy", policy)
+      sqs.set_queue_attributes(@queue.url, "Policy", generate_policy)
     end
 
     def queue_name
@@ -33,28 +33,23 @@ module Propono
       Configuration.instance
     end
 
-    def policy
+    def generate_policy
       <<-EOS
-      {
-        "Version": "2008-10-17",
-        "Id": "arn:aws:sqs:eu-west-1:950417255687:manual_queue/SQSDefaultPolicy",
-        "Statement": [
-          {
-            "Sid": "Sid1382106399628",
-            "Effect": "Allow",
-            "Principal": {
-              "AWS": "*"
-            },
-            "Action": "SQS:SendMessage",
-            "Resource": "arn:aws:sqs:eu-west-1:950417255687:manual_queue",
-            "Condition": {
-              "ArnEquals": {
-                "aws:SourceArn": "arn:aws:sns:eu-west-1:950417255687:metrics"
-              }
-            }
-          }
-        ]
-      }
+{
+  "Version": "2008-10-17",
+  "Id": "#{@queue.arn}/SQSDefaultPolicy",
+  "Statement": [
+    {
+      "Sid": "#{@queue.arn}-Sid",
+      "Effect": "Allow",
+      "Principal": {
+        "AWS": "*"
+      },
+      "Action": "SQS:*",
+      "Resource": "#{@queue.arn}"
+    }
+  ]
+}
       EOS
     end
   end

data/lib/propono/services/queue_listener.rb

@@ -32,12 +32,13 @@ module Propono
       end
     rescue
       config.logger.puts "Unexpected error reading from queue #{queue_url}"
+      config.logger.puts $!
     end
 
     def process_messages(messages)
       messages.each do |message|
         @message_processor.call(message)
-        sqs.delete_message(message['ReceiptHandle'])
+        sqs.delete_message(queue_url, message['ReceiptHandle'])
       end
       true
     end

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/test/queue_listener_test.rb

@@ -35,11 +35,14 @@ module Propono
       sqs = mock()
       sqs.stubs(receive_message: message_response)
 
-      sqs.expects(:delete_message).with(@receipt_handle1)
-      sqs.expects(:delete_message).with(@receipt_handle2)
+      queue_url = "test-queue-url"
+
+      sqs.expects(:delete_message).with(queue_url,@receipt_handle1)
+      sqs.expects(:delete_message).with(queue_url,@receipt_handle2)
 
       queue_listener = QueueListener.new(@topic_id) { }
       queue_listener.stubs(sqs: sqs)
+      queue_listener.stubs(queue_url: queue_url)
 
       queue_listener.send(:read_messages)
     end
@@ -88,7 +91,7 @@ module Propono
       out, err = capture_io do
         queue_listener.send(:read_messages)
       end
-      assert_equal "Unexpected error reading from queue http://example.com\n", err
+      assert_equal "Unexpected error reading from queue http://example.com\nStandardError\n", err
     end
 
     def test_exception_from_sqs_returns_false

data/test/queue_subscription_test.rb

@@ -64,7 +64,7 @@ module Propono
       sqs.expects(:set_queue_attributes).with(Fog::AWS::SQS::Mock::QueueUrl, "Policy", policy)
       subscription = QueueSubscription.new("Some topic")
       subscription.stubs(sqs: sqs)
-      subscription.stubs(policy: policy)
+      subscription.stubs(generate_policy: policy)
       subscription.create
     end
 
@@ -76,5 +76,9 @@ module Propono
       subscription.create
       assert_equal queue, subscription.queue
     end
+
+    def test_generate_policy
+      skip"TODO - Implement this test."
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - MalcyL
@@ -43,28 +43,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -137,12 +137,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []