fake_sns 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ee25d3164e85ff5a4fcf4ad5002293fc61137f
-  data.tar.gz: 28a8dc1d79018fb669e4a935f5079ef8a5e1b7b6
+  metadata.gz: ffde4a95debaff16dc02f2c053f8be69b021c9a7
+  data.tar.gz: 36d70df4346c8dbeacc361bc7e6dc06f951893e4
 SHA512:
-  metadata.gz: 0481806ac3b03bc6b88d4a52998202c44152c27e2b1e1bbedda12c0a185d43ea343c2c445465445699bfd89d5536a01e36169c94a999ffb705dfc1e2d20855d3
-  data.tar.gz: eee801999500fc8576f124a9a984e1fe029a86e47d96d4bfcc85aceba3b57026386f89fd37eede10591ac5e124542bf8ef68672b02f99295c85c9e45327196da
+  metadata.gz: 953fe54060d0729600f835530c839c4a1b01351c44786b11492aa7880e1f474a0d66157ccd0f916539889df7e74cf547bbd05418d8136d46c171b6c3e46ce865
+  data.tar.gz: 89858490229ba262f4803cb9a6e63c04de9c854f5f6b4d93a4f106e2a8b1de8568906ff550b4b615f18b34d707c1c5c11c8dbc5e4998ae4c3cdd227072dda5cb

data/fake_sns.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "virtus", "~> 1.0"
   spec.add_dependency "verbose_hash_fetch"
   spec.add_dependency "faraday", "~> 0.8"
-  spec.add_dependency 'aws-sdk', '~> 1.30'
+  spec.add_dependency 'aws-sdk', '~> 2.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "fake_sqs", "~> 0.0.9"
+  spec.add_development_dependency "fake_sqs", "~> 0.2"
   spec.add_development_dependency "json_expressions"
 
 end

data/lib/fake_sns/deliver_message.rb

@@ -34,9 +34,14 @@ module FakeSNS
 
     def sqs
       queue_name = endpoint.split(":").last
-      sqs = AWS::SQS.new(config["aws_config"] || {})
-      queue = sqs.queues.named(queue_name)
-      queue.send_message(message_contents)
+      sqs = Aws::SQS::Client.new(
+        region: config.fetch("region"),
+        credentials: Aws::Credentials.new(config.fetch("access_key_id"), config.fetch("secret_access_key")),
+      ).tap { |client|
+        client.config.endpoint = URI(config.fetch("sqs_endpoint"))
+      }
+      queue_url = sqs.get_queue_url(queue_name: queue_name).queue_url
+      sqs.send_message(queue_url: queue_url, message_body: message_contents)
     end
 
     def http

data/lib/fake_sns/message.rb

@@ -8,6 +8,8 @@ module FakeSNS
     json = Class.new(Virtus::Attribute) do
       def coerce(value)
         value.is_a?(::Hash) ? value : JSON.parse(value)
+      rescue
+        value
       end
     end
 

data/lib/fake_sns/server.rb

@@ -51,17 +51,23 @@ module FakeSNS
     end
 
     post "/drain" do
-      database.transaction do
-        config = JSON.parse(request.body.read)
-        database.each_deliverable_message do |subscription, message|
-          DeliverMessage.call(subscription: subscription, message: message, request: request, config: config)
+      config = JSON.parse(request.body.read.to_s)
+      begin
+        database.transaction do
+          database.each_deliverable_message do |subscription, message|
+            DeliverMessage.call(subscription: subscription, message: message, request: request, config: config)
+          end
         end
+      rescue => e
+        status 500
+        "#{e.class}: #{e}\n\n#{e.backtrace.join("\n")}"
+      else
+        200
       end
-      200
     end
 
     post "/drain/:message_id" do |message_id|
-      config = JSON.parse(request.body.read)
+      config = JSON.parse(request.body.read.to_s)
       database.transaction do
         database.each_deliverable_message do |subscription, message|
           if message.id == message_id

data/lib/fake_sns/test_integration.rb

@@ -1,3 +1,4 @@
+require "yaml"
 require "faraday"
 require "timeout"
 
@@ -62,7 +63,11 @@ module FakeSNS
 
     def drain(message_id = nil, options = {})
       path = message_id ? "/drain/#{message_id}" : "/drain"
-      default = { aws_config: AWS.config.send(:supplied) }
+      default = {
+        region:             Aws.config[:region],
+        access_key_id:      Aws.config[:credentials].access_key_id,
+        secret_access_key:  Aws.config[:credentials].secret_access_key,
+      }
       body = default.merge(options).to_json
       result = connection.post(path, body)
       if result.success?
@@ -83,7 +88,7 @@ module FakeSNS
     end
 
     def option(key)
-      options.fetch(key) { AWS.config.public_send(key) }
+      options.fetch(key)
     end
 
 

data/lib/fake_sns/topic_collection.rb

@@ -17,7 +17,6 @@ module FakeSNS
     end
 
     def each(*args, &block)
-      p @store.to_yaml
       collection.map { |item| Topic.new(item) }.each(*args, &block)
     end
 

data/lib/fake_sns/version.rb

@@ -1,3 +1,3 @@
 module FakeSNS
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/fake_sns/drain_spec.rb

@@ -4,26 +4,35 @@ require 'json_expressions/rspec'
 RSpec.describe "Drain messages", :sqs do
 
   it "works for SQS" do
-    topic = sns.topics.create("my-topic")
-    queue = sqs.queues.create("my-queue")
-    topic.subscribe(queue)
+    queue_url = sqs.create_queue(queue_name: "my-queue").queue_url
+    queue_arn = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["QueueArn"]).attributes.fetch("QueueArn")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
 
-    topic.publish("X")
+    _subscription_arn = sns.subscribe(topic_arn: topic_arn, protocol: "sqs", endpoint: queue_arn).subscription_arn
 
-    $fake_sns.drain
-    expect(queue.visible_messages).to eq 1
+    sns.publish(topic_arn: topic_arn, message: { sqs: "hallo" }.to_json)
+
+    $fake_sns.drain(nil, sqs_endpoint: sqs.config.endpoint.to_s)
+
+    attributes = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["ApproximateNumberOfMessages"]).attributes
+    expect(attributes.fetch("ApproximateNumberOfMessages")).to eq "1"
   end
 
   it "works for SQS with a single message" do
-    topic = sns.topics.create("my-topic")
-    queue = sqs.queues.create("my-queue")
-    topic.subscribe(queue)
 
-    message_id = topic.publish("X")
-    topic.publish("Y")
+    queue_url = sqs.create_queue(queue_name: "my-queue").queue_url
+    queue_arn = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["QueueArn"]).attributes.fetch("QueueArn")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+
+    _subscription_arn = sns.subscribe(topic_arn: topic_arn, protocol: "sqs", endpoint: queue_arn).subscription_arn
 
-    $fake_sns.drain(message_id)
-    expect(queue.visible_messages).to eq 1
+    message_id = sns.publish(topic_arn: topic_arn, message: { sqs: "hallo" }.to_json).message_id
+    sns.publish(topic_arn: topic_arn, message: { sqs: "world" }.to_json)
+
+    $fake_sns.drain(message_id, sqs_endpoint: sqs.config.endpoint.to_s)
+
+    attributes = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["ApproximateNumberOfMessages"]).attributes
+    expect(attributes.fetch("ApproximateNumberOfMessages")).to eq "1"
   end
 
   it "works for HTTP" do
@@ -43,28 +52,29 @@ RSpec.describe "Drain messages", :sqs do
       target_app.run!
     end
 
-    topic = sns.topics.create("my-topic")
-    subscription = topic.subscribe("http://localhost:5051/endpoint")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+
+    subscription_arn = sns.subscribe(topic_arn: topic_arn, protocol: "http", endpoint: "http://localhost:5051/endpoint").subscription_arn
 
-    message_id = topic.publish("X")
+    message_id = sns.publish(topic_arn: topic_arn, message: { default: "hallo" }.to_json).message_id
 
     wait_for { Faraday.new("http://localhost:5051").get("/").success? rescue false }
 
-    $fake_sns.drain
+    $fake_sns.drain(nil, sqs_endpoint: sqs.config.endpoint.to_s)
 
     app_runner.kill
 
     expect(requests.size).to eq 1
     expect(requests.first).to match_json_expression(
       "Type"             => "Notification",
-      "Message"          => "X",
+      "Message"          => "hallo",
       "MessageId"        => message_id,
       "Signature"        => "Fake",
       "SignatureVersion" => "1",
       "SigningCertURL"   => "https://sns.us-east-1.amazonaws.com/SimpleNotificationService-f3ecfb7224c7233fe7bb5f59f96de52f.pem",
       "Subject"          => nil,
       "Timestamp"        => anything,
-      "TopicArn"         => topic.arn,
+      "TopicArn"         => topic_arn,
       "Type"             => "Notification",
       "UnsubscribeURL"   => "",
     )
@@ -73,8 +83,8 @@ RSpec.describe "Drain messages", :sqs do
     expect(_headers.first).to match_json_expression({
       "HTTP_X_AMZ_SNS_MESSAGE_TYPE"     => "Notification",
       "HTTP_X_AMZ_SNS_MESSAGE_ID"       => message_id,
-      "HTTP_X_AMZ_SNS_TOPIC_ARN"        => topic.arn,
-      "HTTP_X_AMZ_SNS_SUBSCRIPTION_ARN" => subscription.arn,
+      "HTTP_X_AMZ_SNS_TOPIC_ARN"        => topic_arn,
+      "HTTP_X_AMZ_SNS_SUBSCRIPTION_ARN" => subscription_arn,
     }.ignore_extra_keys!)
 
   end

data/spec/fake_sns/publish_spec.rb

@@ -1,9 +1,9 @@
 RSpec.describe "Publishing" do
 
-  let(:existing_topic) { sns.topics.create("my-topic") }
+  let(:existing_topic) { sns.create_topic(name: "my-topic").topic_arn }
 
   it "remembers published messages" do
-    message_id = existing_topic.publish("hallo")
+    message_id = sns.publish(topic_arn: existing_topic, message: "hallo").message_id
     messages = $fake_sns.data.fetch("messages")
     expect(messages.size).to eq 1
     message = messages.first
@@ -11,16 +11,16 @@ RSpec.describe "Publishing" do
   end
 
   it "needs an existing topic" do
-    topic = sns.topics["arn:aws:sns:us-east-1:5068edfd0f7ee3ea9ccc1e73cbb17569:not-exist"]
+    non_existing = "arn:aws:sns:us-east-1:5068edfd0f7ee3ea9ccc1e73cbb17569:not-exist"
     expect {
-      topic.publish("hallo")
-    }.to raise_error AWS::SNS::Errors::InvalidParameterValue
+      sns.publish(topic_arn: non_existing, message: "hallo")
+    }.to raise_error Aws::SNS::Errors::InvalidParameterValue
   end
 
   it "doesn't allow messages that are too big" do
     expect {
-      existing_topic.publish("A" * 262145)
-    }.to raise_error AWS::SNS::Errors::InvalidParameterValue
+      sns.publish(topic_arn: existing_topic, message: "A" * 262145)
+    }.to raise_error Aws::SNS::Errors::InvalidParameterValue
   end
 
 end

data/spec/fake_sns/replace_spec.rb

@@ -1,12 +1,12 @@
 RSpec.describe "Replacing the data" do
 
   it "works by submitting new YAML" do
-    topic = sns.topics.create("my-topic")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
     previous_data = $fake_sns.data.to_yaml
     apply_change = lambda { |data| data.gsub("my-topic", "your-topic") }
     new_data = apply_change.call(previous_data)
     $fake_sns.connection.put("/", new_data)
-    expect(sns.topics.map(&:arn)).to eq [apply_change.call(topic.arn)]
+    expect(sns.list_topics.topics.map(&:topic_arn)).to eq [apply_change.call(topic_arn)]
   end
 
 end

data/spec/fake_sns/subscribing_spec.rb

@@ -1,42 +1,49 @@
 RSpec.describe "Subscribing", :sqs do
 
   it "lists subscriptions globally" do
-    topic = sns.topics.create("my-topic")
-    subscription = topic.subscribe("http://example.com")
-    expect(sns.subscriptions.map(&:topic_arn)).to eq [topic.arn]
-    expect(sns.subscriptions.map(&:arn)).to eq [subscription.arn]
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    subscription_arn = sns.subscribe(topic_arn: topic_arn, protocol: "http", endpoint: "http://example.com").subscription_arn
 
-    subscription.raw_message_delivery = true
+    subscriptions = sns.list_subscriptions.subscriptions
+    expect(subscriptions.map(&:topic_arn)).to eq [topic_arn]
+    expect(subscriptions.map(&:subscription_arn)).to eq [subscription_arn]
   end
 
   it "filters by topic" do
-    topic = sns.topics.create("my-topic")
-    other_topic = sns.topics.create("my-topic-2")
-    subscription = topic.subscribe("http://example.com")
-    expect(topic.subscriptions.map(&:topic_arn)).to eq [topic.arn]
-    expect(topic.subscriptions.map(&:arn)).to eq [subscription.arn]
-    expect(other_topic.subscriptions.map(&:arn)).to eq []
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    _other_topic_arn = sns.create_topic(name: "my-topic-2").topic_arn
+
+    subscription_arn = sns.subscribe(topic_arn: topic_arn, protocol: "http", endpoint: "http://example.com").subscription_arn
+    subscriptions = sns.list_subscriptions.subscriptions
+    expect(subscriptions.map(&:topic_arn)).to eq [topic_arn]
+    expect(subscriptions.map(&:subscription_arn)).to eq [subscription_arn]
   end
 
   it "needs an existing topic" do
-    topic = sns.topics["arn:aws:sns:us-east-1:5068edfd0f7ee3ea9ccc1e73cbb17569:not-exist"]
+    topic_arn = "arn:aws:sns:us-east-1:5068edfd0f7ee3ea9ccc1e73cbb17569:not-exist"
     expect {
-      topic.subscribe("http://example.com")
-    }.to raise_error AWS::SNS::Errors::InvalidParameterValue
+      sns.subscribe(topic_arn: topic_arn, protocol: "http", endpoint: "http://example.com")
+    }.to raise_error Aws::SNS::Errors::InvalidParameterValue
   end
 
   it "can subscribe to a SQS queue" do
-    queue = AWS::SQS.new.queues.create("my-queue")
-    topic = sns.topics.create("my-topic")
-    topic.subscribe(queue)
+    queue_url = sqs.create_queue(queue_name: "my-queue").queue_url
+    queue_arn = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["QueueArn"]).attributes.fetch("QueueArn")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    sns.subscribe(topic_arn: topic_arn, protocol: "sqs", endpoint: queue_arn)
   end
 
   it "won't subscribe twice to the same endpoint" do
-    queue = AWS::SQS.new.queues.create("my-queue")
-    topic = sns.topics.create("my-topic")
-    topic.subscribe(queue)
-    topic.subscribe(queue)
-    expect(sns.subscriptions.to_a.size).to eq 1
+    queue_url = sqs.create_queue(queue_name: "my-queue").queue_url
+    queue_arn = sqs.get_queue_attributes(queue_url: queue_url, attribute_names: ["QueueArn"]).attributes.fetch("QueueArn")
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+
+    2.times do
+      sns.subscribe(topic_arn: topic_arn, protocol: "sqs", endpoint: queue_arn)
+    end
+
+    subscriptions = sns.list_subscriptions.subscriptions
+    expect(subscriptions.size).to eq 1
   end
 
 end

data/spec/fake_sns/topics_spec.rb

@@ -2,41 +2,41 @@ RSpec.describe "Topics" do
 
   it "rejects invalid characters in topic names" do
     expect {
-      sns.topics.create("dot.dot")
-    }.to raise_error(AWS::SNS::Errors::InvalidParameterValue)
+      sns.create_topic(name: "dot.dot")
+    }.to raise_error(Aws::SNS::Errors::InvalidParameterValue)
   end
 
   it "creates a new topic" do
-    topic = sns.topics.create("my-topic")
-    expect(topic.arn).to match(/arn:aws:sns:us-east-1:(\w+):my-topic/)
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    expect(topic_arn).to match(/arn:aws:sns:us-east-1:(\w+):my-topic/)
 
-    new_topic = sns.topics.create("other-topic")
-    expect(new_topic.arn).not_to eq topic.arn
+    new_topic_arn = sns.create_topic(name: "other-topic").topic_arn
+    expect(new_topic_arn).not_to eq topic_arn
 
-    existing_topic = sns.topics.create("my-topic")
-    expect(existing_topic.arn).to eq topic.arn
+    existing_topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    expect(existing_topic_arn).to eq topic_arn
   end
 
   it "lists topics" do
-    topic1 = sns.topics.create("my-topic-1")
-    topic2 = sns.topics.create("my-topic-2")
+    topic1_arn = sns.create_topic(name: "my-topic-1").topic_arn
+    topic2_arn = sns.create_topic(name: "my-topic-2").topic_arn
 
-    expect(sns.topics.map(&:arn)).to match_array [topic1.arn, topic2.arn]
+    expect(sns.list_topics.topics.map(&:topic_arn)).to match_array [topic1_arn, topic2_arn]
   end
 
   it "deletes topics" do
-    topic = sns.topics.create("my-topic")
-    expect(sns.topics.map(&:arn)).to eq [topic.arn]
-    sns.topics[topic.arn].delete
-    expect(sns.topics.map(&:arn)).to eq []
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    expect(sns.list_topics.topics.map(&:topic_arn)).to eq [topic_arn]
+    sns.delete_topic(topic_arn: topic_arn)
+    expect(sns.list_topics.topics.map(&:topic_arn)).to eq []
   end
 
   it "can set and read attributes" do
-    topic = sns.topics.create("my-topic")
-    expect(topic.display_name).to eq "my-topic"
-    topic.display_name = "the display name"
-    expect(topic.display_name).to eq "the display name"
-    expect(topic.name).to eq "my-topic"
+    topic_arn = sns.create_topic(name: "my-topic").topic_arn
+    expect(sns.get_topic_attributes(topic_arn: topic_arn).attributes["DisplayName"]).to eq nil
+
+    sns.set_topic_attributes(topic_arn: topic_arn, attribute_name: "DisplayName", attribute_value: "the display name")
+    expect(sns.get_topic_attributes(topic_arn: topic_arn).attributes["DisplayName"]).to eq "the display name"
   end
 
 end

data/spec/spec_helper.rb

@@ -10,30 +10,47 @@ require "fake_sns/test_integration"
 require "fake_sqs/test_integration"
 
 
-AWS.config(
-  use_ssl:            false,
-  sqs_endpoint:       "localhost",
-  sqs_port:           4568,
-  sns_endpoint:       "localhost",
-  sns_port:           9293,
-  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"),
 )
+# Aws.config(
+#   use_ssl:            false,
+#   sqs_endpoint:       "localhost",
+#   sqs_port:           4568,
+#   sns_endpoint:       "localhost",
+#   sns_port:           9293,
+#   access_key_id:      "fake access key",
+#   secret_access_key:  "fake secret key",
+# )
 
 db = ENV["SNS_DATABASE"]
 db = ":memory:" if ENV["SNS_DATABASE"].to_s == ""
 
 puts "Running tests with database stored in #{db}"
 
-$fake_sns = FakeSNS::TestIntegration.new(database: db)
-$fake_sqs = FakeSQS::TestIntegration.new(database: ":memory:")
+$fake_sns = FakeSNS::TestIntegration.new(
+  database:      db,
+  sns_endpoint:  "localhost",
+  sns_port:      9293,
+)
+
+$fake_sqs = FakeSQS::TestIntegration.new(
+  database:      ":memory:",
+  sqs_endpoint:  "localhost",
+  sqs_port:      4568,
+)
 
 module SpecHelper
   def sns
-    AWS::SNS.new
+    Aws::SNS::Client.new.tap { |client|
+      client.config.endpoint = URI("http://localhost:9293")
+    }
   end
   def sqs
-    AWS::SQS.new
+    Aws::SQS::Client.new.tap { |client|
+      client.config.endpoint = URI("http://localhost:4568")
+    }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fake_sns
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.30'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: json_expressions
   requirement: !ruby/object:Gem::Requirement
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Small Fake version of SNS