govuk_sidekiq 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28d8418678a9c9f5e0ba826e3f97ca55f43d3a2aa03ecd8c66cb9818d08fcc5b
-  data.tar.gz: c772e3e16a565db487022ec79069dfa25831208a97b415d42d7a0ce36ef7750e
+  metadata.gz: 23187ce51bf6c5d63ab70c2c453f38fa3d680d207ababdf0a4d9cabe127df81e
+  data.tar.gz: a8ca1c0719c38e20dc2d49863e086e3a0f797bad92ad6a02e4768d30ae15493a
 SHA512:
-  metadata.gz: 21c143a20db81e030109de63523be78122f069e5a9e597735204011f6bf371de60194d77bb24c32988c497afd034425b8d0e787463ad276418a83f0078b0c264
-  data.tar.gz: 901c00abb0de2d7260566604c2581df3913acf44fe29cc027221bcb3091fd59994c4176c3b0dd486d6bad505fc47c3cffdd88c56dce674f13845ad4efefccfb1
+  metadata.gz: eac19e0739519cb5658bf3a6bf2785cc07c2fdeff4f1c11decb47ec4cace0046cd5237893455654475bec439ac47b16cd28c5dcbca8019513aa3b96b14fa9d71
+  data.tar.gz: 1fe68cb417ee2619c47e65d323185c697b515f70084ce66a0a4af142334505bdac7ffe31fe098a86590cad3a08180c305211976eab63d9ceec3e798b18ad40df

data/lib/govuk_sidekiq/api_headers.rb

@@ -10,7 +10,10 @@ module GovukSidekiq
       def call(worker_class, job, queue, redis_pool)
         last_arg = job["args"].last
 
-        if needs_headers(last_arg)
+        if is_header_hash(last_arg)
+          job["args"].pop
+          job["args"] << header_arguments.merge(last_arg)
+        else
           job["args"] << header_arguments
         end
 
@@ -24,9 +27,8 @@ module GovukSidekiq
         }
       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?
+      def is_header_hash(arg)
+        arg.is_a?(Hash) && (arg.symbolize_keys.keys.include?(:authenticated_user) || arg.symbolize_keys.keys.include?(:request_id))
       end
     end
 

data/lib/govuk_sidekiq/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq