gds-api-adapters 12.2.0 → 12.3.0

data/lib/gds_api/content_api.rb

@@ -31,6 +31,7 @@ class GdsApi::ContentApi < GdsApi::Base
       "type=#{CGI.escape(tag_type)}"
     ]
     params << "sort=#{options[:sort]}" if options.has_key?(:sort)
+    params << "draft=true" if options[:draft]
 
     get_list!("#{base_url}/tags.json?#{params.join('&')}")
   end

data/lib/gds_api/test_helpers/content_api.rb

@@ -71,6 +71,20 @@ module GdsApi
         end
       end
 
+      def content_api_has_draft_and_live_tags(options = {})
+        type = options.fetch(:type)
+        live_tags = options.fetch(:live).map { |tag| tag_result(tag, type, state: 'live') }
+        draft_tags = options.fetch(:draft).map { |tag| tag_result(tag, type, state: 'draft') }
+
+        body = plural_response_base.merge("results" => (live_tags + draft_tags))
+        url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}&draft=true"
+        stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+
+        body = plural_response_base.merge("results" => live_tags)
+        url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}"
+        stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+      end
+
       def content_api_has_tags(tag_type, slugs_or_tags)
         body = plural_response_base.merge(
           "results" => slugs_or_tags.map { |tag| tag_result(tag, tag_type) }
@@ -336,7 +350,7 @@ module GdsApi
         end
       end
 
-      def tag_result(slug_or_hash, tag_type = nil)
+      def tag_result(slug_or_hash, tag_type = nil, options = {})
         tag = tag_hash(slug_or_hash, tag_type)
 
         parent = tag_result(tag[:parent]) if tag[:parent]
@@ -356,7 +370,8 @@ module GdsApi
           "content_with_tag" => {
             "id" => "#{CONTENT_API_ENDPOINT}/with_tag.json?tag=#{CGI.escape(tag[:slug])}",
             "web_url" => "http://www.test.gov.uk/browse/#{tag[:slug]}"
-          }
+          },
+          "state" => options[:state]
         }
       end
 

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '12.2.0'
+  VERSION = '12.3.0'
 end

data/test/content_api_test.rb

@@ -299,6 +299,16 @@ describe GdsApi::ContentApi do
       assert_equal "#{@base_api_url}/tags/authors/justin-thyme.json", first_section.id
     end
 
+    it "returns draft tags if requested" do
+      content_api_has_draft_and_live_tags(type: "specialist", draft: ["draft-tag-1"], live: ["live-tag-1"])
+
+      all_tags = @api.tags("specialist", draft: true)
+      assert_equal [["draft-tag-1", "draft"], ["live-tag-1", "live"]].to_set, all_tags.map {|t| [t.slug, t.state] }.to_set
+
+      live_tags = @api.tags("specialist")
+      assert_equal [["live-tag-1", "live"]], live_tags.map {|t| [t.slug, t.state] }
+    end
+
     it "returns a list of root tags of a given type" do
       content_api_has_root_tags("author", ["oliver-sudden", "percy-vere"])
       response = @api.root_tags("author")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 12.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -404,7 +404,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2448133198351219130
+      hash: 2677929826004224176
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -413,7 +413,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2448133198351219130
+      hash: 2677929826004224176
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23