gds-api-adapters 27.0.0 → 27.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5601500bc73e6401843858f7f7bdd8e70f82963
-  data.tar.gz: 479957e64e4c38b8a16946d8903843bdb2a93972
+  metadata.gz: 2cc5c429a92aa4d47b59848ce81b9e9504c9fab8
+  data.tar.gz: 7fc82ec64a0798bdcc0757f0f2623f2670f42160
 SHA512:
-  metadata.gz: 3cd53fd771715e3f0670a359287a96b1a90efc27bb76fc7f0bcf0cb799beae8b3cf6119023ca96df220ae9f457024a4207929d7798650ae0bbfd58a57ad6fd26
-  data.tar.gz: b51ff2b5bfeadff897d9e889e984206b052ce9bffdd2428729509f1291b945fba0cd0397d4ae85eb3b61426f765bb5fb281720bc85249d2e9265971255f16872
+  metadata.gz: 0836a94e3cb61226df632dfff455226282b89e3df98cfbe83ecf5ee854602c1786a6c1c3544b39495e07a99e6cb1666266512acefe76684a1447aefb0f352415
+  data.tar.gz: 838dc7fcc6d4b5c2cde66ad9f6a069840f597b0464c194784ee901af5579acbb7b3fc4d5f12c531f3cd2c3035810271041da20b329f129aaa7e45ac7210f871e

data/lib/gds_api/exceptions.rb

@@ -14,10 +14,11 @@ module GdsApi
   class HTTPErrorResponse < BaseError
     attr_accessor :code, :error_details
 
-    def initialize(code, message = nil, error_details = nil)
+    def initialize(code, message = nil, error_details = nil, request_body = nil)
       super(message)
       @code = code
       @error_details = error_details
+      @request_body = request_body
     end
   end
 
@@ -52,8 +53,8 @@ module GdsApi
       ignoring([HTTPNotFound, HTTPGone], &block)
     end
 
-    def build_specific_http_error(error, url, details = nil)
-      message = "url: #{url}\n#{error.http_body}"
+    def build_specific_http_error(error, url, details = nil, request_body = nil)
+      message = "URL: #{url}\nResponse body:\n#{error.http_body}\n\nRequest body:\n#{request_body}"
       code = error.http_code
 
       case code

data/lib/gds_api/json_client.rb

@@ -121,7 +121,7 @@ module GdsApi
     def do_raw_request(method, url, params = nil)
       response = do_request(method, url, params)
     rescue RestClient::Exception => e
-      raise build_specific_http_error(e, url)
+      raise build_specific_http_error(e, url, nil, params)
     end
 
     # method: the symbolic name of the method to use, e.g. :get, :post
@@ -141,7 +141,7 @@ module GdsApi
         rescue JSON::ParserError
           nil
         end
-        raise build_specific_http_error(e, url, error_details)
+        raise build_specific_http_error(e, url, error_details, params)
       end
 
       # If no custom response is given, just instantiate Response

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -4,13 +4,15 @@ require 'json'
 module GdsApi
   module TestHelpers
     module EmailAlertApi
+      EMAIL_ALERT_API_ENDPOINT = Plek.find("email-alert-api")
+
       def email_alert_api_has_subscriber_list(attributes)
         title = attributes.fetch("title")
         tags = attributes.fetch("tags")
 
         query = Rack::Utils.build_nested_query(tags: tags)
 
-        stub_request(:get, "http://some-domain/subscriber-lists?#{query}")
+        stub_request(:get, subscriber_lists_url(query))
           .to_return(
             :status => 200,
             :body => get_subscriber_list_response(attributes).to_json,
@@ -20,12 +22,12 @@ module GdsApi
       def email_alert_api_does_not_have_subscriber_list(attributes)
         query = Rack::Utils.build_nested_query(tags: attributes.fetch("tags"))
 
-        stub_request(:get, "http://some-domain/subscriber-lists?#{query}")
+        stub_request(:get, subscriber_lists_url(query))
           .to_return(status: 404)
       end
 
       def email_alert_api_creates_subscriber_list(attributes)
-        stub_request(:post, "http://some-domain/subscriber-lists")
+        stub_request(:post, subscriber_lists_url)
           .to_return(
             :status => 201,
             :body => get_subscriber_list_response(attributes).to_json,
@@ -33,7 +35,7 @@ module GdsApi
       end
 
       def email_alert_api_refuses_to_create_subscriber_list
-        stub_request(:post, "http://some-domain/subscriber-lists")
+        stub_request(:post, subscriber_lists_url)
           .to_return(
             :status => 422,
           )
@@ -54,7 +56,7 @@ module GdsApi
       end
 
       def email_alert_api_accepts_alert
-        stub_request(:post, "http://some-domain/notifications")
+        stub_request(:post, notifications_url)
           .to_return(
             :status => 202,
             :body => {}.to_json,
@@ -64,6 +66,17 @@ module GdsApi
       def post_alert_response
         {}
       end
+
+    private
+
+      def subscriber_lists_url(query = nil)
+        url = EMAIL_ALERT_API_ENDPOINT + "/subscriber-lists"
+        query ? "#{url}?#{query}" : url
+      end
+
+      def notifications_url
+        EMAIL_ALERT_API_ENDPOINT + "/notifications"
+      end
     end
   end
 end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '27.0.0'
+  VERSION = '27.1.0'
 end

data/test/content_store_test.rb

@@ -45,7 +45,7 @@ describe GdsApi::ContentStore do
       end
 
       assert_equal 404, e.code
-      assert_equal "url: #{@base_api_url}/content/non-existent", e.message.strip
+      assert_equal "URL: #{@base_api_url}/content/non-existent\nResponse body:\n\n\nRequest body:", e.message.strip
     end
   end
 

data/test/email_alert_api_test.rb

@@ -5,7 +5,7 @@ require 'gds_api/test_helpers/email_alert_api'
 describe GdsApi::EmailAlertApi do
   include GdsApi::TestHelpers::EmailAlertApi
 
-  let(:base_url)      { "http://some-domain" }
+  let(:base_url)      { Plek.find("email-alert-api") }
   let(:api_client)    { GdsApi::EmailAlertApi.new(base_url) }
 
   let(:title) { "Some Title" }

data/test/publishing_api_v2_test.rb

@@ -925,6 +925,102 @@ describe GdsApi::PublishingApiV2 do
         { 'title' => 'Content Item B', 'base_path' => '/another-base-path' },
       ], response.to_a
     end
+
+    it "returns the content items in english locale by default" do
+      publishing_api
+        .given("a content item exists in multiple locales with content_id: #{@content_id}")
+        .upon_receiving("a get entries request")
+        .with(
+          method: :get,
+          path: "/v2/content",
+          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale",
+          headers: {
+            "Content-Type" => "application/json",
+          },
+        )
+        .will_respond_with(
+          status: 200,
+          body: [
+            { content_id: @content_id, locale: "en" },
+          ]
+        )
+
+      response = @api_client.get_content_items(
+        content_format: 'topic',
+        fields: [:content_id, :locale],
+      )
+
+      assert_equal 200, response.code
+      assert_equal [
+        { 'content_id' => @content_id, 'locale' => 'en' },
+      ], response.to_a
+    end
+
+    it "returns the content items in a specific locale" do
+      publishing_api
+        .given("a content item exists in multiple locales with content_id: #{@content_id}")
+        .upon_receiving("a get entries request with a specific locale")
+        .with(
+          method: :get,
+          path: "/v2/content",
+          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=fr",
+          headers: {
+            "Content-Type" => "application/json",
+          },
+        )
+        .will_respond_with(
+          status: 200,
+          body: [
+            { content_id: @content_id, locale: "fr" },
+          ]
+        )
+
+      response = @api_client.get_content_items(
+        content_format: 'topic',
+        fields: [:content_id, :locale],
+        locale: 'fr',
+      )
+
+      assert_equal 200, response.code
+      assert_equal [
+        { 'content_id' => @content_id, 'locale' => 'fr' },
+      ], response.to_a
+    end
+
+    it "returns the content items in all the available locales" do
+      publishing_api
+        .given("a content item exists in multiple locales with content_id: #{@content_id}")
+        .upon_receiving("a get entries request with an 'all' locale")
+        .with(
+          method: :get,
+          path: "/v2/content",
+          query: "content_format=topic&fields%5B%5D=content_id&fields%5B%5D=locale&locale=all",
+          headers: {
+            "Content-Type" => "application/json",
+          },
+        )
+        .will_respond_with(
+          status: 200,
+          body: [
+            { content_id: @content_id, locale: "en" },
+            { content_id: @content_id, locale: "fr" },
+            { content_id: @content_id, locale: "ar" },
+          ]
+        )
+
+      response = @api_client.get_content_items(
+        content_format: 'topic',
+        fields: [:content_id, :locale],
+        locale: 'all',
+      )
+
+      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' },
+      ], response.to_a
+    end
   end
 
   describe "#discard_draft(content_id, options = {})" do

data/test/router_test.rb

@@ -447,7 +447,7 @@ describe GdsApi::Router do
 
         refute_nil e
         assert_equal 500, e.code
-        assert_equal "url: #{@base_api_url}/routes/commit\nFailed to update all routers", e.message
+        assert_equal "URL: #{@base_api_url}/routes/commit\nResponse body:\nFailed to update all routers\n\nRequest body:\n{}", e.message
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 27.0.0
+  version: 27.1.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek