propono 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTA1OTNkMDY5NmY4YzRjNDAxYjRiOGJiMWFhNGM0NzRkMmFkYTY5OQ==
-  data.tar.gz: !binary |-
-    NjY0MDAzODFkZmEyMDAzYWI3ZDQwYmQyMWE4ZTEyNWUwYTlmYjc3OQ==
+SHA1:
+  metadata.gz: e24f186302b02c6e3a2896ab707fbbcc2cd6b447
+  data.tar.gz: 813ea1ee8356ae861fc0f5b77f84eb08b5497b26
 SHA512:
-  metadata.gz: !binary |-
-    ZDM2MzM5ZWUxZGIxODMyMGRiZjBjNmRjZjI1NDg0MTM2Y2I2M2ZhY2U2NDBh
-    MTA4ZTRiNDhkMmRiZjM1MWFmMWI5OGQ4YTU2MzI3N2E5ODdkNGRhMTBlMTM1
-    ZjJiYWFhYTgyN2Y3YjI3MzZmZjJhMzU2YmFjOGY0OGM2MTUzMWQ=
-  data.tar.gz: !binary |-
-    N2VhYTFjZTNmOGJiNGMyZjY2OGViNjZmODZlY2Y2OWM5OGExNjRkOTAxYWJm
-    Y2JkNjQ1YzY4NWRlZWUzOWNkZTA0YzJiYzBjOTU4ZmE3MzgzZTNhNmNlZWU1
-    NTY2NDE5MDE4YzJjZTVjMzNkMWUyZDBmZTdiYjE2NzNjYjU3ODc=
+  metadata.gz: 28b340921d2d6681824f219864f1875c9f3136670ea869aa621a8a3a5d23326a4fcac618abb39e1313b8075497906a95fa7d5da573839f01766b82436019f1b7
+  data.tar.gz: 0adc3c6ef53887926106b62c60ca6a4fd0800a5519ffd48bd9ea792ecc0320404d37d679668955d81fdb5e0d50e9760369e5074b35c864d4c64447d18136b974

data/lib/propono/components/queue_subscription.rb

@@ -20,6 +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)
     end
 
     def queue_name
@@ -31,5 +32,30 @@ module Propono
     def config
       Configuration.instance
     end
+
+    def 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"
+              }
+            }
+          }
+        ]
+      }
+      EOS
+    end
   end
 end

data/lib/propono/configuration.rb

@@ -9,10 +9,9 @@ module Propono
     include Singleton
 
     SETTINGS = [
-      :access_key,
-      :secret_key,
-      :queue_region,
+      :access_key, :secret_key, :queue_region,
       :application_name,
+      :udp_host, :udp_port,
       :logger
     ]
     attr_writer *SETTINGS

data/lib/propono/services/publisher.rb

@@ -5,16 +5,41 @@ module Propono
   class Publisher
     include Sns
 
-    def self.publish(topic, message)
-      new.publish(topic, message)
+    def self.publish(topic_id, message, options = {})
+      new(topic_id, message, options).publish
     end
 
-    def publish(topic_id, message)
+    attr_reader :topic_id, :message, :protocol
+
+    def initialize(topic_id, message, options = {})
       raise PublisherError.new("Topic is nil") if topic_id.nil?
       raise PublisherError.new("Message is nil") if message.nil?
 
+      @topic_id = topic_id
+      @message = message
+      @protocol = options.fetch(:protocol, :sns).to_sym
+    end
+
+    def publish
+      send("publish_via_#{protocol}")
+    end
+
+    private
+
+    def publish_via_sns
       topic = TopicCreator.find_or_create(topic_id)
       sns.publish(topic.arn, message)
     end
+
+    def publish_via_udp
+      payload = {topic: topic_id, message: message}.to_json
+      UDPSocket.new.send(payload, 0, config.udp_host, config.udp_port)
+    rescue SocketError => e
+      config.logger.puts "Udp2sqs failed to send : #{e}"
+    end
+
+    def config
+      Configuration.instance
+    end
   end
 end

data/lib/propono/version.rb

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

data/test/publisher_test.rb

@@ -4,51 +4,103 @@ module Propono
   class PublisherTest < Minitest::Test
 
     def test_initialization
-      notifier = Publisher.new
-      refute notifier.nil?
+      publisher = Publisher.new('topic', 'message')
+      refute publisher.nil?
     end
 
-    def test_self_publish_calls_publish
+    def test_self_publish_calls_new
       topic = "topic123"
       message = "message123"
-      Publisher.any_instance.expects(:publish).with(topic, message)
-      Publisher.new.publish(topic, message)
+      Publisher.expects(:new).with(topic, message, {}).returns(mock(publish: nil))
+      Publisher.publish(topic, message)
     end
 
-    def test_publish_should_call_sns_on_correct_topic_and_message
+    def test_self_publish_calls_publish
+      Publisher.any_instance.expects(:publish)
+      Publisher.publish("topic", "message")
+    end
+
+    def test_protocol_should_be_sns_by_default
+      publisher = Publisher.new('topic', 'message')
+      assert_equal :sns, publisher.protocol
+    end
+
+    def test_publish_proxies_to_sns
+      publisher = Publisher.new('topic', 'message')
+      publisher.expects(:publish_via_sns)
+      publisher.publish
+    end
+
+    def test_publish_proxies_to_udp
+      publisher = Publisher.new('topic', 'message', protocol: :udp)
+      publisher.expects(:publish_via_udp)
+      publisher.publish
+    end
+
+    def test_publish_via_sns_should_call_sns_on_correct_topic_and_message
       topic = "topic123"
       message = "message123"
       topic_arn = "arn123"
+      topic = Topic.new(topic_arn)
 
-      TopicCreator.stubs(find_or_create: topic_arn)
+      TopicCreator.stubs(find_or_create: topic)
 
       sns = mock()
       sns.expects(:publish).with(topic_arn, message)
-      publisher = Publisher.new
+      publisher = Publisher.new(topic, message)
       publisher.stubs(sns: sns)
-
-      publisher.publish(topic, message)
+      publisher.send(:publish_via_sns)
     end
 
-    def test_publish_should_propogate_exception_on_topic_creation_error
+    def test_publish_via_sns_should_propogate_exception_on_topic_creation_error
       TopicCreator.stubs(:find_or_create).raises(TopicCreatorError)
 
       assert_raises(TopicCreatorError) do
-        Publisher.publish("topic", "message")
+        publisher = Publisher.new("topic", "message")
+        publisher.send(:publish_via_sns)
       end
     end
 
-    def test_publish_creates_a_topic
-      topic = "Malcs_topic"
+    def test_publish_via_sns_creates_a_topic
+      topic_id = "Malcs_topic_id"
+      topic_arn = "Malcs_topic_arn"
+      topic = Topic.new(topic_arn)
 
-      TopicCreator.expects(:find_or_create).with(topic)
+      TopicCreator.expects(:find_or_create).with(topic_id).returns(topic)
 
       sns = mock()
       sns.stubs(:publish)
-      publisher = Publisher.new
+      publisher = Publisher.new(topic_id, "Foobar")
       publisher.stubs(sns: sns)
 
-      publisher.publish(topic, "Foobar")
+      publisher.send(:publish_via_sns)
+    end
+
+    def test_udp_uses_correct_message_host_and_port
+      host = "http://meducation.net"
+      port = 1234
+      config.udp_host = host
+      config.udp_port = port
+      topic_id = "my-fav-topic"
+      message = "foobar"
+      payload = {topic: topic_id, message: message}.to_json
+      UDPSocket.any_instance.expects(:send).with(payload, 0, host, port)
+
+      publisher = Publisher.new(topic_id, message)
+      publisher.send(:publish_via_udp)
+    end
+
+    def test_client_with_bad_host_logs_error
+      host = "http://meducation.net"
+      port = 1234
+      config.udp_host = host
+      config.udp_port = port
+
+      client = Publisher.new("topic_id", "message")
+      _, err = capture_io do
+        client.send(:publish_via_udp)
+      end
+      assert_match("Udp2sqs failed to send : getaddrinfo:", err)
     end
 
     def test_publish_should_raise_exception_if_topic_is_nil

data/test/queue_listener_test.rb

@@ -85,14 +85,9 @@ module Propono
       queue_listener.stubs(sqs: sqs)
       queue_listener.stubs(queue_url: "http://example.com")
 
-      # capture_io reasigns stderr. Assign the config.logger
-      # to where capture_io has redirected it to for this test.
       out, err = capture_io do
-        config.logger = $stderr
         queue_listener.send(:read_messages)
       end
-      # Reassign config.logger to the correct stderr
-      config.logger = $stderr
       assert_equal "Unexpected error reading from queue http://example.com\n", err
     end
 

data/test/queue_subscription_test.rb

@@ -40,7 +40,7 @@ module Propono
       assert_equal subscription.send(:queue_name), "My_App-Foobar"
     end
 
-    def test_create_calls_create
+    def test_create_calls_subscribe
       arn = "arn123"
 
       TopicCreator.stubs(find_or_create: Topic.new(arn))
@@ -53,6 +53,21 @@ module Propono
       subscription.create
     end
 
+    def test_create_calls_set_queue_attributes
+      arn = "arn123"
+      policy = "{foobar: 123}"
+
+      TopicCreator.stubs(find_or_create: Topic.new(arn))
+      QueueCreator.stubs(find_or_create: Queue.new(Fog::AWS::SQS::Mock::QueueUrl))
+
+      sqs = mock()
+      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.create
+    end
+
     def test_create_saves_queue
       queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
 

data/test/test_helper.rb

@@ -25,8 +25,28 @@ class Minitest::Test
   def config
     Propono::Configuration.instance
   end
+
+  # capture_io reasigns stderr. Assign the config.logger
+  # to where capture_io has redirected it to for this test.
+  def capture_io(&block)
+    require 'stringio'
+
+    orig_stdout, orig_stderr         = $stdout, $stderr
+    captured_stdout, captured_stderr = StringIO.new, StringIO.new
+    $stdout, $stderr                 = captured_stdout, captured_stderr
+
+    config.logger = $stderr
+    yield
+
+    return captured_stdout.string, captured_stderr.string
+  ensure
+    $stdout = orig_stdout
+    $stderr = orig_stderr
+    config.logger = $stderr
+  end
 end
 
+require 'fog'
 class Fog::AWS::SNS::Mock
   def create_topic(*args)
     foo = Object.new
@@ -42,10 +62,11 @@ class Fog::AWS::SNS::Mock
   end
 end
 
-require 'fog'
 class Fog::AWS::SQS::Mock
   def create_queue(*args)
   end
+  def set_queue_attributes(*args)
+  end
 end
 
 Fog::AWS::SQS::Mock::QueueUrl = 'https://meducation.net/foobar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 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: []