shoryuken 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c88cb34dfa2eae0fbeea81ff493f88c389232edb
-  data.tar.gz: b271d7d9015868d1d5b344d4f338c3e603e57b50
+  metadata.gz: f2752ef1274a4cb9472e72ed03d3adb4cf46cf4d
+  data.tar.gz: b315676bbb72adccc1a56dc53802bf6424a7cdcc
 SHA512:
-  metadata.gz: 2a7a0ba02ee69d37ee8df087c9c260443cdb9559a48bd1bb58ea93e7c0281a8863acf9e91818b41ce91c211e3569d94fb88cf925ffbad579ccfa33dc917eb431
-  data.tar.gz: dbb15a8ff723305b3db21c01fa74eca91e9f782c07e5d65440eb71a3141969fd9a6bd38d0fe09b15f96260f7580b127c5ba78121f0444b5027ea011464793049
+  metadata.gz: 1a6787690a9091caca28c4752bfc6b1e8677efa6de95526ce293f23bba7a8b7679cccb2f8b87ce2197903c91e2d6c6d0ad85132d293574ceebc2b724854a1669
+  data.tar.gz: f08a4ef55637bf7fafda4efb8900a3f9e93c7f6f36e1b78ace4072df8e336e12e03f3789aebaceb7c91663da52386df2bba7b6f15afb16bbfc1e44055e842521

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v3.0.10] - 2017-06-24
+
+- Allow aws sdk v3
+ - [#381](https://github.com/phstc/shoryuken/pull/381)
+
+- Allow configuring Rails via the config file 
+ - [#387](https://github.com/phstc/shoryuken/pull/387)
+
 ## [v3.0.9] - 2017-06-05
 
 - Allow configuring queue URLs instead of names

data/lib/shoryuken/environment_loader.rb

@@ -24,7 +24,7 @@ module Shoryuken
     end
 
     def load
-      load_rails if options[:rails]
+      load_rails if Shoryuken.options[:rails]
       prefix_active_job_queue_names
       parse_queues
       require_workers
@@ -120,18 +120,6 @@ module Shoryuken
 
     def validate_queues
       return Shoryuken.logger.warn { 'No queues supplied' } if Shoryuken.queues.empty?
-
-      non_existent_queues = []
-
-      Shoryuken.queues.uniq.each do |queue|
-        begin
-          Shoryuken::Client.queues(queue)
-        rescue Aws::SQS::Errors::NonExistentQueue
-          non_existent_queues << queue
-        end
-      end
-
-      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

@@ -49,21 +49,22 @@ 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
+    def set_name(name)
+      self.name = name
+      self.url  = client.get_queue_url(queue_name: name).queue_url
     rescue Aws::Errors::NoSuchEndpointError, Aws::SQS::Errors::NonExistentQueue => ex
       raise ex, "The specified queue #{name} does not exist."
     end
 
+    def set_url(url)
+      self.name = url.split('/').last
+      self.url  = url
+    end
+
+    def set_name_and_url(name_or_url)
+      name_or_url.start_with?('https://sqs.') ? set_url(name_or_url) : set_name(name_or_url)
+    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.9'.freeze
+  VERSION = '3.0.10'.freeze
 end

data/shoryuken.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'dotenv'
 
-  spec.add_dependency 'aws-sdk-core', '~> 2'
+  spec.add_dependency 'aws-sdk-core', '> 2'
   spec.add_dependency 'concurrent-ruby'
   spec.add_dependency 'thor'
 end

data/spec/shoryuken/queue_spec.rb

@@ -22,6 +22,14 @@ RSpec.describe Shoryuken::Queue do
         expect(subject.name).to eq(queue_name)
       end
     end
+
+    context 'when queue name supplied' do
+      subject { described_class.new(sqs, queue_name) }
+
+      specify do
+        expect(subject.name).to eq(queue_name)
+      end
+    end
   end
 
   describe '#delete_messages' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.0.9
+  version: 3.0.10
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency