gds-api-adapters 8.2.1 → 8.2.2

data/lib/gds_api/test_helpers/content_api.rb

@@ -10,8 +10,11 @@ module GdsApi
       # you could redefine/override the constant or stub directly.
       CONTENT_API_ENDPOINT = Plek.current.find('contentapi')
 
-      # Takes an array of slugs, or hashes with section details (including a slug).
-      # Will stub out content_api calls for tags of type section to return these sections
+      # Legacy section test helpers
+      #
+      # Use of these should be retired in favour of the other test helpers in this
+      # module which work with any tag type.
+
       def content_api_has_root_sections(slugs_or_sections)
         content_api_has_root_tags("section", slugs_or_sections)
       end
@@ -24,6 +27,21 @@ module GdsApi
         content_api_has_child_tags("section", parent_slug_or_hash, subsection_slugs)
       end
 
+      def content_api_has_artefacts_in_a_section(slug, artefact_slugs=nil)
+        content_api_has_artefacts_with_a_tag("section", slug, artefact_slugs)
+      end
+
+      def artefact_for_slug_in_a_section(slug, section_slug)
+        artefact_for_slug_with_a_tag("section", slug, section_slug)
+      end
+
+      def artefact_for_slug_in_a_subsection(slug, subsection_slug)
+        artefact_for_slug_with_a_child_tag("section", slug, subsection_slug)
+      end
+
+
+      # Takes an array of slugs, or hashes with section details (including a slug).
+      # Will stub out content_api calls for tags of type section to return these sections
       def content_api_has_root_tags(tag_type, slugs_or_tags)
         body = plural_response_base.merge(
           "results" => slugs_or_tags.map { |tag| tag_result(tag, tag_type) }
@@ -36,14 +54,14 @@ module GdsApi
         end
       end
 
-      def content_api_has_tag(tag_type, slug_or_hash, parent_slug=nil)
-        section = tag_hash(slug_or_hash, tag_type).merge(parent: parent_slug)
-        body = tag_result(section)
+      def content_api_has_tag(tag_type, slug_or_hash, parent_tag_id=nil)
+        tag = tag_hash(slug_or_hash, tag_type).merge(parent: parent_tag_id)
+        body = tag_result(tag)
 
-        urls = ["#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(tag_type)}/#{CGI.escape(section[:slug])}.json"]
+        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(section[:slug])}.json"
+          urls << "#{CONTENT_API_ENDPOINT}/tags/#{CGI.escape(tag[:slug])}.json"
         end
 
         urls.each do |url|
@@ -60,27 +78,32 @@ module GdsApi
         stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
       end
 
-      def content_api_has_child_tags(tag_type, parent_slug_or_hash, subsection_slugs)
-        parent_section = tag_hash(parent_slug_or_hash, tag_type)
-        subsections = subsection_slugs.map { |s|
-          tag_hash(s, tag_type).merge(parent: parent_section)
+      def content_api_has_child_tags(tag_type, parent_slug_or_hash, child_tag_ids)
+        parent_tag = tag_hash(parent_slug_or_hash, tag_type)
+        child_tags = child_tag_ids.map { |id|
+          tag_hash(id, tag_type).merge(parent: parent_tag)
         }
         body = plural_response_base.merge(
-          "results" => subsections.map { |s| tag_result(s, tag_type) }
+          "results" => child_tags.map { |s| tag_result(s, tag_type) }
         )
-        url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{tag_type}&parent_id=#{CGI.escape(parent_section[:slug])}"
+        url = "#{CONTENT_API_ENDPOINT}/tags.json?type=#{tag_type}&parent_id=#{CGI.escape(parent_tag[:slug])}"
         stub_request(:get, url).to_return(status: 200, body: body.to_json, headers: {})
       end
 
-      def content_api_has_artefacts_in_a_section(slug, artefact_slugs=[])
+      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_for_slug(artefact_slug)
+            artefact_ slug(artefact_slug)
           end
         )
         sort_orders = ["alphabetical", "curated"]
         sort_orders.each do |order|
-          url = "#{CONTENT_API_ENDPOINT}/with_tag.json?sort=#{order}&tag=#{CGI.escape(slug)}"
+          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: {})
+          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
@@ -170,13 +193,13 @@ module GdsApi
         )
       end
 
-      def artefact_for_slug_in_a_section(slug, section_slug)
+      def artefact_for_slug_with_a_tag(tag_type, slug, tag_id)
         artefact = artefact_for_slug(slug)
-        artefact["tags"] << tag_for_slug(section_slug, "section")
+        artefact["tags"] << tag_for_slug(tag_id, tag_type)
         artefact
       end
 
-      def artefact_for_slug_in_a_subsection(slug, subsection_slug)
+      def artefact_for_slug_with_a_child_tag(tag_type, slug, child_tag_id)
         artefact = artefact_for_slug(slug)
 
         # for each "part" of the path, we want to reduce across the
@@ -185,18 +208,20 @@ module GdsApi
         #   Tag{ thing2, parent: Tag{ thing1 } }
 
         tag_tree = nil
-        subsection_slug.split('/').inject(nil) do |last_section, subsection|
-          subsection = [last_section, subsection].join('/') if last_section
-          section = tag_for_slug(subsection, "section")
+        child_tag_id.split('/').inject(nil) do |parent_tag, child_tag|
+          child_tag = [parent_tag, child_tag].join('/') if parent_tag
+          next_level_tag = tag_for_slug(child_tag, tag_type)
           if tag_tree
             # Because tags are nested within one another, this makes
             # the current part the top, and the rest we've seen the
             # ancestors
-            tag_tree = section.merge("parent" => tag_tree)
+            tag_tree = next_level_tag.merge("parent" => tag_tree)
           else
-            tag_tree = section
+            tag_tree = next_level_tag
           end
-          subsection
+
+          # This becomes the parent tag in the next iteration of the block
+          child_tag
         end
         artefact["tags"] << tag_tree
         artefact

data/lib/gds_api/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 8.2.1
+  version: 8.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 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: 4023795385510963696
+      hash: -3236500390538841432
 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: 4023795385510963696
+      hash: -3236500390538841432
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23