gds-api-adapters 29.6.0 → 30.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9740e0fbf18097b3bda609a31d95238d536d5f19
-  data.tar.gz: f32388c9c90841aca6e94ac516cbddf429e2a92a
+  metadata.gz: 6ab8783155352f11f32c97275ef35508aa27d8d4
+  data.tar.gz: a15871cab7d6e04b6bac22c40d31085545ab3323
 SHA512:
-  metadata.gz: 1dc950579af1a75714fa5b17133a64720b070bbe88867f23eb1b62de5bf447979c7c5042aa478b69bb5b657f2b752e3d1f0131dda67c1c35604cedd709a83ef3
-  data.tar.gz: e1fc3c89d8bb44abb11b5b6f4bbd06e288983abf93cb416dc00b73ae39f456bf1ae82d57f8cc8a5be0fdf47fd20e69412a3a6a9d3e318f4f63e209be87311538
+  metadata.gz: 11c3b21520b1de0e6a0793304b237b8803e2a60866b6a12d13123160457b287e8320995c571b489f1f40344c899ea4ef7b5e9117223bf2c62fb881b92c108935
+  data.tar.gz: a9ba8f5bfca018a8b2861d3e58f3e752481f876725895863bec0d2d655e1ddd06289415bf5c55b11389fa942ac5fcc260e700a333a266705dac886fb7f874256

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -134,7 +134,7 @@ module GdsApi
         end
       end
 
-      def publishing_api_has_fields_for_format(format, items, fields)
+      def publishing_api_has_fields_for_document(format, items, fields)
         body = Array(items).map { |item|
           item.with_indifferent_access.slice(*fields)
         }
@@ -143,9 +143,9 @@ module GdsApi
           "&fields%5B%5D=#{f}"
         }
 
-        url = PUBLISHING_API_V2_ENDPOINT + "/content?content_format=#{format}#{query_params.join('')}"
+        url = PUBLISHING_API_V2_ENDPOINT + "/content?document_type=#{format}#{query_params.join('')}"
 
-        stub_request(:get, url).to_return(:status => 200, :body => body.to_json, :headers => {})
+        stub_request(:get, url).to_return(:status => 200, :body => { results: body }.to_json, :headers => {})
       end
 
       def publishing_api_has_linkables(linkables, document_type:)

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '29.6.0'
+  VERSION = '30.0.0'
 end

data/test/publishing_api_v2_test.rb

@@ -918,10 +918,19 @@ describe GdsApi::PublishingApiV2 do
         )
         .will_respond_with(
           status: 200,
-          body: [
-            { title: 'Content Item A', base_path: '/a-base-path' },
-            { title: 'Content Item B', base_path: '/another-base-path' },
-          ]
+          body: {
+            total: 2,
+            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: 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' },
+            ]
+          }
         )
 
       response = @api_client.get_content_items(
@@ -930,10 +939,15 @@ describe GdsApi::PublishingApiV2 do
       )
 
       assert_equal 200, response.code
+
       assert_equal [
-        { 'title' => 'Content Item A', 'base_path' => '/a-base-path' },
-        { 'title' => 'Content Item B', 'base_path' => '/another-base-path' },
+        ["total", 2],
+        ["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"}]]
       ], response.to_a
+
     end
 
     it "returns the content items in english locale by default" do
@@ -950,9 +964,18 @@ describe GdsApi::PublishingApiV2 do
         )
         .will_respond_with(
           status: 200,
-          body: [
-            { content_id: @content_id, locale: "en" },
-          ]
+          body: {
+            total: 1,
+            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: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "en" }
+            ]
+          }
         )
 
       response = @api_client.get_content_items(
@@ -961,8 +984,13 @@ describe GdsApi::PublishingApiV2 do
       )
 
       assert_equal 200, response.code
+
       assert_equal [
-        { 'content_id' => @content_id, 'locale' => 'en' },
+        ["total", 1],
+        ["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"}]]
       ], response.to_a
     end
 
@@ -980,9 +1008,18 @@ describe GdsApi::PublishingApiV2 do
         )
         .will_respond_with(
           status: 200,
-          body: [
-            { content_id: @content_id, locale: "fr" },
-          ]
+          body: {
+            total: 1,
+            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: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, locale: "fr" }
+            ]
+          }
         )
 
       response = @api_client.get_content_items(
@@ -993,7 +1030,11 @@ describe GdsApi::PublishingApiV2 do
 
       assert_equal 200, response.code
       assert_equal [
-        { 'content_id' => @content_id, 'locale' => 'fr' },
+        ["total", 1],
+        ["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"}]]
       ], response.to_a
     end
 
@@ -1011,11 +1052,20 @@ describe GdsApi::PublishingApiV2 do
         )
         .will_respond_with(
           status: 200,
-          body: [
-            { content_id: @content_id, locale: "en" },
-            { content_id: @content_id, locale: "fr" },
-            { content_id: @content_id, locale: "ar" },
-          ]
+          body: {
+            total: 3,
+            pages: 1,
+            current_page: 1,
+            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: 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" },
+            ]
+          }
         )
 
       response = @api_client.get_content_items(
@@ -1026,9 +1076,14 @@ describe GdsApi::PublishingApiV2 do
 
       assert_equal 200, response.code
       assert_equal [
-        { 'content_id' => @content_id, 'locale' => 'en' },
-        { 'content_id' => @content_id, 'locale' => 'fr' },
-        { 'content_id' => @content_id, 'locale' => 'ar' },
+        ["total", 3],
+        ["pages", 1], ["current_page", 1],
+        ["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"}]]
       ], response.to_a
     end
 
@@ -1046,9 +1101,18 @@ describe GdsApi::PublishingApiV2 do
         )
         .will_respond_with(
           status: 200,
-          body: [
-            { content_id: @content_id, details: {foo: :bar} },
-          ]
+          body: {
+            total: 1,
+            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: Pact.like("2015-07-30T13:58:11.000Z"),  content_id: @content_id, details: {foo: :bar} }
+            ]
+          }
         )
 
       response = @api_client.get_content_items(
@@ -1057,8 +1121,13 @@ describe GdsApi::PublishingApiV2 do
       )
 
       assert_equal 200, response.code
+
       assert_equal [
-        { 'content_id' => @content_id, 'details' => {"foo"=>"bar"} },
+        ["total", 1],
+        ["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"}}]]
       ], response.to_a
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 29.6.0
+  version: 30.0.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -460,54 +460,54 @@ signing_key:
 specification_version: 4
 summary: Adapters to work with GDS APIs
 test_files:
-- test/content_api_test.rb
-- test/json_client_test.rb
-- test/content_store_test.rb
-- test/publishing_api_test.rb
-- test/business_support_api_test.rb
-- test/middleware/govuk_header_sniffer_test.rb
-- test/whitehall_admin_api_test.rb
-- test/list_response_test.rb
-- test/maslow_test.rb
-- test/panopticon_registerer_test.rb
-- test/support_test.rb
-- test/asset_manager_test.rb
-- test/helpers_test.rb
-- test/licence_application_api_test.rb
-- test/test_helper.rb
-- test/publisher_api_test.rb
+- test/support_api_test.rb
 - test/mapit_test.rb
-- test/rummager_helpers_test.rb
-- test/publishing_api_v2_test.rb
+- test/publishing_api_test.rb
 - test/publishing_api_v2/lookup_test.rb
-- test/support_api_test.rb
-- test/organisations_api_test.rb
-- test/gds_api_base_test.rb
-- test/router_test.rb
+- test/whitehall_admin_api_test.rb
+- test/pp_data_in_test.rb
 - test/publishing_api/special_route_publisher_test.rb
-- test/external_link_tracker_test.rb
-- test/fact_cave_test.rb
 - test/need_api_test.rb
+- test/publisher_api_test.rb
+- test/rummager_helpers_test.rb
+- test/support_test.rb
 - test/content_register_test.rb
+- test/fact_cave_test.rb
+- test/test_helpers/publishing_api_test.rb
+- test/test_helpers/pact_helper.rb
+- test/test_helpers/panopticon_test.rb
+- test/test_helpers/email_alert_api_test.rb
+- test/test_helpers/publishing_api_v2_test.rb
+- test/licence_application_api_test.rb
+- test/gov_uk_delivery_test.rb
+- test/maslow_test.rb
+- test/helpers_test.rb
+- test/panopticon_registerer_test.rb
 - test/panopticon_test.rb
-- test/pp_data_in_test.rb
+- test/middleware/govuk_header_sniffer_test.rb
+- test/rummager_test.rb
+- test/json_client_test.rb
+- test/email_alert_api_test.rb
+- test/content_api_test.rb
+- test/response_test.rb
+- test/organisations_api_test.rb
+- test/imminence_api_test.rb
+- test/content_store_test.rb
+- test/asset_manager_test.rb
 - test/fixtures/hello.txt
 - test/fixtures/new_policies_for_dwp.json
+- test/fixtures/world_organisations_australia.json
 - test/fixtures/no_services_and_info_data_found_fixture.json
-- test/fixtures/services_and_info_fixture.json
 - test/fixtures/old_policies_for_dwp.json
-- test/fixtures/world_organisations_australia.json
+- test/fixtures/services_and_info_fixture.json
 - test/fixtures/sub_sector_organisations.json
 - test/fixtures/finder_api/cma-case-schema.json
+- test/router_test.rb
+- test/list_response_test.rb
+- test/external_link_tracker_test.rb
+- test/gds_api_base_test.rb
 - test/worldwide_api_test.rb
-- test/test_helpers/publishing_api_test.rb
-- test/test_helpers/publishing_api_v2_test.rb
-- test/test_helpers/pact_helper.rb
-- test/test_helpers/panopticon_test.rb
-- test/test_helpers/email_alert_api_test.rb
-- test/gov_uk_delivery_test.rb
-- test/imminence_api_test.rb
-- test/email_alert_api_test.rb
-- test/response_test.rb
-- test/rummager_test.rb
+- test/test_helper.rb
+- test/publishing_api_v2_test.rb
+- test/business_support_api_test.rb
 has_rdoc: