pugin 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb25051d41bd408702eb1e6383c25677e00322c
-  data.tar.gz: b686e4994dfdd6d2f62224bdc760670717531eb0
+  metadata.gz: 19739eb1cccd5bcfb1078247dfd557a66b51f6c0
+  data.tar.gz: 065ad1a97accf7f9d79e1e60e62b84e2af08ec80
 SHA512:
-  metadata.gz: 240848d958afa081600f591a89118226e7b0ce6909ef4b8cf467b356de0b6221f2d769d672d646981b377c8ef52155778b8412913995a6724b1af5eb637faf5c
-  data.tar.gz: 487aea54fd10eb611512d91fb37a72dd00078a3a78917d0857bcd1cf0d5013ca50c8ba4af1a1bf94c89b09403015f058ee1b069cda42845fe0546753f83c09cb
+  metadata.gz: 923abf02801b999c245d94c70ff2d9a906805b87d1a35a48c3b56706eac4305969f8029c0fbd8b2093eff0259ad45ff3fe6f5820bad30e86f8cd4150ec971bee
+  data.tar.gz: fb41b986516c73543e143f9eaebedf1e1e4e49c3d327fdeec6b856499df4e634a56820ee45d851908f4fd637bfab98e53891f33acf08e3fec88b18b802eae97d

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

@@ -1,3 +1,4 @@
 %header
   .container
-    %a.logo{:href => "/"}= I18n.t('pugin.components.header.parliament_header')
+    %a{:href => "/" }
+      %img{:src => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.4.6/images/uk_parliament_logo.png", :alt => "#{I18n.t('pugin.components.header.parliament_header')}", :class => "logo", :srcset => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.4.6/images/uk_parliament_logo.svg"}

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

@@ -1,5 +1,15 @@
 %li
-  - if constituencies.current?
+  - if !instance_variable_get("@parliament").nil? # parliament member
+    %h2
+      %a{:href => "/constituencies/#{constituencies.graph_id}"}= constituencies.name
+    -# Constituency has a member? TRUE = Member's Name : FALSE = "Vacant" text
+    - unless constituencies.members.empty?
+      - constituencies.seat_incumbencies.each do |incumbency|
+        %p= "#{incumbency.member.display_name} #{t('pugin.constituencies.list.from')} #{l(incumbency.start_date, format: :default)} - #{l(incumbency.end_date, format: :default)}"
+        - incumbency.member.party_memberships.each do |member_party|
+          %p= member_party.party.name
+
+  - elsif constituencies.current?
     %h2
       %a{:href => "/constituencies/#{constituencies.graph_id}"}= constituencies.name
     -# Constituency has a member? TRUE = Member's Name : FALSE = "Vacant" text

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

@@ -1,3 +1,3 @@
-- person_type = data.house_incumbencies.empty? ? "member" : "lord"
+- person_type = people.house_incumbencies.empty? ? "member" : "lord"
 %li.list__item
-  = render partial: "pugin/people/list/#{person_type}/#{person_type}", locals: { data: local_assigns.fetch(:data, []) }
+  = render partial: "pugin/people/list/#{person_type}/#{person_type}", locals: { "#{person_type}": local_assigns.fetch(:people, []), as: person_type }

data/app/views/pugin/people/list/member/_member.html.haml

@@ -1,4 +1,34 @@
-- current_incumbency = data.seat_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
-- current_incumbency = current_incumbency.current? ? "current" : "former"
+- current_incumbency = member.seat_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
 
-= render partial: "pugin/people/list/member/#{current_incumbency}/#{current_incumbency}_member", locals: { data: local_assigns.fetch(:data, []) }
+- if !instance_variable_get("@parliament").nil? # parliament member
+
+  %h2
+    %a{:href => "/people/#{member.graph_id}"}= member.display_name
+  - unless member.constituencies.empty?
+    - unless member.seat_incumbencies.nil?
+      - member.seat_incumbencies.each do |seat_incumbency|
+        %p= "#{seat_incumbency.constituency.name} from #{l(seat_incumbency.start_date, format: :default)} - #{l(seat_incumbency.end_date, format: :default)}"
+        
+  - unless member.parties.empty?
+    - member.party_memberships.each do |party_membership|
+      %p= party_membership.party.name
+
+- elsif current_incumbency.current? # current member
+
+  %h2
+    %a{:href => "/people/#{member.graph_id}"}= member.display_name
+  - if !member.constituencies.empty?
+    - seat_incumbency = member.seat_incumbencies.select(&:current?).first
+    - unless seat_incumbency.nil?
+      %p= "#{t('.current_mp_for')} #{seat_incumbency.constituency.name}"
+  - if !member.parties.empty?
+    - party_membership = member.party_memberships.select(&:current?).first
+    - unless party_membership.nil?
+      %p= party_membership.party.name
+
+- else # former member
+
+  %h2
+    %a{:href => "/people/#{member.graph_id}"}= member.display_name
+  - if !member.statuses[:house_membership_status].empty? && !member.statuses[:house_membership_status].include?('Current MP')
+    %p= member.statuses[:house_membership_status].join(' and ')

data/config/locales/en.yml

@@ -38,6 +38,7 @@ en:
                 current_mp_for: "Current MP for"
     constituencies: 
       list:
+        from: 'from'
         current_constituency:
           vacant: 'vacant'
         former_constituency:

data/lib/pugin.rb

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

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

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

@@ -9,7 +9,9 @@ describe 'pugin/components/_header.html.haml', type: :view do
     expect(response).to eq(<<DATA
 <header>
 <div class='container'>
-<a class='logo' href='/'>UK Parliament</a>
+<a href='/'>
+<img alt='UK Parliament' class='logo' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.4.6/images/uk_parliament_logo.png' srcset='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.4.6/images/uk_parliament_logo.svg'>
+</a>
 </div>
 </header>
 DATA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,8 +213,6 @@ files:
 - app/views/pugin/people/list/lord/current/_current_lord.html.haml
 - app/views/pugin/people/list/lord/former/_former_lord.html.haml
 - app/views/pugin/people/list/member/_member.html.haml
-- app/views/pugin/people/list/member/current/_current_member.html.haml
-- app/views/pugin/people/list/member/former/_former_member.html.haml
 - config/application.rb
 - config/locales/en.yml
 - config/routes.rb

data/app/views/pugin/people/list/member/current/_current_member.html.haml

@@ -1,10 +0,0 @@
-%h2
-  %a{:href => "/people/#{data.graph_id}"}= data.display_name
-- if !data.constituencies.empty?
-  - seat_incumbency = data.seat_incumbencies.select(&:current?).first
-  - unless seat_incumbency.nil?
-    %p= "#{t('.current_mp_for')} #{seat_incumbency.constituency.name}"
-- if !data.parties.empty?
-  - party_membership = data.party_memberships.select(&:current?).first
-  - unless party_membership.nil?
-    %p= party_membership.party.name

data/app/views/pugin/people/list/member/former/_former_member.html.haml

@@ -1,4 +0,0 @@
-%h2
-  %a{:href => "/people/#{data.graph_id}"}= data.display_name
-- if !data.statuses[:house_membership_status].empty? && !data.statuses[:house_membership_status].include?('Current MP')
-  %p= data.statuses[:house_membership_status].join(' and ')