shoryuken 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3748f41972ac2a8c233278b33432cb5c2056848a
-  data.tar.gz: fa952b333c483077908c53bd0515c49026fd4d33
+  metadata.gz: c88cb34dfa2eae0fbeea81ff493f88c389232edb
+  data.tar.gz: b271d7d9015868d1d5b344d4f338c3e603e57b50
 SHA512:
-  metadata.gz: 9cd990370ec8fc9da9f46400e98076eeea77c0dd4cb9ae1c291319ba0ed496ea9c536f6cdcb91757853f05c68a3e71d7f681a7838a077746a932d5b0c7a7560c
-  data.tar.gz: 3dc1ac1e696112e865bc69fce0bc3eef745658de4627199f830fde4ac4d2351c2792629d51210d7bd92026b61dfe72b715073a14d5f3c9b7da93e87cf2486520
+  metadata.gz: 2a7a0ba02ee69d37ee8df087c9c260443cdb9559a48bd1bb58ea93e7c0281a8863acf9e91818b41ce91c211e3569d94fb88cf925ffbad579ccfa33dc917eb431
+  data.tar.gz: dbb15a8ff723305b3db21c01fa74eca91e9f782c07e5d65440eb71a3141969fd9a6bd38d0fe09b15f96260f7580b127c5ba78121f0444b5027ea011464793049

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [v3.0.9] - 2017-06-05
+
+- Allow configuring queue URLs instead of names
+ - [#378](https://github.com/phstc/shoryuken/pull/378)
+
 ## [v3.0.8] - 2017-06-02
 
 - Fix miss handling empty batch fetches

data/lib/shoryuken/environment_loader.rb

@@ -119,7 +119,7 @@ module Shoryuken
     end
 
     def validate_queues
-      Shoryuken.logger.warn { 'No queues supplied' } if Shoryuken.queues.empty?
+      return Shoryuken.logger.warn { 'No queues supplied' } if Shoryuken.queues.empty?
 
       non_existent_queues = []
 
@@ -131,7 +131,7 @@ module Shoryuken
         end
       end
 
-      fail ArgumentError, "The specified queue(s) #{non_existent_queues} do not exist" if non_existent_queues.any?
+      fail ArgumentError, "The specified queue(s) #{non_existent_queues.join(', ')} do not exist" if non_existent_queues.any?
     end
 
     def validate_workers

data/lib/shoryuken/queue.rb

@@ -8,12 +8,9 @@ module Shoryuken
 
     attr_accessor :name, :client, :url
 
-    def initialize(client, name)
-      self.name   = name
+    def initialize(client, name_or_url)
       self.client = client
-      self.url    = client.get_queue_url(queue_name: name).queue_url
-    rescue Aws::SQS::Errors::NonExistentQueue => ex
-      raise ex, "The specified queue #{name} does not exist."
+      set_name_and_url(name_or_url)
     end
 
     def visibility_timeout
@@ -52,6 +49,21 @@ module Shoryuken
 
     private
 
+    def set_name_and_url(name_or_url)
+      if name_or_url.start_with?('https://sqs.')
+        self.name = name_or_url.split('/').last
+        self.url  = name_or_url
+
+        # Test if the supplied URL is valid
+        fifo?
+      else
+        self.name = name_or_url
+        self.url  = client.get_queue_url(queue_name: name_or_url).queue_url
+      end
+    rescue Aws::Errors::NoSuchEndpointError, Aws::SQS::Errors::NonExistentQueue => ex
+      raise ex, "The specified queue #{name} does not exist."
+    end
+
     def queue_attributes
       # Note: Retrieving all queue attributes as requesting `FifoQueue` on non-FIFO queue raises error.
       # See issue: https://github.com/aws/aws-sdk-ruby/issues/1350

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.0.8'.freeze
+  VERSION = '3.0.9'.freeze
 end

data/spec/shoryuken/queue_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Shoryuken::Queue do
+RSpec.describe Shoryuken::Queue do
   let(:credentials) { Aws::Credentials.new('access_key_id', 'secret_access_key') }
   let(:sqs) { Aws::SQS::Client.new(stub_responses: true, credentials: credentials) }
   let(:queue_name) { 'shoryuken' }
-  let(:queue_url) { "https://eu-west-1.amazonaws.com:6059/0123456789/#{queue_name}" }
+  let(:queue_url) { "https://sqs.eu-west-1.amazonaws.com:6059/0123456789/#{queue_name}" }
 
   subject { described_class.new(sqs, queue_name) }
 
@@ -14,6 +14,16 @@ describe Shoryuken::Queue do
     allow(subject).to receive(:url).and_return(queue_url)
   end
 
+  describe '#new' do
+    context 'when queue url supplied' do
+      subject { described_class.new(sqs, queue_url) }
+
+      specify do
+        expect(subject.name).to eq(queue_name)
+      end
+    end
+  end
+
   describe '#delete_messages' do
     let(:entries) do
       [
@@ -105,24 +115,24 @@ describe Shoryuken::Queue do
 
     it 'accepts an array of messages' do
       options = { entries: [{ id: '0',
-                              message_body: 'msg1',
-                              delay_seconds: 1,
-                              message_attributes: { attr: 'attr1' } },
-                            { id: '1',
-                              message_body: 'msg2',
-                              delay_seconds: 1,
-                              message_attributes: { attr: 'attr2' } }] }
+        message_body: 'msg1',
+        delay_seconds: 1,
+        message_attributes: { attr: 'attr1' } },
+        { id: '1',
+          message_body: 'msg2',
+          delay_seconds: 1,
+          message_attributes: { attr: 'attr2' } }] }
 
       expect(sqs).to receive(:send_message_batch).with(hash_including(options))
 
       subject.send_messages([{ message_body:       'msg1',
-                               delay_seconds:      1,
-                               message_attributes: { attr: 'attr1' }
-                             }, {
-                               message_body:       'msg2',
-                               delay_seconds:      1,
-                               message_attributes: { attr: 'attr2' }
-                             }])
+        delay_seconds:      1,
+        message_attributes: { attr: 'attr1' }
+      }, {
+        message_body:       'msg2',
+        delay_seconds:      1,
+        message_attributes: { attr: 'attr2' }
+      }])
     end
 
     context 'when FIFO' do
@@ -153,9 +163,9 @@ describe Shoryuken::Queue do
           end
 
           subject.send_messages([{ message_body: 'msg1',
-                                   message_attributes: { attr: 'attr1' },
-                                   message_group_id: 'my group',
-                                   message_deduplication_id: 'my id' }])
+            message_attributes: { attr: 'attr1' },
+            message_group_id: 'my group',
+            message_deduplication_id: 'my id' }])
         end
       end
     end
@@ -179,13 +189,13 @@ describe Shoryuken::Queue do
     context 'when queue is FIFO' do
       let(:fifo) { true }
 
-      it { expect(subject.fifo?).to be }
+      specify { expect(subject.fifo?).to be }
     end
 
     context 'when queue is not FIFO' do
       let(:fifo) { false }
 
-      it { expect(subject.fifo?).to_not be }
+      specify { expect(subject.fifo?).to_not be }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler