gds-api-adapters 31.4.0 → 32.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d2d6fa7d1e06178938f8bfc2dfc9c2dff6cce9
-  data.tar.gz: a353fc5d44e6190d2b33ea88279992122081edd5
+  metadata.gz: ea71976a45af00221c91a69f9bf5e880913339ec
+  data.tar.gz: f25bf52a8ef88d54cd83080c80b87ba7d8a9c96a
 SHA512:
-  metadata.gz: d4ceec5bd237d900a3a3d4eec48212afd6f8665b1ed4efe26babbb481ba2e18b89b120fb9c1c279ba98f1359785e3c2a5fe2276387d28ccd413c3b22dd7baf1d
-  data.tar.gz: 30304753613699ff2c9f81ca7be4dd0bd89016f8b20eafb5b2b627cf71aebb822a03fb5a64b63aaf9d061180c69763d69bba312fdfb75c0df4732186ec5b8358
+  metadata.gz: 65a1b28bb05b35f6a4fc8bc91c0733dc0672107a5dd2f8201d68bc6ad5002f69b4aeda420024219032009afb52d13b5515f92fac20a1d278d2363affd2b5a2a8
+  data.tar.gz: 7ac7469c0bb5b2221d4ed36b1694ac8f2ccf436020eaaeaa20137ac955bd36a9b19c07478c28a4cf1dfae020af9e092248dc699bb041d3398a8f667c3e636cc5

data/README.md

@@ -14,7 +14,7 @@ Example adapters for frequently used applications:
 
 - [Publishing API](lib/gds_api/publishing_api_v2.rb) ([docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/PublishingApiV2), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/publishing_api_v2.rb), [test helper docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/TestHelpers/PublishingApiV2))
 - [Content Store](lib/gds_api/content_store.rb) ([docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/ContentStore), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/content_store.rb), [test helper docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/TestHelpers/ContentStore))
-- [Rummager](lib/gds_api/publishing_api_v2.rb) ([docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/Rummager), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/rummager.rb), [test helper docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/TestHelpers/Rummager))
+- [Rummager](lib/gds_api/rummager.rb) ([docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/Rummager), [test helper code](https://github.com/alphagov/gds-api-adapters/blob/master/lib/gds_api/test_helpers/rummager.rb), [test helper docs](http://www.rubydoc.info/github/alphagov/gds-api-adapters/master/GdsApi/TestHelpers/Rummager))
 
 ## Logging
 

data/lib/gds_api/test_helpers/rummager.rb

@@ -4,17 +4,19 @@ require 'gds_api/test_helpers/json_client_helper'
 module GdsApi
   module TestHelpers
     module Rummager
+      RUMMAGER_ENDPOINT = Plek.current.find('rummager')
+
       def stub_any_rummager_post
-        stub_request(:post, %r{#{Plek.new.find('search')}/documents})
+        stub_request(:post, %r{#{RUMMAGER_ENDPOINT}/documents})
       end
 
       def stub_any_rummager_post_with_queueing_enabled
-        stub_request(:post, %r{#{Plek.new.find('search')}/documents}) \
+        stub_request(:post, %r{#{RUMMAGER_ENDPOINT}/documents}) \
           .to_return(status: [202, "Accepted"])
       end
 
       def assert_rummager_posted_item(attributes)
-        url = Plek.new.find('search') + "/documents"
+        url = RUMMAGER_ENDPOINT + "/documents"
         assert_requested(:post, url) do |req|
           data = JSON.parse(req.body)
           attributes.to_a.all? do |key, value|
@@ -25,23 +27,26 @@ module GdsApi
 
       # @deprecated Rummager.delete_docment is deprecated, so is this stub!  Use `stub_any_rummager_delete_content`
       def stub_any_rummager_delete
-        stub_request(:delete, %r{#{Plek.new.find('search')}/documents/.*})
+        warn "stub_any_rummager_delete is deprecated, instead use: stub_any_rummager_delete_content"
+        stub_request(:delete, %r{#{RUMMAGER_ENDPOINT}/documents/.*})
       end
 
       def stub_any_rummager_delete_content
-        stub_request(:delete, %r{#{Plek.new.find('search')}/content.*})
+        stub_request(:delete, %r{#{RUMMAGER_ENDPOINT}/content.*})
       end
 
       # @deprecated Rummager.delete_docment is deprecated, so is this stub!  Use `assert_rummager_deleted_content`
       def assert_rummager_deleted_item(id)
+        warn "assert_rummager_deleted_item stub is deprecated, instead use: assert_rummager_deleted_content"
+
         if id =~ %r{^/}
           raise ArgumentError, 'Rummager id must not start with a slash'
         end
-        assert_requested(:delete, %r{#{Plek.new.find('search')}/documents/#{id}})
+        assert_requested(:delete, %r{#{RUMMAGER_ENDPOINT}/documents/#{id}})
       end
 
       def assert_rummager_deleted_content(base_path)
-        assert_requested(:delete, %r{#{Plek.new.find('search')}/content.*#{base_path}})
+        assert_requested(:delete, %r{#{RUMMAGER_ENDPOINT}/content.*#{base_path}})
       end
 
       def rummager_has_services_and_info_data_for_organisation

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '31.4.0'
+  VERSION = '32.0.0'
 end

data/test/govuk_headers_test.rb

@@ -6,6 +6,10 @@ describe GdsApi::GovukHeaders do
     Thread.current[:headers] = nil if Thread.current[:headers]
   end
 
+  after :each do
+    GdsApi::GovukHeaders.clear_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")

data/test/publishing_api_v2_test.rb

@@ -286,6 +286,124 @@ describe GdsApi::PublishingApiV2 do
       end
     end
 
+    describe "when a content item exists in with a superseded version" do
+      describe "when requesting the superseded version" do
+        before do
+          @content_item = content_item_for_content_id(@content_id)
+
+          publishing_api
+            .given("a content item exists in with a superseded version with content_id: #{@content_id}")
+            .upon_receiving("a request to return the superseded content item")
+            .with(
+              method: :get,
+              path: "/v2/content/#{@content_id}",
+              query: "version=1",
+            )
+            .will_respond_with(
+              status: 200,
+              body: {
+                "content_id" => @content_id,
+                "document_type" => Pact.like("special_route"),
+                "schema_name" => Pact.like("special_route"),
+                "publishing_app" => Pact.like("publisher"),
+                "rendering_app" => Pact.like("frontend"),
+                "locale" => Pact.like("en"),
+                "routes" => Pact.like([{}]),
+                "public_updated_at" => Pact.like("2015-07-30T13:58:11.000Z"),
+                "details" => Pact.like({}),
+                "publication_state" => "superseded"
+              },
+              headers: {
+                "Content-Type" => "application/json; charset=utf-8",
+              },
+            )
+        end
+
+        it "responds with 200 and the superseded content item" do
+          response = @api_client.get_content(@content_id, version: 1)
+          assert_equal 200, response.code
+          assert_equal response["publication_state"], "superseded"
+        end
+      end
+
+      describe "when requesting the published version" do
+        before do
+          @content_item = content_item_for_content_id(@content_id)
+
+          publishing_api
+            .given("a content item exists in with a superseded version with content_id: #{@content_id}")
+            .upon_receiving("a request to return the published content item")
+            .with(
+              method: :get,
+              path: "/v2/content/#{@content_id}",
+              query: "version=2",
+            )
+            .will_respond_with(
+              status: 200,
+              body: {
+                "content_id" => @content_id,
+                "document_type" => Pact.like("special_route"),
+                "schema_name" => Pact.like("special_route"),
+                "publishing_app" => Pact.like("publisher"),
+                "rendering_app" => Pact.like("frontend"),
+                "locale" => Pact.like("en"),
+                "routes" => Pact.like([{}]),
+                "public_updated_at" => Pact.like("2015-07-30T13:58:11.000Z"),
+                "details" => Pact.like({}),
+                "publication_state" => "live"
+              },
+              headers: {
+                "Content-Type" => "application/json; charset=utf-8",
+              },
+            )
+        end
+
+        it "responds with 200 and the published content item" do
+          response = @api_client.get_content(@content_id, version: 2)
+          assert_equal 200, response.code
+          assert_equal response["publication_state"], "live"
+        end
+      end
+
+      describe "when requesting no specific version" do
+        before do
+          @content_item = content_item_for_content_id(@content_id)
+
+          publishing_api
+            .given("a content item exists in with a superseded version with content_id: #{@content_id}")
+            .upon_receiving("a request to return the content item")
+            .with(
+              method: :get,
+              path: "/v2/content/#{@content_id}",
+            )
+            .will_respond_with(
+              status: 200,
+              body: {
+                "content_id" => @content_id,
+                "document_type" => Pact.like("special_route"),
+                "schema_name" => Pact.like("special_route"),
+                "publishing_app" => Pact.like("publisher"),
+                "rendering_app" => Pact.like("frontend"),
+                "locale" => Pact.like("en"),
+                "routes" => Pact.like([{}]),
+                "public_updated_at" => Pact.like("2015-07-30T13:58:11.000Z"),
+                "details" => Pact.like({}),
+                "publication_state" => "live"
+              },
+              headers: {
+                "Content-Type" => "application/json; charset=utf-8",
+              },
+            )
+        end
+
+        it "responds with 200 and the published content item" do
+          response = @api_client.get_content(@content_id)
+          assert_equal 200, response.code
+          assert_equal response["publication_state"], "live"
+        end
+      end
+    end
+
     describe "a non-existent item" do
       before do
         publishing_api

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 31.4.0
+  version: 32.0.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek