shoryuken 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca967b0796d5e97753b9d201edd7aaad2e1d5c44
-  data.tar.gz: 4984a4ee2243ba5d8b42bec2e0c0b68e15b92c9f
+  metadata.gz: 1f28614380213b13c17dea0f85aae332f8e335f6
+  data.tar.gz: 34e084982c8aa8ec9b0306f04f548cc1321eec13
 SHA512:
-  metadata.gz: 8143c4a34706093177109f9d822afc711c8c88cd51c2a64653e15b8054794327e59951fccbc5990992b7d568db3cd79a1e23a1a7ec33d7a7c29837e10534f187
-  data.tar.gz: 5925db2ddbd791708c59b05a59805ca711bb82c9ef059db849568f8de9fec1619d7b52eab26cced9bb7b7e713ffd11227292c4294bbf642a49e60c35096fcb5d
+  metadata.gz: 40a160284600447798e3e1ebc61ec1e8bf596b0aa9d5558301d7f647e1ab1af285b845a9ec052eb52e157714d4066d3888f6f2192762898d9fc52decf1503a3b
+  data.tar.gz: 7f3d7584167804ad724dc3ca3a661cef8a4a60cadccebe333ceacb10333c0eb1bc7db9247439ddce875a1b7cb771769e9516afcda0ae5703991db780acd165d3

data/.rubocop.yml

@@ -32,7 +32,7 @@ Style/Alias:
 Style/PerlBackrefs:
   Enabled: false
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: false
 
 # Override the HoundCI custom rules (they do not use Rubocop defaults)
@@ -42,7 +42,7 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: single_quotes
 
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   # disabling that in favour of using:
   # long_field_test_1 = 1
   # field_test_2      = 2
@@ -67,7 +67,7 @@ Style/ClassAndModuleChildren:
 Style/CommentAnnotation:
   Enabled: false
 
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: leading
 
 Style/GuardClause:
@@ -103,7 +103,7 @@ Style/RescueModifier:
 Style/ColonMethodCall:
   Enabled: false
 
-Style/FileName:
+Naming/FileName:
   Enabled: false
 
 Style/FrozenStringLiteralComment:

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v4.0.1] - 2018-11-21
+
+- Allow caching visibility_timeout lookups
+  - [#533](https://github.com/phstc/shoryuken/pull/533)
+
+- Add queue name to inline executor
+  - [#532](https://github.com/phstc/shoryuken/pull/532)
+
 ## [v4.0.0] - 2018-11-01
 
 - Process messages to the same message group ID one by one

data/lib/shoryuken.rb

@@ -77,7 +77,9 @@ module Shoryuken
     :default_worker_options=,
     :on_start,
     :on_stop,
-    :on
+    :on,
+    :cache_visiblity_timeout?,
+    :cache_visiblity_timeout=
   )
 end
 

data/lib/shoryuken/options.rb

@@ -23,6 +23,7 @@ module Shoryuken
     @@stop_callback                   = nil
     @@worker_executor                 = Worker::DefaultExecutor
     @@launcher_executor               = nil
+    @@cache_visiblity_timeout         = false
 
     class << self
       def active_job?
@@ -220,6 +221,14 @@ module Shoryuken
       def server?
         defined?(Shoryuken::CLI)
       end
+
+      def cache_visiblity_timeout?
+        @@cache_visiblity_timeout
+      end
+
+      def cache_visiblity_timeout=(cache_visiblity_timeout)
+        @@cache_visiblity_timeout = cache_visiblity_timeout
+      end
     end
   end
 end

data/lib/shoryuken/queue.rb

@@ -14,7 +14,10 @@ module Shoryuken
     end
 
     def visibility_timeout
-      queue_attributes.attributes[VISIBILITY_TIMEOUT_ATTR].to_i
+      # Always lookup for the latest visiblity when cache is disabled
+      # setting it to nil, forces re-lookup
+      @_visibility_timeout = nil unless Shoryuken.cache_visiblity_timeout?
+      @_visibility_timeout ||= queue_attributes.attributes[VISIBILITY_TIMEOUT_ATTR].to_i
     end
 
     def delete_messages(options)

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/lib/shoryuken/worker/inline_executor.rb

@@ -2,8 +2,9 @@ module Shoryuken
   module Worker
     class InlineExecutor
       class << self
-        def perform_async(worker_class, body, _options = {})
+        def perform_async(worker_class, body, options = {})
           body = JSON.dump(body) if body.is_a?(Hash)
+          queue_name = options.delete(:queue) || worker_class.get_shoryuken_options['queue']
 
           sqs_msg = OpenStruct.new(
             body: body,
@@ -13,7 +14,8 @@ module Shoryuken
             message_attributes: nil,
             message_id: nil,
             receipt_handle: nil,
-            delete: nil
+            delete: nil,
+            queue_name: queue_name
           )
 
           call(worker_class, sqs_msg)

data/spec/shoryuken/queue_spec.rb

@@ -234,4 +234,41 @@ RSpec.describe Shoryuken::Queue do
       end
     end
   end
+
+  describe '#visiblity_timeout' do
+    let(:attribute_response) { double 'Aws::SQS::Types::GetQueueAttributesResponse' }
+
+    before do
+      allow(attribute_response).to(
+        receive(:attributes).and_return('VisibilityTimeout' => 30)
+      )
+      allow(subject).to receive(:url).and_return(queue_url)
+    end
+
+    context 'when cache is disabled' do
+      specify do
+        Shoryuken.cache_visiblity_timeout = false
+
+        expect(sqs).to(
+          receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response).exactly(3).times
+        )
+        expect(subject.visibility_timeout).to eq(30)
+        expect(subject.visibility_timeout).to eq(30)
+        expect(subject.visibility_timeout).to eq(30)
+      end
+    end
+
+    context 'when cache is enabled' do
+      it 'memoizes response' do
+        Shoryuken.cache_visiblity_timeout = true
+
+        expect(sqs).to(
+          receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response).once
+        )
+        expect(subject.visibility_timeout).to eq(30)
+        expect(subject.visibility_timeout).to eq(30)
+        expect(subject.visibility_timeout).to eq(30)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -61,6 +61,8 @@ RSpec.configure do |config|
 
     Shoryuken.sqs_client_receive_message_opts.clear
 
+    Shoryuken.cache_visiblity_timeout = false
+
     allow(Concurrent).to receive(:global_io_executor).and_return(Concurrent::ImmediateExecutor.new)
     allow(Shoryuken).to receive(:active_job?).and_return(false)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler