ddy_remote_resource 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a921abd25953a42365c383740ed5bdea703c04
-  data.tar.gz: 5644b3a134c6ff76ae816852f8c13a2b79d00260
+  metadata.gz: 5a258ef2eff87f5be59c4093c6828fc2e0731690
+  data.tar.gz: 7f57020b0b01dad3bdb83f9de6f065e8c9fbf3c4
 SHA512:
-  metadata.gz: 9a2b24dd6b7de07771f6f8f3d9722ff7b53732ea28732e0897b4faca27c1606dbaa7f25c2a9f11b8298898259e77092d6ac22af940c2c17698de4c8590478ad1
-  data.tar.gz: f31164b21417e9005a09cedfa277ec5f186218ffb81bfa471bfa8ebbd6241e1494e94bee62b9762ae9b8dcecdd7657846fd5a906f6986665f307dec294b4c9bd
+  metadata.gz: 95d6b936bdbb2f51688872015867a5f8f5adf5c825ef75c73f451717805284c934ceeb2e4fb2f0de44b622628690ad9757662b0854e0a24f321385060de7b8d2
+  data.tar.gz: 52d4ec2f67b9be0f016c07d9471ac9451b6df1bb873f6a071df23453932ddbe861a6263eb60a72a61c100e64feddb37978f06f0c428296349b3181b15869760f

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in remote_resource.gemspec
 gemspec
 
-gem 'webmock', github: 'JanDintel/webmock', branch: ' feature/ignore-json-keys-order'
+gem 'webmock', git: 'https://github.com/JanDintel/webmock.git', branch: 'feature/ignore-json-keys-order'

data/lib/remote_resource/request.rb

@@ -106,6 +106,7 @@ module RemoteResource
     def conditional_headers
       headers = {}
       headers = headers.merge(DEFAULT_CONTENT_TYPE) if body.present?
+      headers = headers.merge({ 'X-Request-Id' => Thread.current[:request_id] }) if Thread.current[:request_id].present?
       headers
     end
 

data/lib/remote_resource/version.rb

@@ -1,3 +1,3 @@
 module RemoteResource
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/lib/remote_resource/request_spec.rb

@@ -528,8 +528,9 @@ RSpec.describe RemoteResource::Request do
     end
 
     context 'when conditional_headers are present' do
+      let(:http_action) { 'post' }
+
       context 'when a body is present' do
-        let(:http_action) { 'post' }
         let(:expected_headers) do
           { 'Accept' => 'application/json', 'User-Agent' => "RemoteResource #{RemoteResource::VERSION}", 'Content-Type' => 'application/json' }
         end
@@ -538,6 +539,24 @@ RSpec.describe RemoteResource::Request do
           expect(request.headers).to eql expected_headers
         end
       end
+
+      context 'when Thread.current[:request_id] is present' do
+        before do
+          Thread.current[:request_id] = 'CASCADING-REQUEST-ID'
+        end
+
+        after do
+          Thread.current[:request_id] = nil
+        end
+
+        let(:expected_headers) do
+          { 'Accept' => 'application/json', 'User-Agent' => "RemoteResource #{RemoteResource::VERSION}", 'Content-Type' => 'application/json', 'X-Request-Id' => 'CASCADING-REQUEST-ID' }
+        end
+
+        it 'returns the default headers with the X-Request-Id header' do
+          expect(request.headers).to eql expected_headers
+        end
+      end
     end
   end
 

data/spec/lib/remote_resource/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe RemoteResource::VERSION do
-  it { is_expected.to eql '1.0.0' }
+  it { is_expected.to eql '1.0.1' }
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddy_remote_resource
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jan van der Pas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler