govuk_navigation_helpers 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9312f2631f1f7a25f36ad7955f6b9272bac74bee
-  data.tar.gz: 9d6b8c5386f2512ea6064760f1c59f50e3ee58ec
+  metadata.gz: 80cac05a9d17cb8067c82327c9c24ea3f2d319b2
+  data.tar.gz: c9f0298eaad59f93128f8924f53cdc958a461bf6
 SHA512:
-  metadata.gz: f39ae57d1f800a4b453f7a83a8e5f8928fdb1d5d7db1b87fb7c521a4cea839ff6eece7577137791b405c70dcf9bbfae53573b80143fcf4fd97b97c7754b411f3
-  data.tar.gz: 45e121315ab5e62ba73926ee73a8e0c3f588c75b7a26e97857eb7aadcfbf7de6c89b07ec08262a97c8ddb8a8e577d4063af5a12bb8b63c64e786fe7ba7126fa6
+  metadata.gz: 8a6de31aa86ae19a3c0e64aa72bda842098f3ff4853f6b68a1a18773b6e56d60a528bbbbf561d2eaa90811ab767b749041ec0a97552b21358102347107fabb26
+  data.tar.gz: 81ac62a637462a5de3055ecd7c639f8c898edf64c62080214158499d227c27e7a5a8ee93a2df48cde78ad2af2db1bcb4688a692539e12089ad3d5290a4481bc9

data/.rubocop.yml

@@ -0,0 +1,2 @@
+AllCops:
+  TargetRubyVersion: 2.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.2.0
+
+* make sure `taxon_breadcrumbs` generates data for both `taxons` and other
+  content items tagged to a taxon.
+
+## 2.1.2
+
+* Add SSH agent for Gem publishing
+
 ## 2.1.1
 
 * Add `Jenkinsfile` for CI on Jenkins 2

data/Jenkinsfile

@@ -33,7 +33,9 @@ node {
 
     if(env.BRANCH_NAME == "master") {
       stage('Publish Gem') {
-        govuk.runRakeTask("publish_gem --trace")
+        sshagent(['govuk-ci-ssh-key']) {
+          govuk.runRakeTask("publish_gem --trace")
+        }
       }
     }
 

data/lib/govuk_navigation_helpers/content_item.rb

@@ -17,10 +17,12 @@ module GovukNavigationHelpers
     end
 
     def parent_taxon
-      # TODO: Determine what to do when there are multiple parents. For now just display the first
+      # TODO: Determine what to do when there are multiple taxons/parents. For now just display the first of each.
+      taxon = content_store_response.dig("links", "taxons", 0)
+      return ContentItem.new(taxon) if taxon
+
       parent_taxon = content_store_response.dig("links", "parent_taxons", 0)
-      return unless parent_taxon
-      ContentItem.new(parent_taxon)
+      return ContentItem.new(parent_taxon) if parent_taxon
     end
 
     def mainstream_browse_pages

data/lib/govuk_navigation_helpers/version.rb

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

data/spec/taxon_breadcrumbs_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
       expect { GovukNavigationHelpers::TaxonBreadcrumbs.new(generator.payload).breadcrumbs }.to_not raise_error
     end
 
-    it "returns the root when parent is not specified" do
+    it "returns the root when taxon is not specified" do
       content_item = { "links" => {} }
       breadcrumbs = breadcrumbs_for(content_item)
 
@@ -19,37 +19,19 @@ RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
       )
     end
 
-    it "returns the root when parent is empty" do
+    it "places parent under the root when there is a taxon" do
       content_item = content_item_with_parents([])
       breadcrumbs = breadcrumbs_for(content_item)
 
       expect(breadcrumbs).to eq(
         breadcrumbs: [
           { title: "Home", url: "/" },
+          { title: "Taxon", url: "/a-taxon" }
         ]
       )
     end
 
-    it "places parent under the root when there is a parent" do
-      parent = {
-          "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
-          "locale" => "en",
-          "title" => "A-parent",
-          "base_path" => "/a-parent",
-      }
-
-      content_item = content_item_with_parents([parent])
-      breadcrumbs = breadcrumbs_for(content_item)
-
-      expect(breadcrumbs).to eq(
-        breadcrumbs: [
-          { title: "Home", url: "/" },
-          { title: "A-parent", url: "/a-parent" }
-        ]
-      )
-    end
-
-    it "includes grandparent when available" do
+    it "includes parents and grandparents when available" do
       grandparent = {
           "title" => "Another-parent",
           "base_path" => "/another-parent",
@@ -74,7 +56,8 @@ RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
         breadcrumbs: [
           { title: "Home", url: "/" },
           { title: "Another-parent", url: "/another-parent" },
-          { title: "A-parent", url: "/a-parent" }
+          { title: "A-parent", url: "/a-parent" },
+          { title: "Taxon", url: "/a-taxon" },
         ]
       )
     end
@@ -91,7 +74,19 @@ RSpec.describe GovukNavigationHelpers::TaxonBreadcrumbs do
 
   def content_item_with_parents(parents)
     {
-        "links" => { "parent_taxons" => parents }
+      "links" => {
+        "taxons" => [
+          {
+            "content_id" => "30c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+            "locale" => "en",
+            "title" => "Taxon",
+            "base_path" => "/a-taxon",
+            "links" => {
+              "parent_taxons" => parents
+            },
+          },
+        ],
+      },
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -140,7 +141,6 @@ files:
 - README.md
 - Rakefile
 - govuk_navigation_helpers.gemspec
-- jenkins.sh
 - lib/govuk_navigation_helpers.rb
 - lib/govuk_navigation_helpers/breadcrumbs.rb
 - lib/govuk_navigation_helpers/content_item.rb

data/jenkins.sh

@@ -1,72 +0,0 @@
-#!/bin/bash
-
-REPO_NAME=${REPO_NAME:-"alphagov/govuk_navigation_helpers"}
-CONTEXT_MESSAGE=${CONTEXT_MESSAGE:-"default"}
-GH_STATUS_GIT_COMMIT=${SCHEMA_GIT_COMMIT:-${GIT_COMMIT}}
-
-function github_status {
-  REPO_NAME="$1"
-  STATUS="$2"
-  MESSAGE="$3"
-  gh-status "$REPO_NAME" "$GH_STATUS_GIT_COMMIT" "$STATUS" -d "Build #${BUILD_NUMBER} ${MESSAGE}" -u "$BUILD_URL" -c "$CONTEXT_MESSAGE" >/dev/null
-}
-
-function error_handler {
-  trap - ERR # disable error trap to avoid recursion
-  local parent_lineno="$1"
-  local message="$2"
-  local code="${3:-1}"
-  if [[ -n "$message" ]] ; then
-    echo "Error on or near line ${parent_lineno}: ${message}; exiting with status ${code}"
-  else
-    echo "Error on or near line ${parent_lineno}; exiting with status ${code}"
-  fi
-  github_status "$REPO_NAME" error "errored on Jenkins"
-  exit "${code}"
-}
-
-trap 'error_handler ${LINENO}' ERR
-github_status "$REPO_NAME" pending "is running on Jenkins"
-
-# Cleanup anything left from previous test runs
-git clean -fdx
-
-# Try to merge master into the current branch, and abort if it doesn't exit
-# cleanly (ie there are conflicts). This will be a noop if the current branch
-# is master.
-git merge --no-commit origin/master || git merge --abort
-
-echo "Running ruby linter"
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec govuk-lint-ruby \
-  --format html --out rubocop-${GIT_COMMIT}.html \
-  --format clang
-
-  # Clone govuk-content-schemas depedency for contract tests
-  rm -rf /tmp/govuk-content-schemas
-  git clone git@github.com:alphagov/govuk-content-schemas.git /tmp/govuk-content-schemas
-  (
-    cd /tmp/govuk-content-schemas
-    git checkout ${SCHEMA_GIT_COMMIT:-"master"}
-  )
-  export GOVUK_CONTENT_SCHEMAS_PATH=/tmp/govuk-content-schemas
-
-# Bundle and run tests against multiple ruby versions
-for version in 2.3.1; do
-  rm -f Gemfile.lock
-  export RBENV_VERSION=$version
-  echo "Running tests under ruby $version"
-  bundle install --path "${HOME}/bundles/${JOB_NAME}"
-  if ! bundle exec rake ${TEST_TASK:-"default"}; then
-    github_status "$REPO_NAME" failure "failed on Jenkins"
-    exit 1
-  fi
-done
-unset RBENV_VERSION
-
-if [[ -n "$PUBLISH_GEM" ]]; then
-  bundle install --path "${HOME}/bundles/${JOB_NAME}"
-  bundle exec rake publish_gem --trace
-fi
-
-github_status "$REPO_NAME" success "succeeded on Jenkins"