pugin 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accdab1a76837806ad84af124418b085e9deecec
-  data.tar.gz: ed05baacf0eb014615b4f5480ff6d54823b54071
+  metadata.gz: 62bf27bdd194a29bd4ef82af08511111f2a83dde
+  data.tar.gz: 6a4d1408767111ab9aed5132cebbc996ffd6e2f5
 SHA512:
-  metadata.gz: f083a6c86ea482d46f00b3b945c1408bb4b5bdb97f3613c16803af9be3db1d1b140e6a1ee79a6c9e5e563f21dbd5adb6c70e20ace8feecb3b6eed5c8f7333732
-  data.tar.gz: baced442f23ca4f7ead2f36873a20aea7a6145063b2a7a862568fce0ac47dbcb3a2423a0fd956ec81e88680cf51f62958b799c6e8d1190bff75f2a6cbb17bd3a
+  metadata.gz: e794680324924450484be4508cc7627c23286e8ba3b866e5801bbc64d8745816ab1db05993f8b7f0b9f29546155d3437e067b8154d021c2c2deb7f90b9decdb5
+  data.tar.gz: 84b54d81a475f5fe9409c624212d3b11b78b0f90ee7e7dd178a3b23cc7a83b8f5187a9f4a1f32a156043e7f4ef1b4422a7bd05ccd5dc6d8b885647477fa71b52

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

@@ -11,11 +11,10 @@
             %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}"
+              %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?

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

@@ -3,9 +3,9 @@
     .container--full-grid
       .row--indent-horizontal
         .footer__logo
-          %p= t('parliament_uk')
+          %p= t('.parliament_uk')
         %ul.footer__list
           %li
-            %a{:href => "https://www.parliament.uk/"}= t('current_website')
+            %a{:href => "https://www.parliament.uk/"}= t('.current_website')
           %li
-            %a{:href => "/meta/cookie-policy"}= t('cookie_policy')
+            %a{:href => "/meta/cookie-policy"}= t('.cookie_policy')

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

@@ -3,4 +3,4 @@
     .container--full-grid
       .row--indent-horizontal
         .header__logo
-          %a{:href => "/"}= t('parliament_header')
+          %a{:href => "/"}= t('.parliament_header')

data/app/views/pugin/components/_letter-navigation.html.haml

@@ -0,0 +1,12 @@
+.block
+  %p.lead
+    A to Z -
+    = params[:letter].present? ? "Showing results for #{params[:letter].capitalize}" : 'select a letter'
+  %nav{ aria:{ label: t('a_to_z.aria_label') } }
+    %ul.navigation__letter
+      - ('a'..'z').each do |letter|
+        %li{ data: { letter: letter }, class: ('active' if (params[:letter] == letter)) }
+          - if @letters.include?(letter.upcase)
+            = navigation_link(route_symbol: route_symbol, letter: letter, primary_id: local_assigns.fetch(:primary_id, nil), secondary_id: local_assigns.fetch(:secondary_id, nil))
+          - else
+            = letter

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

@@ -2,4 +2,4 @@
   %div{class: "container--full-screen status#{ status.nil? ? '' : "__#{status}"  }"}
     .container--full-grid
       .row--indent-horizontal
-        %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'}.
+        %p #{t('.status_text_1')} - #{link_to t('.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: t('open_new_window')} #{t('.status_text_2')} #{link_to t('.current_website'), 'https://www.parliament.uk'}.

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

@@ -1,7 +1,7 @@
 !!! 5
 %html{lang:'en'}
   %head
-    %title= content_for?(:title) ? content_for(:title) + ' - ' + t('website_brand') : t('website_brand')
+    %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'}

data/config/locales/en.yml

@@ -1,12 +1,24 @@
 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"
+  pugin:
+    cards:
+      person-list: 
+        current_mp_for: "Current MP for"
+    components:
+      header:
+        parliament_header: "UK Parliament"
+      status: 
+        current_website: 'current website'
+        status_text_1: 'This is a test website, so may be inaccurate or misleading'
+        status_text_2: 'to help improve it. Return to'
+        give_feedback: 'give feedback'
+      footer: 
+        parliament_uk: "Parliament.uk"
+        current_website: "Current Parliament.uk website"
+        cookie_policy: "Cookie Policy"
+    layouts: 
+      pugin: 
+        website_brand: "UK Parliament"
+  open_new_window: "website opens in a new window"
   no_content:
     empty_list:
       members:

data/lib/pugin.rb

@@ -1,4 +1,5 @@
 require 'pugin/engine'
+require 'pugin/railtie'
 require 'pugin/version'
 
 module Pugin

data/lib/pugin/railtie.rb

@@ -0,0 +1,8 @@
+require 'pugin/view_helpers'
+module Pugin
+	class Railtie < Rails::Railtie
+		initializer 'pugin.view_helpers' do 
+			ActionView::Base.send(:include, ViewHelpers)
+		end
+	end
+end

data/lib/pugin/version.rb

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

data/lib/pugin/view_helpers.rb

@@ -0,0 +1,11 @@
+module Pugin
+	module ViewHelpers
+		def navigation_link(route_symbol:, letter:, primary_id: nil, secondary_id: nil)
+			url = send(route_symbol, primary_id, secondary_id, letter) if primary_id && secondary_id
+			url = send(route_symbol, primary_id, letter) if primary_id && secondary_id.nil?
+			url = send(route_symbol, letter) unless url
+
+			return link_to(letter, url, data: { 'atoz-see': 'true' })
+		end
+	end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -181,6 +181,7 @@ files:
 - app/views/pugin/cards/_person-list.html.haml
 - app/views/pugin/components/_footer.html.haml
 - app/views/pugin/components/_header.html.haml
+- app/views/pugin/components/_letter-navigation.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
@@ -191,7 +192,9 @@ files:
 - config/routes.rb
 - lib/pugin.rb
 - lib/pugin/engine.rb
+- lib/pugin/railtie.rb
 - lib/pugin/version.rb
+- lib/pugin/view_helpers.rb
 - lib/tasks/pugin_tasks.rake
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js