gds-api-adapters 26.7.0 → 27.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d2ca1a419c3c02ca167c8621c8b440d213e76e
-  data.tar.gz: 8a708d6d4dc5ac48ca24ad01b488944a72b748cd
+  metadata.gz: d5601500bc73e6401843858f7f7bdd8e70f82963
+  data.tar.gz: 479957e64e4c38b8a16946d8903843bdb2a93972
 SHA512:
-  metadata.gz: 45a3f65b48e7112783b34c1b5270cf08450a6b402405f5213e6b4334f14aa7be0010513487a302fe693eed7e50084969e5a6a4e482d7c977eaa2803f638c2f7c
-  data.tar.gz: a5f6d328d1d71be9534a6d5b57adf923840a558935980e85f3cba49a2ac845ecf141ca1dede7ea2a5ab23c67989639f8244ef58c0c1cd9f8e800461f67bfb972
+  metadata.gz: 3cd53fd771715e3f0670a359287a96b1a90efc27bb76fc7f0bcf0cb799beae8b3cf6119023ca96df220ae9f457024a4207929d7798650ae0bbfd58a57ad6fd26
+  data.tar.gz: b51ff2b5bfeadff897d9e889e984206b052ce9bffdd2428729509f1291b945fba0cd0397d4ae85eb3b61426f765bb5fb281720bc85249d2e9265971255f16872

data/lib/gds_api/publishing_api/special_route_publisher.rb

@@ -27,6 +27,7 @@ module GdsApi
           rendering_app: options.fetch(:rendering_app),
           public_updated_at: time.now.iso8601,
         })
+        publishing_api.put_links(options.fetch(:content_id), links: options[:links]) if options[:links]
         publishing_api.publish(options.fetch(:content_id), 'major')
         put_content_response
       end

data/lib/gds_api/test_helpers/publishing_api_v2.rb

@@ -17,7 +17,7 @@ module GdsApi
       # if a response is given, then it will be merged with the default response.
       # if the given parameter for the response body is a Hash, it will be converted to JSON.
       #
-      # e.g. The following two examples are equivalent: 
+      # e.g. The following two examples are equivalent:
       #
       # * stub_publishing_api_put_content(my_content_id, my_request_body, { status: 201, body: {version: 33}.to_json })
       # * stub_publishing_api_put_content(my_content_id, my_request_body, { status: 201, body: {version: 33} })
@@ -74,6 +74,17 @@ module GdsApi
         stub_request(:any, /#{PUBLISHING_API_V2_ENDPOINT}\/.*/).to_return(status: 503)
       end
 
+      def assert_publishing_api_put_content_links_and_publish(body, content_id = nil, publish_body = nil)
+        content_id ||= body[:content_id]
+        if publish_body.nil?
+          publish_body = { update_type: body.fetch(:update_type) }
+          publish_body[:locale] = body[:locale] if body[:locale]
+        end
+        assert_publishing_api_put_content(content_id, body.except(:links))
+        assert_publishing_api_put_links(content_id, body.slice(:links)) unless body.slice(:links).empty?
+        assert_publishing_api_publish(content_id, publish_body)
+      end
+
       def assert_publishing_api_put_content(content_id, attributes_or_matcher = {}, times = 1)
         url = PUBLISHING_API_V2_ENDPOINT + "/content/" + content_id
         assert_publishing_api(:put, url, attributes_or_matcher, times)
@@ -94,9 +105,9 @@ module GdsApi
         assert_publishing_api(:post, url, attributes_or_matcher, times)
       end
 
-      def assert_publishing_api(verb, url, attributes_or_matcher = {}, times = 1)
+      def assert_publishing_api(verb, url, attributes_or_matcher = nil, times = 1)
         if attributes_or_matcher.is_a?(Hash)
-          matcher = attributes_or_matcher.empty? ? nil : request_json_matching(attributes_or_matcher)
+          matcher = request_json_matches(attributes_or_matcher)
         else
           matcher = attributes_or_matcher
         end
@@ -108,17 +119,18 @@ module GdsApi
         end
       end
 
-      def request_json_matching(required_attributes)
+      def request_json_includes(required_attributes)
         ->(request) do
           data = JSON.parse(request.body)
-          required_attributes.to_a.all? { |key, value| data[key.to_s] == value }
+          deep_stringify_keys(required_attributes).
+            to_a.all? { |key, value| data[key] == value }
         end
       end
 
-      def request_json_including(required_attributes)
+      def request_json_matches(required_attributes)
         ->(request) do
           data = JSON.parse(request.body)
-          required_attributes == data
+          deep_stringify_keys(required_attributes) == data
         end
       end
 
@@ -150,6 +162,23 @@ module GdsApi
         url = PUBLISHING_API_V2_ENDPOINT + resource_path + "/" + content_id
         stub_request(:put, url).with(body: body).to_return(response_hash)
       end
+
+      def deep_stringify_keys(hash)
+        deep_transform_keys(hash) { |key| key.to_s }
+      end
+
+      def deep_transform_keys(object, &block)
+        case object
+        when Hash
+          object.each_with_object({}) do |(key, value), result|
+            result[yield(key)] = deep_transform_keys(value, &block)
+          end
+        when Array
+          object.map{ |item| deep_transform_keys(item, &block) }
+        else
+          object
+        end
+      end
     end
   end
 end

data/lib/gds_api/version.rb

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

data/test/publishing_api/special_route_publisher_test.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../lib/gds_api/test_helpers/publishing_api
 describe GdsApi::PublishingApi::SpecialRoutePublisher do
   include ::GdsApi::TestHelpers::PublishingApiV2
 
-  let(:content_id) { 'a-content-id-of-sorts' }  
+  let(:content_id) { 'a-content-id-of-sorts' }
   let(:special_route) {
     {
       content_id: content_id,
@@ -18,13 +18,19 @@ describe GdsApi::PublishingApi::SpecialRoutePublisher do
     }
   }
 
+  let(:publisher) { GdsApi::PublishingApi::SpecialRoutePublisher.new }
+  let(:endpoint) { Plek.current.find('publishing-api') }
+
   describe ".publish" do
+    before do
+      stub_any_publishing_api_call
+    end
+
     it "publishes the special routes" do
-      
       Timecop.freeze(Time.now) do
-        publisher = GdsApi::PublishingApi::SpecialRoutePublisher.new
-        endpoint = Plek.current.find('publishing-api')
-        payload = {
+        publisher.publish(special_route)
+
+        expected_payload = {
           base_path: special_route[:base_path],
           format: "special_route",
           title: special_route[:title],
@@ -40,15 +46,21 @@ describe GdsApi::PublishingApi::SpecialRoutePublisher do
           public_updated_at: Time.now.iso8601,
         }
 
-        stub_any_publishing_api_call
-        
-        publisher.publish(special_route)
+        assert_requested(:put, "#{endpoint}/v2/content/#{content_id}", body: expected_payload)
+        assert_publishing_api_publish(content_id, update_type: 'major')
+      end
+    end
+
+    it "publishes links" do
+      links = {
+        links: {
+          organisations: ['org-content-id']
+        }
+      }
 
-        base_path = "#{endpoint}/v2/content/#{content_id}"
-        assert_requested(:put, base_path, body: payload)
-        assert_requested(:post, "#{base_path}/publish", body: { update_type: 'major' })
+      publisher.publish(special_route.merge(links))
 
-      end
+      assert_requested(:put, "#{endpoint}/v2/links/#{content_id}", body: links)
     end
 
     describe 'Timezone handling' do

metadata

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