sqs_web 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 665814da097e54c82e213f7b028c8a8f4d2ef6e7
-  data.tar.gz: b7bf80a9fb820e16895468399ef237e2bcfc4c6d
+  metadata.gz: f1d0cd87afe1d1dfdd5da9165db08b08b11fdde8
+  data.tar.gz: 9d8e84165d1fd2a4ebb0d37357d82f44a8136140
 SHA512:
-  metadata.gz: ebbac66344253cd96a7e3472d0a640be9c400fff44e97cbf4fe05ad2314ed33739221025aaa6a08d43f979a3a527248f010ff21f94d99369c07681fda1ce1bdc
-  data.tar.gz: 34d3c19ed3e168fb13ef5ec5c9d9b924c0131a57308df05e4a2b10dfdf7b3c9d5c5fd182e274f45ac53ae8cd3c74f1f5d69c8373f4a85af6a788cb92c55243fa
+  metadata.gz: 031aae0a0934a71c853a3e5d3c6b6c2261b69f2c0ef09148e2b064df4eaf89246aa4cb288e77b313030a7191e76a9d2ffa1c7c2027f87c6a3274eff5b764a481
+  data.tar.gz: 0d81895f0e84f2dfe24469ba8834fd1019069c525b4fe5913d0428b3587d806c21a4919612ba6fac554674188e0a95ea5644f02830f7cd0f9b55607bc5f70fba

data/README.markdown

@@ -54,10 +54,12 @@ end
 `sqs_web` runs as a Sinatra application within the rails application. Visit it at `/sqs`.
 
 ## Supported SqsWeb configuration options
-`SqsWeb.options[:aws]` supports the following hash key/value pairs:
+The ```aws``` section is used to configure the Aws objects used by sqs_web internally. The sqs_web-specific keys are listed below, and you can expect any other key defined in that block to be passed on untouched to ```Aws::SQS::Client#initialize```:
+
 - `access_key_id` : AWS Access Key. If not set will default to environment variable `AWS_ACCESS_KEY_ID` or instance profile credentials
 - `secret_access_key` : AWS Secret Access Key. If not set will default to environment variable `AWS_SECRET_ACCESS_KEY` or instance profile credentials.
 - `region`: AWS region for the SQS queue. If not set will default to environment variable `AWS_REGION` or else to `us-east-1`.
+- `sqs_endpoint` can be used to explicitly override the SQS endpoint. If not set will default to environment variable `AWS_SQS_ENDPOINT` or default SQS endpoint.
 
 `SqsWeb.options[:queues]` supports an array of strings for the SQS queue names.
 ```ruby

data/lib/sqs_web/application/sqs_action.rb

@@ -3,33 +3,46 @@ class SqsAction
   protected
   
   def self.sqs
-    @@sqs ||= Aws::SQS::Client.new
+    @@sqs ||= Aws::SQS::Client.new(SqsWeb.options[:aws])
   end
 
   def self.initialize_aws
     # aws-sdk tries to load the credentials from the ENV variables: AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
     # when not explicit supplied
-    return if SqsWeb.options[:aws].empty?
-
     aws_options = SqsWeb.options[:aws]
 
+    return if aws_options.empty?
+
     # assume credentials based authentication
     credentials = Aws::Credentials.new(
       aws_options[:access_key_id],
       aws_options[:secret_access_key])
 
     # but only if the configuration options have valid values
-    aws_options = aws_options.merge(credentials: credentials) if credentials.set?
+    aws_options[:credentials] = credentials if credentials.set?
+
+    #Override SQS endpoint
+    environment_endpoint = ENV["AWS_SQS_ENDPOINT"]
+    explicit_endpoint = SqsWeb.options[:aws][:endpoint] || environment_endpoint
+    aws_options[:endpoint] = explicit_endpoint unless explicit_endpoint.to_s.empty?
 
     Aws::SQS::Client.remove_plugin(Aws::Plugins::SQSMd5s)
-    
-    Aws.config = aws_options
   end
 
   def self.load_queue_urls
     sqs && SqsWeb.options[:queues].map do |queue_name|
-      dlq_queue_url = sqs.get_queue_url(queue_name: queue_name).queue_url
-      source_queue_url = sqs.list_dead_letter_source_queues({queue_url: dlq_queue_url}).queue_urls.first
+      #More helpful error message when queue name does not exist
+      begin
+        dlq_queue_url = sqs.get_queue_url(queue_name: queue_name).queue_url
+      rescue Aws::SQS::Errors::NonExistentQueue => e
+        raise $!, "#{queue_name} is not an existing queue name" ,$!.backtrace
+      end
+
+      begin
+        source_queue_url = sqs.list_dead_letter_source_queues({queue_url: dlq_queue_url}).queue_urls.first
+      # ElasticMQ doesn't support 'list_dead_letter_source_queues' yet
+      rescue Aws::SQS::Errors::NotFound
+      end
       {name:  queue_name, url: dlq_queue_url, source_url: source_queue_url}
     end
   end

data/spec/integration/overview_spec.rb

@@ -31,6 +31,6 @@ RSpec.describe "Overview Page", :sqs do
 
     visit "/sqs/overview"
 
-    match_content(page, "Aws::SQS::Errors::NonExistentQueue: BOGUSQUEUE")
+    match_content(page, "<Aws::SQS::Errors::NonExistentQueue: BOGUSQUEUE is not an existing queue name>: BOGUSQUEUE is not an existing queue name")
   end
 end

data/sqs_web.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = "sqs_web"
-  gem.version     = "0.0.3"
+  gem.version     = "0.0.4"
   gem.author      = "Nathaniel Ritholtz"
   gem.email       = "nritholtz@gmail.com"
   gem.homepage    = "https://github.com/nritholtz/sqs_web"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqs_web
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nathaniel Ritholtz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra