gds-api-adapters 8.2.2 → 8.2.3

data/lib/gds_api/content_api.rb

@@ -52,7 +52,7 @@ class GdsApi::ContentApi < GdsApi::Base
   def with_tag(tag, tag_type=nil)
     tag_key = key_for_tag_type(tag_type)
 
-    get_list!("#{base_url}/with_tag.json?#{tag_key}=#{CGI.escape(tag)}&include_children=1")
+    get_list!("#{base_url}/with_tag.json?#{tag_key}=#{CGI.escape(tag)}")
   end
 
   def curated_list(tag, tag_type=nil)

data/lib/gds_api/panopticon/registerer.rb

@@ -27,7 +27,7 @@ module GdsApi
         if rendering_app
           hash[:rendering_app] = rendering_app
         end
-        [:need_id, :section, :indexable_content, :paths, :prefixes].each do |attr_name|
+        [:need_id, :section, :industry_sectors, :indexable_content, :paths, :prefixes].each do |attr_name|
           if record.respond_to? attr_name
             hash[attr_name] = record.send(attr_name)
           end

data/lib/gds_api/test_helpers/content_api.rb

@@ -93,21 +93,50 @@ module GdsApi
       def content_api_has_artefacts_with_a_tag(tag_type, slug, artefact_slugs=[])
         body = plural_response_base.merge(
           "results" => artefact_slugs.map do |artefact_slug|
-            artefact_ slug(artefact_slug)
+            artefact_for_slug(artefact_slug)
           end
         )
+
+        endpoint = "#{CONTENT_API_ENDPOINT}/with_tag.json"
+        resp = { status: 200, body: body.to_json, headers: {} }
+
+        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
+
         sort_orders = ["alphabetical", "curated"]
         sort_orders.each do |order|
+          stub_request(:get, endpoint)
+            .with(:query => { tag_type => slug, "sort" => order })
+            .to_return(resp)
+
           if tag_type == "section"
-            section_url = "#{CONTENT_API_ENDPOINT}/with_tag.json?sort=#{order}&tag=#{CGI.escape(slug)}"
-            stub_request(:get, section_url).to_return(status: 200, body: body.to_json, headers: {})
+            stub_request(:get, endpoint)
+              .with(:query => { "tag" => slug, "sort" => order })
+              .to_return(resp)
           end
-
-          url = "#{CONTENT_API_ENDPOINT}/with_tag.json?sort=#{order}&#{CGI.escape(tag_type)}=#{CGI.escape(slug)}"
-          stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
         end
       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|
+            artefact_for_slug(artefact_slug)
+          end
+        )
+
+        endpoint = "#{CONTENT_API_ENDPOINT}/with_tag.json"
+        stub_request(:get, endpoint)
+          .with(:query => { tag_type => slug, "sort" => sort_order })
+          .to_return(status: 200, body: body.to_json, headers: {})
+      end
+
       def content_api_has_an_artefact(slug, body = artefact_for_slug(slug))
         ArtefactStub.new(slug).with_response_body(body).stub
       end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = '8.2.2'
+  VERSION = '8.2.3'
 end

data/test/content_api_test.rb

@@ -310,13 +310,8 @@ describe GdsApi::ContentApi do
       assert_equal "#{@base_api_url}/tags/genres/indie%2Findie-rock.json", first_section.id
     end
 
-    it "should produce an artefact with the provided tag" do
-      tag = "crime-and-justice"
-      api_url = "#{@base_api_url}/with_tag.json?tag=#{tag}&include_children=1"
-      json = {
-        results: [{title: "Complain about a claims company"}]
-      }.to_json
-      stub_request(:get, api_url).to_return(:status => 200, :body => json)
+    it "returns artefacts given a section" do
+      content_api_has_artefacts_in_a_section("crime-and-justice", ["complain-about-a-claims-company"])
       response = @api.with_tag("crime-and-justice")
 
       # Old dictionary-style access
@@ -328,81 +323,52 @@ describe GdsApi::ContentApi do
     end
 
     it "returns artefacts given a tag and tag type" do
-      api_url = "#{@base_api_url}/with_tag.json?genre=reggae&include_children=1"
-      json = {
-        results: [{title: "Three Little Birds"}]
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
+      content_api_has_artefacts_with_a_tag("genre", "reggae", ["three-little-birds"])
       response = @api.with_tag("reggae", "genre")
 
-      assert_equal "Three Little Birds", response.first.title
+      assert_equal "Three little birds", response.first.title
     end
 
-    it "should return tag tree for a specific tag" do
-      tag = "crime-and-justice"
-      api_url = "#{@base_api_url}/tags/#{tag}.json"
-      json = {
-        title: "Crime and Justice"
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
-      response = @api.tag(tag)
-      title = response['title']
-      assert_equal json[:title], title
+    it "returns tag information for a section" do
+      content_api_has_section("crime-and-justice")
+      response = @api.tag("crime-and-justice")
+
+      assert_equal "Crime and justice", response["title"]
     end
 
-    it "returns tag information given a tag and tag type" do
-      api_url = "#{@base_api_url}/tags/genre/reggae.json"
-      json = {
-        title: "Reggae"
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
+    it "returns tag information for a tag and tag type" do
+      content_api_has_tag("genre", "reggae")
       response = @api.tag("reggae", "genre")
 
       assert_equal "Reggae", response['title']
     end
 
-    it "returns artefacts for a tag in curated list order" do
-      api_url = "#{@base_api_url}/with_tag.json?tag=crime-and-justice&sort=curated"
-      json = {
-        results: [{title: "Complain about a claims company"}]
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
+    it "returns artefacts in curated list order for a section" do
+      content_api_has_artefacts_in_a_section("crime-and-justice", ["complain-about-a-claims-company"])
       response = @api.curated_list("crime-and-justice")
 
       assert_equal "Complain about a claims company", response.first.title
     end
 
     it "returns artefacts in curated list order for a tag and tag type" do
-      api_url = "#{@base_api_url}/with_tag.json?genre=reggae&sort=curated"
-      json = {
-        results: [{title: "Buffalo Soldier"}]
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
+      content_api_has_artefacts_with_a_tag("genre", "reggae", ["buffalo-soldier"])
       response = @api.curated_list("reggae", "genre")
 
-      assert_equal "Buffalo Soldier", response.first.title
+      assert_equal "Buffalo soldier", response.first.title
     end
 
     it "returns artefacts for a tag in a given sort order" do
-      api_url = "#{@base_api_url}/with_tag.json?tag=crime-and-justice&sort=foo"
-      json = {
-        results: [{title: "Complain about a claims company"}]
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
-      response = @api.sorted_by("crime-and-justice", "foo")
+      content_api_has_artefacts_in_a_section("crime-and-justice", ["complain-about-a-claims-company"])
+      response = @api.sorted_by("crime-and-justice", "alphabetical")
 
       assert_equal "Complain about a claims company", response.first.title
     end
 
     it "returns artefacts in a given sort order for a tag and tag type" do
-      api_url = "#{@base_api_url}/with_tag.json?genre=reggae&sort=foo"
-      json = {
-        results: [{title: "Is This Love"}]
-      }
-      stub_request(:get, api_url).to_return(:status => 200, :body => json.to_json)
+      content_api_has_sorted_artefacts_with_a_tag("genre", "reggae", "foo", ["is-this-love"])
       response = @api.sorted_by("reggae", "foo", "genre")
 
-      assert_equal "Is This Love", response.first.title
+      assert_equal "Is this love", response.first.title
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 8.2.2
+  version: 8.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -364,7 +364,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3236500390538841432
+      hash: 2889202299403789685
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3236500390538841432
+      hash: 2889202299403789685
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23