gds-api-adapters 14.3.0 → 14.4.0

data/lib/gds_api/content_api.rb

@@ -65,6 +65,7 @@ class GdsApi::ContentApi < GdsApi::Base
 
     url = "#{base_url}/with_tag.json?#{tag_key}=#{CGI.escape(tag)}"
     url << "&group_by=#{CGI.escape(options[:group_by])}" if options.has_key?(:group_by)
+    url << "&draft=true" if options[:draft]
 
     get_list!(url)
   end

data/lib/gds_api/test_helpers/content_api.rb

@@ -101,6 +101,16 @@ module GdsApi
         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: {})
+
+        if options[:sort_order]
+          body = plural_response_base.merge("results" => (live_tags + draft_tags))
+          url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{type}&draft=true&sort=#{options[:sort_order]}"
+          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}&sort=#{options[:sort_order]}"
+          stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
+        end
       end
 
       def content_api_does_not_have_tags(tag_type, slugs)
@@ -169,7 +179,9 @@ module GdsApi
         stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
       end
 
-      def content_api_has_artefacts_with_a_tag(tag_type, slug, artefact_slugs=[])
+      def content_api_has_artefacts_with_a_tag(tag_type, slug, artefact_slugs=[], options={})
+        draft = options[:draft] || false
+
         body = plural_response_base.merge(
           "results" => artefact_slugs.map do |artefact_slug|
             artefact_for_slug(artefact_slug)
@@ -179,30 +191,58 @@ module GdsApi
         endpoint = "#{CONTENT_API_ENDPOINT}/with_tag.json"
         resp = { status: 200, body: body.to_json, headers: {} }
 
+        unless draft
+          stub_request(:get, endpoint)
+            .with(:query => { tag_type => slug })
+            .to_return(resp)
+
+          if tag_type == "section"
+            stub_request(:get, endpoint)
+              .with(:query => { "tag" => slug })
+              .to_return(resp)
+          end
+        end
+
         stub_request(:get, endpoint)
-          .with(:query => { tag_type => slug })
+          .with(:query => { tag_type => slug, "draft" => "true" })
           .to_return(resp)
 
         if tag_type == "section"
           stub_request(:get, endpoint)
-            .with(:query => { "tag" => slug })
+            .with(:query => { "tag" => slug, "draft" => "true" })
             .to_return(resp)
         end
 
         sort_orders = ["alphabetical", "curated"]
         sort_orders.each do |order|
+          unless draft
+            stub_request(:get, endpoint)
+              .with(:query => { tag_type => slug, "sort" => order })
+              .to_return(resp)
+
+            if tag_type == "section"
+              stub_request(:get, endpoint)
+                .with(:query => { "tag" => slug, "sort" => order })
+                .to_return(resp)
+            end
+          end
+
           stub_request(:get, endpoint)
-            .with(:query => { tag_type => slug, "sort" => order })
+            .with(:query => { tag_type => slug, "sort" => order, "draft" => "true" })
             .to_return(resp)
 
           if tag_type == "section"
             stub_request(:get, endpoint)
-              .with(:query => { "tag" => slug, "sort" => order })
+              .with(:query => { "tag" => slug, "sort" => order, "draft" => "true" })
               .to_return(resp)
           end
         end
       end
 
+      def content_api_has_artefacts_with_a_draft_tag(tag_type, slug, artefact_slugs=[])
+        content_api_has_artefacts_with_a_tag(tag_type, slug, artefact_slugs, draft: true)
+      end
+
       def content_api_has_sorted_artefacts_with_a_tag(tag_type, slug, sort_order, artefact_slugs=[])
         body = plural_response_base.merge(
           "results" => artefact_slugs.map do |artefact_slug|

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '14.3.0'
+  VERSION = '14.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 14.3.0
+  version: 14.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &5464400 !ruby/object:Gem::Requirement
+  requirement: &19191440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5464400
+  version_requirements: *19191440
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &5462760 !ruby/object:Gem::Requirement
+  requirement: &19189360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5462760
+  version_requirements: *19189360
 - !ruby/object:Gem::Dependency
   name: link_header
-  requirement: &5461220 !ruby/object:Gem::Requirement
+  requirement: &19279880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5461220
+  version_requirements: *19279880
 - !ruby/object:Gem::Dependency
   name: lrucache
-  requirement: &5551640 !ruby/object:Gem::Requirement
+  requirement: &19279180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *5551640
+  version_requirements: *19279180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &5550840 !ruby/object:Gem::Requirement
+  requirement: &19278520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *5550840
+  version_requirements: *19278520
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &5550380 !ruby/object:Gem::Requirement
+  requirement: &19277940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5550380
+  version_requirements: *19277940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &5549680 !ruby/object:Gem::Requirement
+  requirement: &19277160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *5549680
+  version_requirements: *19277160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5548920 !ruby/object:Gem::Requirement
+  requirement: &19276500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *5548920
+  version_requirements: *19276500
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &5548300 !ruby/object:Gem::Requirement
+  requirement: &19275760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.8'
   type: :development
   prerelease: false
-  version_requirements: *5548300
+  version_requirements: *19275760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &5547600 !ruby/object:Gem::Requirement
+  requirement: &19275040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.12.4
   type: :development
   prerelease: false
-  version_requirements: *5547600
+  version_requirements: *19275040
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &5546880 !ruby/object:Gem::Requirement
+  requirement: &19274420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.4.0
   type: :development
   prerelease: false
-  version_requirements: *5546880
+  version_requirements: *19274420
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &5546360 !ruby/object:Gem::Requirement
+  requirement: &19273800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5546360
+  version_requirements: *19273800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &5545360 !ruby/object:Gem::Requirement
+  requirement: &19273100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5545360
+  version_requirements: *19273100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &5192280 !ruby/object:Gem::Requirement
+  requirement: &19402660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *5192280
+  version_requirements: *19402660
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &5190900 !ruby/object:Gem::Requirement
+  requirement: &19401440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5190900
+  version_requirements: *19401440
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &5188920 !ruby/object:Gem::Requirement
+  requirement: &19399240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *5188920
+  version_requirements: *19399240
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &5187820 !ruby/object:Gem::Requirement
+  requirement: &19397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,7 +197,7 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *5187820
+  version_requirements: *19397860
 description: A set of adapters providing easy access to the GDS GOV.UK APIs
 email:
 - jystewart@gmail.com
@@ -328,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 215301875620449452
+      hash: 4088436010301206463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 215301875620449452
+      hash: 4088436010301206463
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11