govuk_navigation_helpers 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80cac05a9d17cb8067c82327c9c24ea3f2d319b2
-  data.tar.gz: c9f0298eaad59f93128f8924f53cdc958a461bf6
+  metadata.gz: 4b95f1233b8c92f48aa8322db214c9063c198087
+  data.tar.gz: 39c48d33844ad4f5e4f50e4a1cd8523e6aa82725
 SHA512:
-  metadata.gz: 8a6de31aa86ae19a3c0e64aa72bda842098f3ff4853f6b68a1a18773b6e56d60a528bbbbf561d2eaa90811ab767b749041ec0a97552b21358102347107fabb26
-  data.tar.gz: 81ac62a637462a5de3055ecd7c639f8c898edf64c62080214158499d227c27e7a5a8ee93a2df48cde78ad2af2db1bcb4688a692539e12089ad3d5290a4481bc9
+  metadata.gz: b34e178430bb1c7cd8d8ce57653f5374c1cdefcc3d4f246be721e550fdd999fe7f10e2944ae70fe4f143a933cbdb79c60b2fcc30e2757d8274d9f7f0e69a67e6
+  data.tar.gz: 5231d56178f8bb94d3732548b8f35c200587059d7722930f3e199502b8eabb206b3e6077dd38877e7b485f0e9b38b9fc4f99adf9615130fe6b1b16f6004d388a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.3.0
+
+* Add support for adding the current page to Taxon breadcrumbs
+
 ## 2.2.0
 
 * make sure `taxon_breadcrumbs` generates data for both `taxons` and other

data/lib/govuk_navigation_helpers/taxon_breadcrumbs.rb

@@ -11,8 +11,11 @@ module GovukNavigationHelpers
 
       ordered_parents << { title: "Home", url: "/" }
 
+      ordered_breadcrumbs = ordered_parents.reverse
+      ordered_breadcrumbs << { title: content_item.title, is_current_page: true }
+
       {
-          breadcrumbs: ordered_parents.reverse
+        breadcrumbs: ordered_breadcrumbs
       }
     end
 

data/lib/govuk_navigation_helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukNavigationHelpers
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

data/spec/taxon_breadcrumbs_spec.rb

@@ -3,63 +3,100 @@ require 'spec_helper'
 RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
   describe "Taxon breadcrumbs" do
     it "can handle any valid content item" do
-      generator = GovukSchemas::RandomExample.for_schema("taxon", schema_type: "frontend")
+      generator = GovukSchemas::RandomExample.for_schema(
+        "taxon",
+        schema_type: "frontend"
+      )
 
-      expect { GovukNavigationHelpers::TaxonBreadcrumbs.new(generator.payload).breadcrumbs }.to_not raise_error
+      expect {
+        GovukNavigationHelpers::TaxonBreadcrumbs.new(
+          generator.payload
+        ).breadcrumbs
+      }.to_not raise_error
     end
 
     it "returns the root when taxon is not specified" do
-      content_item = { "links" => {} }
+      content_item = { "title" => "Some Content", "links" => {} }
       breadcrumbs = breadcrumbs_for(content_item)
 
       expect(breadcrumbs).to eq(
         breadcrumbs: [
           { title: "Home", url: "/" },
+          { title: "Some Content", is_current_page: true }
         ]
       )
     end
 
     it "places parent under the root when there is a taxon" do
-      content_item = content_item_with_parents([])
+      content_item = content_item_tagged_to_taxon([])
       breadcrumbs = breadcrumbs_for(content_item)
 
       expect(breadcrumbs).to eq(
         breadcrumbs: [
           { title: "Home", url: "/" },
-          { title: "Taxon", url: "/a-taxon" }
+          { title: "Taxon", url: "/taxon" },
+          { title: "Some Content", is_current_page: true },
         ]
       )
     end
 
-    it "includes parents and grandparents when available" do
-      grandparent = {
-          "title" => "Another-parent",
-          "base_path" => "/another-parent",
-          "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
-          "locale" => "en",
-      }
-
-      parent = {
-          "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
-          "locale" => "en",
-          "title" => "A-parent",
-          "base_path" => "/a-parent",
-          "links" => {
-              "parent_taxons" => [grandparent]
-          }
-      }
-
-      content_item = content_item_with_parents([parent])
-      breadcrumbs = breadcrumbs_for(content_item)
+    context 'with a taxon content item with taxon parents' do
+      it "includes parents and grandparents when available" do
+        grandparent = {
+            "title" => "Another-parent",
+            "base_path" => "/another-parent",
+            "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+            "locale" => "en",
+        }
 
-      expect(breadcrumbs).to eq(
-        breadcrumbs: [
-          { title: "Home", url: "/" },
-          { title: "Another-parent", url: "/another-parent" },
-          { title: "A-parent", url: "/a-parent" },
-          { title: "Taxon", url: "/a-taxon" },
-        ]
-      )
+        parent = {
+            "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+            "locale" => "en",
+            "title" => "A-parent",
+            "base_path" => "/a-parent",
+            "links" => {
+                "parent_taxons" => [grandparent]
+            }
+        }
+
+        content_item = content_item_tagged_to_taxon([parent])
+        breadcrumbs = breadcrumbs_for(content_item)
+
+        expect(breadcrumbs).to eq(
+          breadcrumbs: [
+            { title: "Home", url: "/" },
+            { title: "Another-parent", url: "/another-parent" },
+            { title: "A-parent", url: "/a-parent" },
+            { title: "Taxon", url: "/taxon" },
+            { title: "Some Content", is_current_page: true },
+          ]
+        )
+      end
+    end
+
+    context 'with a taxon with parent taxons' do
+      it "includes parents and grandparents when available" do
+        parent = {
+            "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+            "locale" => "en",
+            "title" => "A-parent",
+            "base_path" => "/a-parent",
+            "links" => {
+                "parent_taxons" => []
+            }
+        }
+
+        content_item = taxon_with_parent_taxons([parent])
+        breadcrumbs = breadcrumbs_for(content_item)
+
+        expect(breadcrumbs).to eq(
+          breadcrumbs: [
+            { title: "Home", url: "/" },
+            { title: "A-parent", url: "/a-parent" },
+            { title: "Taxon", is_current_page: true },
+          ]
+        )
+      end
     end
   end
 
@@ -72,15 +109,27 @@ RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
     GovukNavigationHelpers::NavigationHelper.new(fully_valid_content_item).taxon_breadcrumbs
   end
 
-  def content_item_with_parents(parents)
+  def taxon_with_parent_taxons(parents)
+    {
+      "title" => "Taxon",
+      "document_type" => "taxon",
+      "links" => {
+        "parent_taxons" => parents,
+      },
+    }
+  end
+
+  def content_item_tagged_to_taxon(parents)
     {
+      "title" => "Some Content",
+      "document_type" => "guidance",
       "links" => {
         "taxons" => [
           {
             "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
             "locale" => "en",
             "title" => "Taxon",
-            "base_path" => "/a-taxon",
+            "base_path" => "/taxon",
             "links" => {
               "parent_taxons" => parents
             },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler