pugin 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e098ca3ba1d75ad3f960e24dd0a5f693fcdf47
-  data.tar.gz: 57ed57564d93d81f01b1cf32f660f3883d1aaf2e
+  metadata.gz: 2e1de1c2ade9b160907ca841bc484a546361b4a4
+  data.tar.gz: 980035410a8fc7ba1d423984046a8dd14df75714
 SHA512:
-  metadata.gz: cfd518519aee88a2fe7633c9ad8f03b8d6d0a3f8e5aac2e74449a73c2bc69988a6cab7d5dfd35e6254fd64242fed61b0c165f3b3afbac5b6393ba959ef990cb0
-  data.tar.gz: e70e70e0710d93014a77bf10f9c0849494219439b8885aa38ae47cf7d8c8e6cd2a0932958d1409fa139487dae758c36442c41c67e60dafc1c9ba437e2b1d116d
+  metadata.gz: 0b94f9c82b3fd138014793cc5ea87337cb4472bfba22f819a7f4d02b99d0e46319332cddee76b81c535d2b32af99bf77200476c7ec74a13a0ea2c1f0559f5247
+  data.tar.gz: 27b493c136cba49f363b0ae0b9efe4f794b44a984866eb4bfef784a3e4c3277248c7f3624fdd289ce88694dcf113812c76344495ac34eda647652d02d582020a

data/app/views/pugin/components/_navigation-letter.haml

@@ -4,6 +4,11 @@
     = params[:letter].present? ? "#{I18n.t('pugin.components.navigation-letter.showing_results')} #{params[:letter].capitalize}" : "#{I18n.t('pugin.components.navigation-letter.select_letter')}"
   %nav.navigation--letter{ aria:{ label: I18n.t('pugin.components.navigation-letter.aria_label') } }
     %ol
+      %li{ data: { letter: 'all' }, class: ('active' unless local_assigns[:all_path]) } 
+        - if @letters.empty? || !local_assigns[:all_path]
+          %span= I18n.t('pugin.components.navigation-letter.all').capitalize
+        - else 
+          = link_to "#{I18n.t('pugin.components.navigation-letter.all').upcase}", send(all_path)
       - ('a'..'z').each do |letter|
         %li{ data: { letter: letter }, class: ('active' if (params[:letter] == letter)) }
           - if @letters.include?(letter.upcase)

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

@@ -2,7 +2,7 @@
   .container
     %p
       = I18n.t('pugin.components.status.status_text_1')
-      %a{ href: 'http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/', target: '_blank', title: I18n.t('open_new_window')}= I18n.t('pugin.components.status.give_feedback')
+      %a{ href: 'http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' }= I18n.t('pugin.components.status.give_feedback')
       = I18n.t('pugin.components.status.status_text_2')
       - if Pugin::Feature::Bandiera.dissolution?
         - if Pugin::Feature::Bandiera.register_to_vote?
@@ -10,10 +10,10 @@
           = I18n.t('pugin.components.status.election_text_1')
         - else
           = I18n.t('pugin.components.status.election_text_2')
-          %a{ href: 'http://www.parliament.uk/get-involved/elections/voting/', target: '_blank', title: I18n.t('open_new_window')}= I18n.t('pugin.components.status.how_to_vote')
+          %a{ href: 'http://www.parliament.uk/get-involved/elections/voting/' }= I18n.t('pugin.components.status.how_to_vote')
           = I18n.t('pugin.components.status.election_text_3')
       - elsif Pugin::Feature::Bandiera.election?
         = I18n.t('pugin.components.status.election_day_text')
         = succeed "." do
-          %a{ href: 'http://www.parliament.uk/get-involved/elections/voting/', target: '_blank', title: I18n.t('open_new_window')}= I18n.t('pugin.components.status.how_to_vote')
+          %a{ href: 'http://www.parliament.uk/get-involved/elections/voting/' }= I18n.t('pugin.components.status.how_to_vote')
 

data/app/views/pugin/constituencies/list/_list.html.haml

@@ -13,8 +13,12 @@
       %h2
         %a{:href => "/constituencies/#{constituencies.graph_id}"}= constituencies.name
       -# Constituency has a member? TRUE = Member's Name : FALSE = "Vacant" text
-      %p= constituencies.members.empty? ? I18n.t('pugin.constituencies.list.current_constituency.vacant').capitalize : constituencies.members.first.display_name
-    - else 
+      - if !constituencies.members.empty?
+        %p= constituencies.current_member_display_name
+        %p= constituencies.current_member_party_name
+      - else
+        %p= I18n.t('pugin.constituencies.list.current_constituency.vacant').capitalize
+    - else
       %h2
-        %a{:href => "/constituencies/#{constituencies.graph_id}"}= constituencies.name
+        %a{:href => "/constituencies/#{constituencies.graph_id}"}= "#{constituencies.name} (#{l(constituencies.start_date, format: :year_only)} - #{l(constituencies.end_date, format: :year_only)})"
       %p= "#{t('pugin.constituencies.list.former_constituency.former').capitalize} #{t('pugin.constituencies.list.former_constituency.constituency')}"

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:
+  time: 
+    formats:
+      year_only: "%Y"
   pugin:
     cards:
       person-list:
@@ -24,6 +27,7 @@ en:
         aria_label: "Paged navigation"
         select_letter: "select a letter"
         showing_results: "Showing results for"
+        all: "all"
       navigation-main:
         aria_label: "navigation"
         item_1: "MPs"

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.6.0'.freeze
+  ASSET_VERSION = '1.6.1'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.pugin-website')
   STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.static-assets')
   class << self

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

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

@@ -20,7 +20,7 @@ describe 'pugin/components/_status.html.haml', type: :view do
 <div class='container'>
 <p>
 This is a test website, so may be inaccurate.
-<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' target='_blank' title='website opens in a new window'>Give feedback</a>
+<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
 </p>
 </div>
@@ -45,7 +45,7 @@ DATA
 <div class='container'>
 <p>
 This is a test website, so may be inaccurate.
-<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' target='_blank' title='website opens in a new window'>Give feedback</a>
+<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
 <a href='https://www.gov.uk/register-to-vote'>Register to vote</a>
 in the general election by 22 May.
@@ -73,10 +73,10 @@ DATA
 <div class='container'>
 <p>
 This is a test website, so may be inaccurate.
-<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' target='_blank' title='website opens in a new window'>Give feedback</a>
+<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
 Find out
-<a href='http://www.parliament.uk/get-involved/elections/voting/' target='_blank' title='website opens in a new window'>how to vote</a>
+<a href='http://www.parliament.uk/get-involved/elections/voting/'>how to vote</a>
 in the general election on 8 June.
 </p>
 </div>
@@ -103,10 +103,10 @@ DATA
 <div class='container'>
 <p>
 This is a test website, so may be inaccurate.
-<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/' target='_blank' title='website opens in a new window'>Give feedback</a>
+<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
 to help improve it.
 Thursday 8 June is election day, find out
-<a href='http://www.parliament.uk/get-involved/elections/voting/' target='_blank' title='website opens in a new window'>how to vote</a>.
+<a href='http://www.parliament.uk/get-involved/elections/voting/'>how to vote</a>.
 </p>
 </div>
 </div>

data/spec/views/pugin/constituencies/list/_list.html.haml_spec.rb

@@ -1,56 +1,67 @@
 require 'spec_helper'
 require 'haml'
 
-describe 'pugin/constituencies/list/_list.html.haml', type: :view do 
+describe 'pugin/constituencies/list/_list.html.haml', type: :view do
 
   context 'with a current constituency data set' do
 
-    before :each do  
+    before :each do
       constituency = Class.new
+      members = Class.new
+      party = Class.new
+      allow(constituency).to receive(:current_member_display_name).and_return('Test Name')
+      allow(constituency).to receive(:current_member_party_name).and_return('Test Party')
       allow(constituency).to receive(:current?).and_return(true)
       allow(constituency).to receive(:name).and_return('Aberavon')
       allow(constituency).to receive(:graph_id).and_return('123')
-      allow(constituency).to receive(:members).and_return([]) 
+      allow(constituency).to receive(:members).and_return([])
       @constituencies = [constituency]
     end
 
-    it "shows the constituency's name as a link" do 
+    it "shows the constituency's name as a link" do
       render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
       expect(response).to include("<a href='/constituencies/123'>Aberavon</a>")
     end
 
-    context 'with a current member' do 
+    context 'with a current member' do
 
-      before :each do 
+      before :each do
         constituency = Class.new
         members = Class.new
-        allow(members).to receive(:display_name).and_return('Test Name')
-        allow(constituency).to receive(:members).and_return([members]) 
+        party = Class.new
+        allow(constituency).to receive(:current_member_display_name).and_return('Test Name')
+        allow(constituency).to receive(:current_member_party_name).and_return('Test Party')
+        allow(constituency).to receive(:members).and_return([members])
         allow(constituency).to receive(:current?).and_return(true)
         allow(constituency).to receive(:name).and_return('Aberavon')
         allow(constituency).to receive(:graph_id).and_return('123')
         @constituencies = [constituency]
       end
 
-      it "displays the member's name" do 
+      it "displays the member's name" do
         render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
         expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon</a>\n</h2>")
         expect(response).to include("<p>Test Name</p>")
       end
+
+      it "displays the member's party" do
+        render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
+        expect(response).to include("<p>Test Party</p>")
+      end
     end
 
-    context 'without a current member' do 
+    context 'without a current member' do
 
-      before :each do 
+      before :each do
         constituency = Class.new
         allow(constituency).to receive(:current?).and_return(true)
         allow(constituency).to receive(:name).and_return('Aberavon')
         allow(constituency).to receive(:graph_id).and_return('123')
-        allow(constituency).to receive(:members).and_return([]) 
+        allow(constituency).to receive(:members).and_return([])
         @constituencies = [constituency]
       end
 
-      it 'displays the vacant i18n message' do 
+      it 'displays the vacant i18n message' do
         render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
         expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon</a>\n</h2>")
         expect(response).to include("<p>Vacant</p>")
@@ -58,19 +69,22 @@ describe 'pugin/constituencies/list/_list.html.haml', type: :view do
     end
   end
 
-  context 'with a previous constituency data set' do 
+  context 'with a previous constituency data set' do
 
-    before :each do 
+    before :each do
       constituency = Class.new
       allow(constituency).to receive(:current?).and_return(false)
       allow(constituency).to receive(:name).and_return('Aberavon')
       allow(constituency).to receive(:graph_id).and_return('123')
+      allow(constituency).to receive(:start_date).and_return(DateTime.new(1929))
+      allow(constituency).to receive(:end_date).and_return(DateTime.new(1950))
+
       @constituencies = [constituency]
     end
 
-    it 'displays the previous constituency i18n message' do 
+    it 'displays the previous constituency i18n message' do
       render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
-      expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon</a>\n</h2>")
+      expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon (1929 - 1950)</a>\n</h2>")
       expect(response).to include("<p>Former constituency</p>")
     end
   end

data/spec/views/pugin/elements/_list.html.haml_spec.rb

@@ -27,6 +27,8 @@ describe 'pugin/components/_status.html.haml', type: :view do
       allow(constituency).to receive(:current?).and_return(false)
       allow(constituency).to receive(:name).and_return('Aberavon')
       allow(constituency).to receive(:graph_id).and_return('123')
+      allow(constituency).to receive(:start_date).and_return(DateTime.new(1929))
+      allow(constituency).to receive(:end_date).and_return(DateTime.new(1950))
       @constituencies = [constituency]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails