http_api_client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTY3ZmUyYjk3ZWUxYjZkMGI4ZjFkNDAxZjk3NjAwNWFkM2E0YzFmZQ==
+    MjA1Zjg1OWU2ZWRiNmI3MWFmOGFhOGUwODk3ZTM1ZWZlOWJkZGVjNQ==
   data.tar.gz: !binary |-
-    YzBmMjIzZDc0Mjg2ZTk1NDQyMGYwMDI3MWExZDdjMjMyY2QzYWE4ZA==
+    MzZiMTgxMWEyZjc0NjczMmFiMjdhZDQzMWU4ZDNiZDA1MzIzZmZiNw==
 SHA512:
   metadata.gz: !binary |-
-    YWVjYzBiMmY4ZDExNzM4ZDIxMDFkMjdkNWQ3OWViODY0NGFlMjk0MGJiNDAz
-    MjkyMmRhNmVkMDY5M2ZhNWE2MTg3ZGJkNjg4YTI0OGE4MzFmOTZjNjg3NDQx
-    N2ZlZmIxYjEwOGIwYTg1YWZjYzlmZjI3NjFiZjRkMzlmZjY2ZGQ=
+    NmVlZjMwNTVjMGJmNjEwNDg2YzM1Nzc1ZjUyNGVkZjQ5NDYxMzlhZTJhMDRk
+    NDI3M2I2MDBkZmU2NWFlYjY3NDBhNzRlYjA0NWVmODNhMGZlYzlhYTJiNmFl
+    MTY2N2U1N2IzM2MyMDM4ZjgyNzAwMzA1YzE2NmRjNWFkYmMwNWE=
   data.tar.gz: !binary |-
-    NTkwYmNhOTVhYjU4NjU1NjNmYjFkZGMwMWIwNmMyNjU4MGRlYWU2ZTE4ZTg3
-    MjZjNjQ3ZGY4MDRlYmJiNzBjOTllMzcwNDhjYjAxMzRiOWMzOWMzMTQwOWEz
-    ZjE2ZGI2ZDA2NWNiMzJjZGM4ZTBmMTkwYjZmNmQ4MmNlOWE3YjM=
+    MzY4OWMxYjQzNzRmZmNlM2FlNGIzZTgxNzcwNmUxZWM1MDNlZWYyNDhhZjU5
+    YTNlM2FmNGY2MmNiY2VlNTNjYTFjZTQ5ODU3MzJhYmQ0OWQzMDMyNWI5ODEw
+    ZDI2NTJjMDcxZjIzZTIxOGRkZmUzMzQ0Njc0YmM2NmYzMDc1MWE=

data/README.md

@@ -149,3 +149,7 @@ This will install `/usr/local/opt/curl-ca-bundle/share/ca-bundle.crt`
 
 ### 0.1.1 - 2014-04-04
 * Allow logger to be injected
+
+### 0.1.2 - 2014-04-04
+* Update logging to be less generic to avoid clash with other log fields
+

data/lib/http_api_client/client.rb

@@ -128,10 +128,14 @@ module HttpApiClient
 
     def request_headers(base_headers, custom_headers = {})
       all_headers = base_headers.merge(custom_headers)
-      all_headers.merge!({'X-Request-Id' => Thread.current[:request_id]}) if config.include_request_id_header
+      all_headers.merge!({'X-Request-Id' => Thread.current[:request_id]}) if include_request_id_header?
       all_headers
     end
 
+    def include_request_id_header?
+      config.include_request_id_header && Thread.current[:request_id] != nil
+    end
+
     def get_headers
       {
         'Accept' => 'application/json'

data/lib/http_api_client/version.rb

@@ -1,3 +1,3 @@
 module HttpApiClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/http_client/client_spec.rb

@@ -140,15 +140,30 @@ module HttpApiClient
 
       let(:client) { Client.new(:my_client, 'spec/config/http_api_clients_with_request_id.yml') }
 
-      let(:request_id) { 'abc-123' }
+      context "with a request id in current thread" do
 
-      before do
-        Thread.current[:request_id] = request_id
+        let(:request_id) { 'abc-123' }
+
+        before do
+          Thread.current[:request_id] = request_id
+        end
+
+        it "adds the Request-Id header to the request" do
+          connection.should_receive(:get).with('/test-base-uri/path/1', {}, base_get_headers.merge('X-Request-Id' => request_id))
+          client.find('/path', 1)
+        end
       end
 
-      it "adds the Request-Id header to the request" do
-        connection.should_receive(:get).with('/test-base-uri/path/1', {}, base_get_headers.merge('X-Request-Id' => request_id))
-        client.find('/path', 1)
+      context "without a request id in current thread" do
+
+        before do
+          Thread.current[:request_id] = nil
+        end
+
+        it "does not add the Request-Id header to the request" do
+          connection.should_receive(:get).with('/test-base-uri/path/1', {}, base_get_headers)
+          client.find('/path', 1)
+        end
       end
     end
 

data/spec/http_client/timed_result_spec.rb

@@ -17,12 +17,12 @@ module HttpApiClient
       end
 
       it 'logs event with base data' do
-        logger.should_receive(:info).with("event=my_event, request_id=#{request_id}, timing=#{1000}")
+        logger.should_receive(:info).with("event_name=my_event, request_id=#{request_id}, timing=#{1000}")
         TimedResult.time('my_event') {  }
       end
 
       it 'logs event with extra data' do
-        logger.should_receive(:info).with("event=my_event, request_id=#{request_id}, timing=#{1000}, foo=bar")
+        logger.should_receive(:info).with("event_name=my_event, request_id=#{request_id}, timing=#{1000}, foo=bar")
         TimedResult.time('my_event', { foo: 'bar' }) {  }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_api_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rob Monie
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler