pugin 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4ecbf5783f861b294e469debff81bc7f186f9c
-  data.tar.gz: fd1f958c74c9142d7abd8aa9936b6abea71df9b1
+  metadata.gz: accdab1a76837806ad84af124418b085e9deecec
+  data.tar.gz: ed05baacf0eb014615b4f5480ff6d54823b54071
 SHA512:
-  metadata.gz: 87373363a1e0d76113a5a6e8639169ff7b8bcf405e555305f2d89496df6822eae5526fbea41968edef370cf283a76ab90ad4292a407d860af95981eacaec1a08
-  data.tar.gz: 42c5a1b19b90655563e70533760ae5a48f04519c64f9410a0ea9a3043601378875dad106c3ec8f1eb20f4b2d688f9b62f8efa4f432fdb25ed06884422ea8aa6b
+  metadata.gz: f083a6c86ea482d46f00b3b945c1408bb4b5bdb97f3613c16803af9be3db1d1b140e6a1ee79a6c9e5e563f21dbd5adb6c70e20ace8feecb3b6eed5c8f7333732
+  data.tar.gz: baced442f23ca4f7ead2f36873a20aea7a6145063b2a7a862568fce0ac47dbcb3a2423a0fd956ec81e88680cf51f62958b799c6e8d1190bff75f2a6cbb17bd3a

data/README.md

@@ -1,5 +1,5 @@
-# Pugin
-[pugin][pugin] is a component-based pattern design library created by the [Parliamentary Digital Service][pds] that holds all of the reusable partials, styles and scripts for elements of the UK Parliament's microservices. It is named after the designer [Augustus Welby Northmore Pugin][augustus-pugin], who provided designs for the interior of the Palace of Westminster.
+# Pugin Components Rails
+[pugin-components-rails][pugin-components-rails] is a component-based pattern design library created by the [Parliamentary Digital Service][pds] that holds all of the reusable partials for elements of the UK Parliament's microservices.
 
 [![Build Status][shield-travis]][info-travis] [![Test Coverage][shield-coveralls]][info-coveralls] [![License][shield-license]][info-license]
 
@@ -23,7 +23,7 @@
 
 
 ## Requirements
-[pugin][pugin] requires the following:
+[pugin-components-rails][pugin-components-rails] requires the following:
 * [Ruby][ruby] - [click here][ruby-version] for the exact version
 * [Bundler][bundler]
 * [Rails][rails]
@@ -33,7 +33,7 @@
 ## Installation
 Within your rails application, add the below to your `Gemfile`.
 ```bash
-gem 'pugin', '~> 0.2'
+gem 'pugin'
 ```
 
 
@@ -56,8 +56,8 @@ Now all of the view components should be available within your host application.
 ## Getting Started with Development
 To clone the repository and set up the dependencies, run the following:
 ```bash
-git clone https://github.com/ukparliament/pugin.git
-cd pugin
+git clone https://github.com/ukparliament/pugin-components-rails.git
+cd pugin-components-rails
 bundle install
 ```
 
@@ -80,23 +80,22 @@ If you wish to submit a bug fix or feature, you can create a pull request and it
 
 
 ## License
-[pugin][pugin] is licensed under the [Open Parliament Licence][info-license].
-
-[ruby]:           https://www.ruby-lang.org/en/
-[bundler]:        http://bundler.io
-[rspec]:          http://rspec.info
-[pugin]:          https://github.com/ukparliament/pugin
-[pds]:            https://www.parliament.uk/mps-lords-and-offices/offices/bicameral/parliamentary-digital-service/
-[ruby-version]:   https://github.com/ukparliament/pugin/blob/master/.ruby-version
-[rails]:          http://rubyonrails.org
-[haml]:           http://haml.info
-[augustus-pugin]: https://en.wikipedia.org/wiki/Augustus_Pugin
-
-[info-travis]:   https://travis-ci.org/ukparliament/pugin
-[shield-travis]: https://img.shields.io/travis/ukparliament/pugin.svg
-
-[info-coveralls]:   https://coveralls.io/github/ukparliament/pugin
-[shield-coveralls]: https://img.shields.io/coveralls/ukparliament/pugin.svg
-
-[info-license]:   http://www.parliament.uk/site-information/copyright/open-parliament-licence/
-[shield-license]: https://img.shields.io/badge/license-Open%20Parliament%20Licence-blue.svg
+[pugin-components-rails][pugin-components-rails] is licensed under the [Open Parliament Licence][info-license].
+
+[ruby]:                   https://www.ruby-lang.org/en/
+[bundler]:                http://bundler.io
+[rspec]:                  http://rspec.info
+[pugin-components-rails]: https://github.com/ukparliament/parliament.uk-pugin-components-rails
+[pds]:                    https://www.parliament.uk/mps-lords-and-offices/offices/bicameral/parliamentary-digital-service/
+[ruby-version]:           https://github.com/ukparliament/pugin/blob/master/.ruby-version
+[rails]:                  http://rubyonrails.org
+[haml]:                   http://haml.info
+
+[info-travis]:            https://travis-ci.org/ukparliament/pugin
+[shield-travis]:          https://img.shields.io/travis/ukparliament/pugin.svg
+
+[info-coveralls]:         https://coveralls.io/github/ukparliament/pugin
+[shield-coveralls]:       https://img.shields.io/coveralls/ukparliament/pugin.svg
+
+[info-license]:           http://www.parliament.uk/site-information/copyright/open-parliament-licence/
+[shield-license]:         https://img.shields.io/badge/license-Open%20Parliament%20Licence-blue.svg

data/app/views/pugin/cards/_person-list.html.haml

@@ -1,16 +1,22 @@
-%ol.list
-  - people.each do |person|
-    %li.list--item
-      %ul.list
-        - if person.respond_to?(:full_name) && person.respond_to?(:graph_id)
-          %li
-            %a{:href => "/people/#{person.graph_id}"}= person.full_name
-        - if !person.constituencies.empty?
-          - seat_incumbency = person.seat_incumbencies.select(&:current?).first
-          %li
-            MP for
-            %a{:href => "/constituencies/#{seat_incumbency.constituency.graph_id}"}= seat_incumbency.constituency.name
-        - if !person.parties.empty?
-          - party_membership = person.party_memberships.select(&:current?).first
-          %li
-            %a{:href => "/parties/#{party_membership.party.graph_id}"}= party_membership.party.name
+-if people.empty?
+  %ol.list
+    %li.list__item
+      %p= t('no_content.empty_list.members.description', letter: letter.upcase)
+-else
+  %ol.list
+    - people.each do |person|
+      - if person.respond_to?(:graph_id)
+        %li.list__item
+          %h2
+            %a{:href => "/people/#{person.graph_id}"}= person.display_name
+          - if !person.statuses[:house_membership_status].empty? && !person.statuses[:house_membership_status].include?('Current MP')
+            %p= person.statuses[:house_membership_status].join(' and ')
+
+          - if !person.constituencies.empty?
+            - seat_incumbency = person.seat_incumbencies.select(&:current?).first
+            - unless seat_incumbency.nil?
+              %p= "#{t('current_mp_for')} #{seat_incumbency.constituency.name}"
+          - if !person.parties.empty?
+            - party_membership = person.party_memberships.select(&:current?).first
+            - unless party_membership.nil?
+              %p= party_membership.party.name

data/app/views/pugin/components/_footer.html.haml

@@ -1,16 +1,11 @@
 %footer
-  .c-fs.footer
-    .c-fg
+  .container--full-screen.footer
+    .container--full-grid
       .row--indent-horizontal
         .footer__logo
-          %img{:alt => "parliament.uk", :src => "#{Rails.application.secrets.asset_location_url}/images/parliament-uk--darkgrey.png", :srcset => "#{Rails.application.secrets.asset_location_url}/images/parliament-uk--darkgrey.svg"}/
+          %p= t('parliament_uk')
         %ul.footer__list
           %li
-            Parliament.uk
-            %a{:href => "https://pds.blog.parliament.uk/", :target => "_blank"} digital blog
+            %a{:href => "https://www.parliament.uk/"}= t('current_website')
           %li
-            Visit the
-            %a{:href => "https://www.parliament.uk/", :target => "_blank"} current parliament.uk
-            website
-          %li
-            %a{:href => "/meta/cookie-policy"} Cookie Policy
+            %a{:href => "/meta/cookie-policy"}= t('cookie_policy')

data/app/views/pugin/components/_header.html.haml

@@ -1,7 +1,6 @@
 %header
-  .c-fs.header
-    .c-fg
+  .container--full-screen.header
+    .container--full-grid
       .row--indent-horizontal
         .header__logo
-          %a{:href => "/"}
-            %img{:alt => "parliament.uk", :src => "#{Rails.application.secrets.asset_location_url}/images/parliament-uk--white.png", :srcset => "#{Rails.application.secrets.asset_location_url}/images/parliament-uk--white.svg"}/
+          %a{:href => "/"}= t('parliament_header')

data/app/views/pugin/components/_status.html.haml

@@ -1,6 +1,5 @@
 .highlight__status
-  %div{class: "c-fs status#{ status.nil? ? '' : "__#{status}"  }"}
-    .c-fg
+  %div{class: "container--full-screen status#{ status.nil? ? '' : "__#{status}"  }"}
+    .container--full-grid
       .row--indent-horizontal
-        %p This is a #{link_to '<strong>BETA</strong>'.html_safe, '/' }. Give #{link_to 'feedback', 'https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&redirectlink=%2F&cancelRedirectLink=%2F&category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf'.html_safe} to improve it.
-            
+        %p This is a test website, so may be inaccurate or misleading - #{link_to 'give feedback', 'https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&redirectlink=%2F&cancelRedirectLink=%2F&category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf', target: '_blank', title: 'website opens in a new window'.html_safe} to help improve it. Return to #{link_to 'current website', 'https://www.parliament.uk'}.

data/app/views/pugin/elements/_skip-content.html.haml

@@ -0,0 +1 @@
+%a.sr-only.sr-only--focusable{:href => "#content", :id => "skiplink"} Skip to main content

data/app/views/pugin/javascript/_google_tag_manager.html.haml

@@ -2,4 +2,4 @@
 new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','#{Rails.application.secrets.gtm_key}');</script>
+})(window,document,'script','dataLayer','#{ENV['GTM_KEY']}');</script>

data/app/views/pugin/javascript/_google_tag_manager_noscript.html.haml

@@ -1,2 +1,2 @@
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=#{Rails.application.secrets.gtm_key}"
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=#{ENV['GTM_KEY']}"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>

data/app/views/pugin/layouts/pugin.html.haml

@@ -1,23 +1,22 @@
 !!! 5
 %html{lang:'en'}
   %head
-    %title Parliamentary Digital Service
-    %link{rel: 'stylesheet', href: "#{Rails.application.secrets.asset_location_url}/stylesheets/main.css" }
-    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0' }
+    %title= content_for?(:title) ? content_for(:title) + ' - ' + t('website_brand') : t('website_brand')
+    %link{rel: 'stylesheet', href: "#{ENV['ASSET_LOCATION_URL']}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
+    %meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
     = favicon_link_tag 'pugin/favicon.ico'
     - if Rails.application.secrets.gtm_key
       = render partial: 'pugin/javascript/google_tag_manager'
-  %body
+  %body.no-js
     - if Rails.application.secrets.gtm_key
       = render partial: 'pugin/javascript/google_tag_manager_noscript'
+    = render partial: 'pugin/elements/skip-content'
+    = render 'pugin/components/header'
+    = render partial: 'pugin/components/status', locals: { status: nil }
     %main#content
-      %a#top
-      = render 'pugin/components/header'
-      = render partial: 'pugin/components/status', locals: { status: nil }
-      .c-fg
+      .container--full-grid
         .row--indent-full
           = yield
-      .footer-push
     = render 'pugin/components/footer'
-    = javascript_include_tag 'pugin/pugin', 'data-turbolinks-track' => true
-    -#%script{src: 'http://CDN.com/app.js'}
+    %script{src: "#{ENV['ASSET_LOCATION_URL']}/#{Pugin::ASSET_VERSION}/javascripts/main.js"}

data/config/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  website_brand: "UK Parliament"
+  current_mp_for: "Current MP for"
+  parliament_uk: "Parliament.uk"
+  open_new_window: "web site opens in a new window"
+  pds_blog: "Parliamentary Digital Service blog"
+  current_website: "Current Parliament.uk website"
+  cookie_policy: "Cookie Policy"
+  parliament_header: "UK Parliament"
+  no_content:
+    empty_list:
+      members:
+        description: "Sorry there are no results for '%{letter}'"

data/lib/pugin.rb

@@ -1,4 +1,5 @@
 require 'pugin/engine'
+require 'pugin/version'
 
 module Pugin
   # Your code goes here...

data/lib/pugin/version.rb

@@ -1,3 +1,4 @@
 module Pugin
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.5.0'.freeze
+  ASSET_VERSION = '1.2.6'.freeze
 end

data/spec/pugin_spec.rb

@@ -4,4 +4,12 @@ describe Pugin do
   it 'is a module' do
     expect(Pugin).to be_a(Module)
   end
+
+  it 'has a version' do
+  	expect(Pugin::VERSION).not_to be_nil
+  end
+
+  it 'has an asset version' do
+  	expect(Pugin::ASSET_VERSION).not_to be_nil
+  end
 end

data/spec/views/pugin/cards/_person-list.html.haml_spec.rb

@@ -17,7 +17,7 @@ describe 'pugin/cards/_person-list.html.haml', type: :view do
 
     before :each do
       @people = [person]
-      allow(person).to receive(:full_name).and_return('Jane Smith')
+      allow(person).to receive(:display_name).and_return('Jane Smith')
       allow(person).to receive(:graph_id).and_return('123')
 
       allow(constituency1).to receive(:name).and_return('Hackney')
@@ -44,6 +44,7 @@ describe 'pugin/cards/_person-list.html.haml', type: :view do
 
       allow(person).to receive(:seat_incumbencies).and_return([seat_incumbency1, seat_incumbency2])
       allow(person).to receive(:constituencies).and_return([constituency1,constituency2])
+      allow(person).to receive(:statuses).and_return({house_membership_status: ['Current MP']})
       allow(person).to receive(:party_memberships).and_return([party_memberships1,party_memberships2])
       allow(person).to receive(:parties).and_return([party1,party2])
     end
@@ -54,19 +55,12 @@ describe 'pugin/cards/_person-list.html.haml', type: :view do
       expect(rendered).to eq(
 <<DATA
 <ol class='list'>
-<li class='list--item'>
-<ul class='list'>
-<li>
+<li class='list__item'>
+<h2>
 <a href='/people/123'>Jane Smith</a>
-</li>
-<li>
-MP for
-<a href='/constituencies/123'>Hackney</a>
-</li>
-<li>
-<a href='/parties/123'>Labour</a>
-</li>
-</ul>
+</h2>
+<p>Current MP for Hackney</p>
+<p>Labour</p>
 </li>
 </ol>
 DATA
@@ -74,6 +68,27 @@ DATA
     end
   end
 
+  context 'with no people' do
+    before :each do
+      @people = []
+    end
+
+    it 'renders as expected' do
+      render partial: 'pugin/cards/person-list', locals: { people: @people, letter: 'a' }
+
+      expect(response).to eq(<<DATA
+<ol class='list'>
+<li class='list__item'>
+<p>Sorry there are no results for 'A'</p>
+</li>
+</ol>
+DATA
+                            )
+    end
+
+  end
+
+
   context 'with no data' do
     let(:person) { Class.new }
 
@@ -89,10 +104,6 @@ DATA
       expect(rendered).to eq(
 <<DATA
 <ol class='list'>
-<li class='list--item'>
-<ul class='list'>
-</ul>
-</li>
 </ol>
 DATA
                               )
@@ -105,6 +116,9 @@ DATA
     before :each do
       @people = [person]
 
+      allow(person).to receive(:display_name).and_return('')
+      allow(person).to receive(:graph_id).and_return('123')
+
       allow(constituency1).to receive(:name).and_return('Hackney')
       allow(constituency1).to receive(:graph_id).and_return('123')
       allow(constituency2).to receive(:name).and_return('Stoke')
@@ -129,6 +143,7 @@ DATA
 
       allow(person).to receive(:seat_incumbencies).and_return([seat_incumbency1, seat_incumbency2])
       allow(person).to receive(:constituencies).and_return([constituency1,constituency2])
+      allow(person).to receive(:statuses).and_return({house_membership_status: ['Current MP']})
       allow(person).to receive(:party_memberships).and_return([party_memberships1,party_memberships2])
       allow(person).to receive(:parties).and_return([party1,party2])
     end
@@ -139,16 +154,12 @@ DATA
       expect(rendered).to eq(
 <<DATA
 <ol class='list'>
-<li class='list--item'>
-<ul class='list'>
-<li>
-MP for
-<a href='/constituencies/123'>Hackney</a>
-</li>
-<li>
-<a href='/parties/123'>Labour</a>
-</li>
-</ul>
+<li class='list__item'>
+<h2>
+<a href='/people/123'></a>
+</h2>
+<p>Current MP for Hackney</p>
+<p>Labour</p>
 </li>
 </ol>
 DATA
@@ -162,7 +173,7 @@ DATA
     before :each do
       @people = [person]
 
-      allow(person).to receive(:full_name).and_return('Jane Smith')
+      allow(person).to receive(:display_name).and_return('Jane Smith')
       allow(person).to receive(:graph_id).and_return('123')
 
       allow(party1).to receive(:name).and_return('Labour')
@@ -178,6 +189,7 @@ DATA
 
       allow(person).to receive(:seat_incumbencies).and_return([seat_incumbency1, seat_incumbency2])
       allow(person).to receive(:constituencies).and_return([])
+      allow(person).to receive(:statuses).and_return({house_membership_status: ['Current MP']})
       allow(person).to receive(:party_memberships).and_return([party_memberships1,party_memberships2])
       allow(person).to receive(:parties).and_return([party1,party2])
     end
@@ -188,15 +200,11 @@ DATA
       expect(rendered).to eq(
 <<DATA
 <ol class='list'>
-<li class='list--item'>
-<ul class='list'>
-<li>
+<li class='list__item'>
+<h2>
 <a href='/people/123'>Jane Smith</a>
-</li>
-<li>
-<a href='/parties/123'>Labour</a>
-</li>
-</ul>
+</h2>
+<p>Labour</p>
 </li>
 </ol>
 DATA
@@ -209,7 +217,7 @@ DATA
 
     before :each do
       @people = [person]
-      allow(person).to receive(:full_name).and_return('Jane Smith')
+      allow(person).to receive(:display_name).and_return('Jane Smith')
       allow(person).to receive(:graph_id).and_return('123')
 
       allow(constituency1).to receive(:name).and_return('Hackney')
@@ -225,6 +233,7 @@ DATA
 
       allow(person).to receive(:seat_incumbencies).and_return([seat_incumbency1, seat_incumbency2])
       allow(person).to receive(:constituencies).and_return([constituency1,constituency2])
+      allow(person).to receive(:statuses).and_return({house_membership_status: ['Current MP']})
       allow(person).to receive(:party_memberships).and_return([party_memberships1,party_memberships2])
       allow(person).to receive(:parties).and_return([])
     end
@@ -235,16 +244,11 @@ DATA
       expect(rendered).to eq(
 <<DATA
 <ol class='list'>
-<li class='list--item'>
-<ul class='list'>
-<li>
+<li class='list__item'>
+<h2>
 <a href='/people/123'>Jane Smith</a>
-</li>
-<li>
-MP for
-<a href='/constituencies/123'>Hackney</a>
-</li>
-</ul>
+</h2>
+<p>Current MP for Hackney</p>
 </li>
 </ol>
 DATA

data/spec/views/pugin/components/_footer.html.haml_spec.rb

@@ -6,24 +6,17 @@ describe 'pugin/components/_footer.html.haml', type: :view do
   it 'renders as expected' do
     render
 
-    expect(response).to eq(
-<<DATA
+    expect(response).to eq(<<DATA
 <footer>
-<div class='c-fs footer'>
-<div class='c-fg'>
+<div class='container--full-screen footer'>
+<div class='container--full-grid'>
 <div class='row--indent-horizontal'>
 <div class='footer__logo'>
-<img alt='parliament.uk' src='/images/parliament-uk--darkgrey.png' srcset='/images/parliament-uk--darkgrey.svg'>
+<p>Parliament.uk</p>
 </div>
 <ul class='footer__list'>
 <li>
-Parliament.uk
-<a href='https://pds.blog.parliament.uk/' target='_blank'>digital blog</a>
-</li>
-<li>
-Visit the
-<a href='https://www.parliament.uk/' target='_blank'>current parliament.uk</a>
-website
+<a href='https://www.parliament.uk/'>Current Parliament.uk website</a>
 </li>
 <li>
 <a href='/meta/cookie-policy'>Cookie Policy</a>

data/spec/views/pugin/components/_header.html.haml_spec.rb

@@ -8,13 +8,11 @@ describe 'pugin/components/_header.html.haml', type: :view do
 
     expect(response).to eq(<<DATA
 <header>
-<div class='c-fs header'>
-<div class='c-fg'>
+<div class='container--full-screen header'>
+<div class='container--full-grid'>
 <div class='row--indent-horizontal'>
 <div class='header__logo'>
-<a href='/'>
-<img alt='parliament.uk' src='#{Rails.application.secrets.asset_location_url}/images/parliament-uk--white.png' srcset='#{Rails.application.secrets.asset_location_url}/images/parliament-uk--white.svg'>
-</a>
+<a href='/'>UK Parliament</a>
 </div>
 </div>
 </div>

data/spec/views/pugin/components/_status.html.haml_spec.rb

@@ -10,10 +10,10 @@ describe 'pugin/components/_status.html.haml', type: :view do
       expect(response).to eq(
 <<DATA
 <div class='highlight__status'>
-<div class='c-fs status'>
-<div class='c-fg'>
+<div class='container--full-screen status'>
+<div class='container--full-grid'>
 <div class='row--indent-horizontal'>
-<p>This is a <a href="/"><strong>BETA</strong></a>. Give <a href="https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&redirectlink=%2F&cancelRedirectLink=%2F&category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf">feedback</a> to improve it.</p>
+<p>This is a test website, so may be inaccurate or misleading - <a target="_blank" title="website opens in a new window" href="https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&amp;redirectlink=%2F&amp;cancelRedirectLink=%2F&amp;category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf">give feedback</a> to help improve it. Return to <a href="https://www.parliament.uk">current website</a>.</p>
 </div>
 </div>
 </div>
@@ -30,10 +30,10 @@ DATA
       expect(rendered).to eq(
 <<DATA
 <div class='highlight__status'>
-<div class='c-fs status__test'>
-<div class='c-fg'>
+<div class='container--full-screen status__test'>
+<div class='container--full-grid'>
 <div class='row--indent-horizontal'>
-<p>This is a <a href="/"><strong>BETA</strong></a>. Give <a href="https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&redirectlink=%2F&cancelRedirectLink=%2F&category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf">feedback</a> to improve it.</p>
+<p>This is a test website, so may be inaccurate or misleading - <a target="_blank" title="website opens in a new window" href="https://ukparliament-self.achieveservice.com/en/AchieveForms/?form_uri=sandbox-publish://AF-Process-032e1b1d-958f-4402-9ab2-97a38ed9b899/AF-Stage9b7ecae8-0c85-4ee7-afda-b256cffe5f08/definition.json&amp;redirectlink=%2F&amp;cancelRedirectLink=%2F&amp;category=AF-Category-48936b5c-9329-48c7-a0a5-563463aacadf">give feedback</a> to help improve it. Return to <a href="https://www.parliament.uk">current website</a>.</p>
 </div>
 </div>
 </div>

data/spec/views/pugin/layouts/pugin.html.haml_spec.rb

@@ -13,8 +13,7 @@ describe 'pugin/layouts/pugin.html.haml', type: :view do
 
     it 'renders HAML without errors' do
       render
-
-      expect(rendered).to include('<title>Parliamentary Digital Service</title>')
+      expect(rendered).to have_title(I18n.t('website_brand'))
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,10 +182,12 @@ files:
 - app/views/pugin/components/_footer.html.haml
 - app/views/pugin/components/_header.html.haml
 - app/views/pugin/components/_status.html.haml
+- app/views/pugin/elements/_skip-content.html.haml
 - app/views/pugin/javascript/_google_tag_manager.html.haml
 - app/views/pugin/javascript/_google_tag_manager_noscript.html.haml
 - app/views/pugin/layouts/pugin.html.haml
 - config/application.rb
+- config/locales/en.yml
 - config/routes.rb
 - lib/pugin.rb
 - lib/pugin/engine.rb