gds-api-adapters 30.1.0 → 30.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3faeb6ebc0f0dd3bc81f25e0ce1337105f456b
-  data.tar.gz: dd3f80e588b4bffc76b292cbf032404717a5bdeb
+  metadata.gz: caa6bb00e5f2ebd0cf88d785836ca4a034271d60
+  data.tar.gz: 89afbd1e27b272902ef2007022743cda48b8cf25
 SHA512:
-  metadata.gz: 3e0a6924f8b8462d93dfb9be1389d6b36cfdce70993bd5ba9831fb108e5e2cfcda52d04f00c7d380b95d264640e3318d275dbed8b89d83b6874e5a66d3aa47fb
-  data.tar.gz: 826ee63e166b5f6a390769aab68612f17f83509c6cb3353840ff4f690c1ffad7e1e086b21398d5544e4359b98712f1eb0de79b4746f40884d2fe1d9af8953855
+  metadata.gz: ddb41be6da100058a5f31a3680c6c9fc1773cb26415fa29c40015757ea2dc886d902ce7297e3e8f25eaedd3da95631a95c6804ad2c9ee91d90c1a9ec4c6bee43
+  data.tar.gz: 034d0c128336323787a1246633797370f787f5b20a1d2efbe4bd5f5299062a5066a8680b773390bcd175b2d9e6fefc18ede604a58467dbffaa17c066d7f3e164

data/README.md

@@ -33,8 +33,8 @@ something that actually logs:
 
 We set a unique header at the cache level called `Govuk-Request-Id`, and also
 set a header called `Govuk-Original-Url` to identify the original URL
-requested.  If apps make API requests in order to server a user's request, they
-should pass on these headers, so that we can trace requests across the entire
+requested.  If apps make API requests in order to serve a user's request, they
+should pass on these headers, so that requests can be traced across the entire
 GOV.UK stack.
 
 The `GdsApi::GovukHeaderSniffer` middleware takes care of this. This gem

data/lib/gds_api/govuk_headers.rb

@@ -9,13 +9,15 @@ module GdsApi
         header_data.select {|k, v| !(v.nil? || v.empty?) }
       end
 
-      private
+      def clear_headers
+        Thread.current[:headers] = {}
+      end
+
+    private
 
       def header_data
         Thread.current[:headers] ||= {}
       end
-
     end
   end
 end
-

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '30.1.0'
+  VERSION = '30.2.0'
 end

data/test/govuk_headers_test.rb

@@ -0,0 +1,26 @@
+require_relative "test_helper"
+require "gds_api/govuk_headers"
+
+describe GdsApi::GovukHeaders do
+  before :each do
+    Thread.current[:headers] = nil if Thread.current[:headers]
+  end
+
+  it "supports read/write of headers" do
+    GdsApi::GovukHeaders.set_header("GDS-Request-Id", "123-456")
+    GdsApi::GovukHeaders.set_header("Content-Type", "application/pdf")
+
+    assert_equal({
+      "GDS-Request-Id" => "123-456",
+      "Content-Type" => "application/pdf",
+    }, GdsApi::GovukHeaders.headers)
+  end
+
+  it "supports clearing of headers" do
+    GdsApi::GovukHeaders.set_header("GDS-Request-Id", "123-456")
+
+    GdsApi::GovukHeaders.clear_headers
+
+    assert_equal({}, GdsApi::GovukHeaders.headers)
+  end
+end

data/test/publishing_api_v2_test.rb

@@ -927,8 +927,8 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"), title: 'Content Item A', base_path: '/a-base-path' },
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"), title: 'Content Item B', base_path: '/another-base-path' },
+              { title: 'Content Item A', base_path: '/a-base-path' },
+              { title: 'Content Item B', base_path: '/another-base-path' },
             ]
           }
         )
@@ -945,7 +945,7 @@ describe GdsApi::PublishingApiV2 do
         ["pages", 1],
         ["current_page", 1],
         ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=title&fields[]=base_path&page=1", "rel"=>"self"}]],
-        ["results", [{"public_updated_at"=>"2015-07-30T13:58:11.000Z", "title"=>"Content Item A", "base_path"=>"/a-base-path"}, {"public_updated_at"=>"2015-07-30T13:58:11.000Z", "title"=>"Content Item B", "base_path"=>"/another-base-path"}]]
+        ["results", [{"title"=>"Content Item A", "base_path"=>"/a-base-path"}, {"title"=>"Content Item B", "base_path"=>"/another-base-path"}]]
       ], response.to_a
 
     end
@@ -973,7 +973,7 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "en" }
+              { content_id: @content_id, locale: "en" }
             ]
           }
         )
@@ -990,7 +990,7 @@ describe GdsApi::PublishingApiV2 do
         ["pages", 1],
         ["current_page", 1],
         ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&page=1", "rel"=>"self"}]],
-        ["results", [{"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"}]]
+        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"}]]
       ], response.to_a
     end
 
@@ -1017,7 +1017,7 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "fr" }
+              { content_id: @content_id, locale: "fr" }
             ]
           }
         )
@@ -1034,7 +1034,7 @@ describe GdsApi::PublishingApiV2 do
         ["pages", 1],
         ["current_page", 1],
         ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=fr&page=1", "rel"=>"self"}]],
-        ["results", [{"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"}]]
+        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"}]]
       ], response.to_a
     end
 
@@ -1061,9 +1061,9 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "en" },
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "fr" },
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "ar" },
+              { content_id: @content_id, locale: "en" },
+              { content_id: @content_id, locale: "fr" },
+              { content_id: @content_id, locale: "ar" },
             ]
           }
         )
@@ -1081,9 +1081,9 @@ describe GdsApi::PublishingApiV2 do
         ["links",
          [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=locale&locale=all&page=1", "rel"=>"self"}]],
         ["results",
-         [{"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"},
-          {"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"},
-          {"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"ar"}]]
+         [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"en"},
+          {"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"fr"},
+          {"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "locale"=>"ar"}]]
       ], response.to_a
     end
 
@@ -1110,7 +1110,7 @@ describe GdsApi::PublishingApiV2 do
               rel: "self"
             }],
             results: [
-              { public_updated_at: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, details: {foo: :bar} }
+              { content_id: @content_id, details: {foo: :bar} }
             ]
           }
         )
@@ -1127,7 +1127,7 @@ describe GdsApi::PublishingApiV2 do
         ["pages", 1],
         ["current_page", 1],
         ["links", [{"href"=>"http://example.org/v2/content?content_format=topic&fields[]=content_id&fields[]=details&page=1", "rel"=>"self"}]],
-        ["results", [{"public_updated_at"=>"2015-07-30T13:58:11.000Z", "content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "details"=>{"foo"=>"bar"}}]]
+        ["results", [{"content_id"=>"bed722e6-db68-43e5-9079-063f623335a7", "details"=>{"foo"=>"bar"}}]]
       ], response.to_a
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 30.1.0
+  version: 30.2.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -401,6 +401,7 @@ files:
 - test/fixtures/world_organisations_australia.json
 - test/gds_api_base_test.rb
 - test/gov_uk_delivery_test.rb
+- test/govuk_headers_test.rb
 - test/helpers_test.rb
 - test/imminence_api_test.rb
 - test/json_client_test.rb
@@ -477,6 +478,7 @@ test_files:
 - test/licence_application_api_test.rb
 - test/gov_uk_delivery_test.rb
 - test/maslow_test.rb
+- test/govuk_headers_test.rb
 - test/helpers_test.rb
 - test/panopticon_registerer_test.rb
 - test/panopticon_test.rb