govuk_sidekiq 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1be19282faabbf2677cfc7ef513a07b7eba4cf58
-  data.tar.gz: 95c1fe848d469231ec76263a56a6094dd85d7c6c
+SHA256:
+  metadata.gz: 28d8418678a9c9f5e0ba826e3f97ca55f43d3a2aa03ecd8c66cb9818d08fcc5b
+  data.tar.gz: c772e3e16a565db487022ec79069dfa25831208a97b415d42d7a0ce36ef7750e
 SHA512:
-  metadata.gz: 5dae35a20d6f158cff09780b6b1d3bea5bef9ca8e24c2588e05136dda98249650224270ca6b3ed1f93827038e48f7f6b10c4fa61c6badc7cb0ce4f795548392f
-  data.tar.gz: 9a13810fcecd5bb5068f357f043507379f106e2808f8e6f61adb2437fcf4166e966b91e17229e6ef3baaa07e4ae637cb1e1361297c8ecc5ad0b1b6676e5499a5
+  metadata.gz: 21c143a20db81e030109de63523be78122f069e5a9e597735204011f6bf371de60194d77bb24c32988c497afd034425b8d0e787463ad276418a83f0078b0c264
+  data.tar.gz: 901c00abb0de2d7260566604c2581df3913acf44fe29cc027221bcb3091fd59994c4176c3b0dd486d6bad505fc47c3cffdd88c56dce674f13845ad4efefccfb1

data/lib/govuk_sidekiq/api_headers.rb

@@ -8,7 +8,12 @@ module GovukSidekiq
     # https://github.com/mperham/sidekiq/wiki/Middleware#client-side-middleware
     class ClientMiddleware
       def call(worker_class, job, queue, redis_pool)
-        job["args"] << header_arguments
+        last_arg = job["args"].last
+
+        if needs_headers(last_arg)
+          job["args"] << header_arguments
+        end
+
         yield
       end
 
@@ -18,6 +23,11 @@ module GovukSidekiq
           request_id: GdsApi::GovukHeaders.headers[:govuk_request_id],
         }
       end
+
+      def needs_headers(last_arg)
+        has_args = last_arg.is_a?(Hash) && last_arg.symbolize_keys.keys.include?(:authenticated_user) && last_arg.symbolize_keys.keys.include?(:request_id)
+        !has_args && header_arguments[:authenticated_user].present? && header_arguments[:request_id].present?
+      end
     end
 
     # Server-side middleware runs 'around' job processing.

data/lib/govuk_sidekiq/version.rb

@@ -1,3 +1,3 @@
 module GovukSidekiq
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
-- Elliot Crosby-McCullough
+- GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -158,12 +158,12 @@ dependencies:
         version: '1.10'
 description: 
 email:
-- elliot.cm@gmail.com
+- govuk-dev@digital.cabinet-office.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENCE.txt
+- LICENCE
 - README.md
 - lib/govuk_sidekiq.rb
 - lib/govuk_sidekiq/api_headers.rb
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides standard setup and behaviour for Sidekiq in GOV.UK applications.