govuk_navigation_helpers 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4930be4a5498eeb6b86415ba59fca3ebcbb14e6
-  data.tar.gz: c0f02bb16a2056a6e7fbcf19209ac01f54222c9b
+  metadata.gz: 6ac714eea19839eabbed2cec6ed4b2afdd1203d9
+  data.tar.gz: 202443d3c79e4e6124f158178a3a988107ac06fa
 SHA512:
-  metadata.gz: 3f5fba2c927c6d120277a1ec511ea6578d9ca85f582124a569212508cc13c580b1ee030aee06fdb6c0f2b426dab364c04efca497ca491670cf5657c958277e02
-  data.tar.gz: 24a32d862aa6ca7579f6bb474e0295e9f2c97fc80aa2b0204102caab97b6b4cc7e4104c852aac7fa123c24f4f4df676703bf5729c6ac0be627ccf5ced08d725d
+  metadata.gz: 024044fab1cae98132ceebc1256415cec5a89760ee44044b8ee7399751fa85a46d6265b219afedd6a568a6c14d01ca95cd71c3ee5adc976a7741bb201c53a03e
+  data.tar.gz: bac53adaa9c93b8e8c719171b8c627dc7cc54487a86a373af08b968c97c38d83f6080ac309ecc63a8d943865cd7cbb6df893c5506e25a47492ebbfeef9adb1cf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.1.0
+
+* Display Elsewhere in GOV.UK and Elsewhere on the web related links on new
+  taxonomy sidebar.
+
 ## 5.0.0
 
 * **BREAKING CHANGE**: Update the gds-api-adapters gem. This includes a change

data/lib/govuk_navigation_helpers/content_item.rb

@@ -62,6 +62,12 @@ module GovukNavigationHelpers
       end
     end
 
+    def related_overrides
+      content_store_response.dig("links", "ordered_related_items_overrides").to_a.map do |link|
+        ContentItem.new(link)
+      end
+    end
+
     def external_links
       content_store_response.dig("details", "external_related_links").to_a
     end

data/lib/govuk_navigation_helpers/taxonomy_sidebar.rb

@@ -9,7 +9,7 @@ module GovukNavigationHelpers
 
     def sidebar
       {
-        items: taxons
+        items: [taxons, elsewhere_on_govuk, elsewhere_on_the_web].flatten
       }
     end
 
@@ -34,9 +34,46 @@ module GovukNavigationHelpers
       end
     end
 
-    # This method will fetch content related to @content_item, and tagged to taxon. This is a
-    # temporary method that uses search to achieve this. This behaviour is to be moved into
-    # the content store
+    def elsewhere_on_govuk
+      return [] if @content_item.related_overrides.empty?
+
+      related_content = @content_item.related_overrides.map do |override|
+        {
+          title: override.title,
+          link: override.base_path
+        }
+      end
+
+      [
+        {
+          title: "Elsewhere on GOV.UK",
+          related_content: related_content
+        }
+      ]
+    end
+
+    def elsewhere_on_the_web
+      return [] if @content_item.external_links.empty?
+
+      related_content = @content_item.external_links.map do |external_link|
+        {
+          title: external_link.fetch('title'),
+          link: external_link.fetch('url'),
+          rel: 'external'
+        }
+      end
+
+      [
+        {
+          title: "Elsewhere on the web",
+          related_content: related_content
+        }
+      ]
+    end
+
+    # This method will fetch content related to @content_item, and tagged to
+    # taxon. This is a temporary method that uses search to achieve this. This
+    # behaviour is to be moved into the content store.
     def content_related_to(taxon)
       statsd.time(:taxonomy_sidebar_search_time) do
         begin

data/lib/govuk_navigation_helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukNavigationHelpers
-  VERSION = "5.0.0".freeze
+  VERSION = "5.1.0".freeze
 end

data/spec/taxonomy_sidebar_spec.rb

@@ -123,6 +123,48 @@ RSpec.describe GovukNavigationHelpers::TaxonomySidebar do
           ]
         )
       end
+
+      it "includes curated and external links when available" do
+        expect(GovukNavigationHelpers.configuration.statsd).to receive(
+          :increment
+        ).with(
+          :taxonomy_sidebar_searches
+        ).once
+
+        content_item =
+          content_item_tagged_to_taxon_with_curated_and_external_links
+
+        expect(sidebar_for(content_item)).to eq(
+          items: [
+            {
+              title: "Taxon A",
+              url: "/taxon-a",
+              description: "The A taxon.",
+              related_content: [
+                { 'title': 'Related item A', 'link': '/related-item-a', },
+                { 'title': 'Related item B', 'link': '/related-item-b', },
+                { 'title': 'Related item C', 'link': '/related-item-c', },
+              ],
+            },
+            {
+              title: "Elsewhere on GOV.UK",
+              related_content: [
+                { title: "Curated link 1", link: "/curated-link-1" }
+              ]
+            },
+            {
+              title: "Elsewhere on the web",
+              related_content: [
+                {
+                  title: "An external link",
+                  link: "www.external-link.com",
+                  rel: "external"
+                }
+              ]
+            }
+          ]
+        )
+      end
     end
 
     context 'when Rummager raises an exception' do
@@ -184,4 +226,32 @@ RSpec.describe GovukNavigationHelpers::TaxonomySidebar do
       },
     }
   end
+
+  def content_item_tagged_to_taxon_with_curated_and_external_links
+    {
+      "title" => "A piece of content",
+      "base_path" => "/a-piece-of-content",
+      "links" => {
+        "taxons" => [
+          {
+            "title" => "Taxon A",
+            "base_path" => "/taxon-a",
+            "content_id" => "taxon-a",
+            "description" => "The A taxon.",
+          }
+        ],
+        "ordered_related_items_overrides" => [
+          "title" => "Curated link 1",
+          "base_path" => "/curated-link-1",
+          "content_id" => "curated-link-1",
+        ]
+      },
+      "details" => {
+        "external_related_links" => [
+          "url" => "www.external-link.com",
+          "title" => "An external link"
+        ]
+      }
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters