gds-api-adapters 20.1.2 → 21.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cdc41045197dd66b7831c907eac72e51846e6d7
-  data.tar.gz: 0d8ab5611c4a35dbd5fd1d18fc63892afa258099
+  metadata.gz: 6bcaacb3f37eb313895187dd726c2dce6e09170c
+  data.tar.gz: 02f222992af858d36f5ef0f1787e379e77ca88f5
 SHA512:
-  metadata.gz: e21e1e5804397b33b96fa4a6d31f7010efdaea5ca62bd5a5d1bed895f3b08b07fbd5e6546e8eb9b898130e2349c339282669a3f3baa9d91f4174e866e9c83540
-  data.tar.gz: 87025d2a2e9214e58930b1b4331c63c2aa6d07515a4feca204bf02692bc749fce5d7460e1a995a0aca955e0d019c0ad4078cceb7a6555ab8776f5ae21dc87375
+  metadata.gz: 1b6ac58a27bc20babe9dc54e00f64298ee2b86ad617955e989a511666ff968317848617ea9ae02ab732fe0b8f5288173e996228f6d31ce64829c7348fd387233
+  data.tar.gz: 2a5109ede1a0b00e64f11db81e61c94210783c57090c0692422837160f5318820d81c7a15e55345ccbf5e39890846bf101cc548833df472d6a55b31135408129

data/lib/gds_api/content_api.rb

@@ -52,13 +52,12 @@ class GdsApi::ContentApi < GdsApi::Base
   end
 
   def tag(tag, tag_type=nil)
-    url = "#{base_url}/tags"
-
-    if tag_type
-      url << "/#{CGI.escape(tag_type)}"
+    if tag_type.nil?
+      raise "Requests for tags without a tag_type are no longer supported. You probably want a tag_type of 'section'. See https://github.com/alphagov/govuk_content_api/blob/f4c0102a1ae4970be6a440707b89798442f768b9/govuk_content_api.rb#L241-L250"
     end
 
-    get_json("#{url}/#{CGI.escape(tag)}.json")
+    url = [base_url, "tags", CGI.escape(tag_type), CGI.escape(tag)].join("/") + ".json"
+    get_json(url)
   end
 
   def with_tag(tag, tag_type=nil, options={})

data/lib/gds_api/test_helpers/content_api.rb

@@ -62,10 +62,6 @@ module GdsApi
 
         urls = ["#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(tag_type)}/#{CGI.escape(tag[:slug])}.json"]
 
-        if tag_type == "section"
-          urls << "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(tag[:slug])}.json"
-        end
-
         urls.each do |url|
           stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
         end
@@ -80,10 +76,6 @@ module GdsApi
 
         urls = ["#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(tag_type)}/#{CGI.escape(slug)}.json"]
 
-        if tag_type == "section"
-          urls << "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(slug)}.json"
-        end
-
         urls.each do |url|
           stub_request(:get, url).to_return(status: 404, body: body.to_json, headers: {})
         end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '20.1.2'
+  VERSION = '21.0.0'
 end

data/test/content_api_test.rb

@@ -364,7 +364,7 @@ describe GdsApi::ContentApi do
 
     it "returns tag information for a section" do
       content_api_has_section("crime-and-justice")
-      response = @api.tag("crime-and-justice")
+      response = @api.tag("crime-and-justice", "section")
 
       assert_equal "Crime and justice", response["title"]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 20.1.2
+  version: 21.0.0
 platform: ruby
 authors:
 - James Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek