pugin 1.6.23 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a503d459b86356f15aef4ed339eb0467c97e46
-  data.tar.gz: 04a32c19bb7e23a37bffaa9ca4f67e305e93e6ad
+  metadata.gz: 78d4be137c2b99ece40c087b06cbae3746902c0a
+  data.tar.gz: db6c8d049ec4d22175a5fca5c751965a1e584c08
 SHA512:
-  metadata.gz: 8b217d286422c4d979d05116fff4010b149fc1d4cc35effa67930abf7a9bfdc18dfc84f3a0aada7f8ec3138e20fb1549162af1e5333ad3af8a28f7711b268b1a
-  data.tar.gz: 9d678e0dac1c7195080ae352532849d6d57d65946477f43fd9f8c91673a7d44fa3986c3929f28a1c3def2d53d503bdafca611455bf552b6fcca9377277a15e73
+  metadata.gz: a2c46fa0ecb211eefe905ce031476ab1cd1167db2644d33e76ba324beb54156a55dc30bea6cc90f293fe8e3d1d746fa2edecdec73ede0a5898457532d73a3628
+  data.tar.gz: 2c880c8c64bc83a1a4fa636d4400a173d32f998807e96c0659e8371842365bb176e575f06e32ff0a791615d7de884c14630e4b898e6d9c0cc93d0c5169970196

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

@@ -1,25 +1,27 @@
 -if people.empty?
   %ol.list--block
     %li
-      .list--details
-        %p
-          = "#{I18n.t('no_content.empty_list.members.description')}" 
-          = params[:letter].nil? ? "" : "#{I18n.t('no_content.empty_list.members.for')} '#{params[:letter].upcase}'"
+      .card
+        .card__details
+          %p
+            = "#{I18n.t('no_content.empty_list.members.description')}"
+            = params[:letter].nil? ? "" : "#{I18n.t('no_content.empty_list.members.for')} '#{params[:letter].upcase}'"
 -else
   %ol.list--block
     - people.each do |person|
       - if person.respond_to?(:graph_id)
         %li
-          .list--details
-            %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.any?
-              - seat_incumbency = person.seat_incumbencies.select(&:current?).first
-              - if seat_incumbency && seat_incumbency.constituency
-                %p= "#{I18n.t('pugin.cards.person-list.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
+          .card
+            .card__details
+              %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.any?
+                - seat_incumbency = person.seat_incumbencies.select(&:current?).first
+                - if seat_incumbency && seat_incumbency.constituency
+                  %p= "#{I18n.t('pugin.cards.person-list.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/committees/list/_list.html.haml

@@ -1,7 +1,8 @@
 %li
-  .list--details
-    - if committees.respond_to?(:name)
-      %h2= committees.name
-    - else
-      %h2= committees.formal_body.name
-    %p= "" ? committees.date_range : committees.formal_body.date_range
+  .card
+    .card__details
+      - if committees.respond_to?(:name)
+        %h2= committees.name
+      - else
+        %h2= committees.formal_body.name
+      %p= "" ? committees.date_range : committees.formal_body.date_range

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

@@ -1,7 +1,7 @@
 .status--banner__beta
   .container
     %span.hint= I18n.t('pugin.hints.beta')
-    %ul.list--flex
+    %ul.list--inline
       %li
         = I18n.t('pugin.components.status.beta.pages_being_tested',
         link: link_to(t('pugin.components.status.beta.give_feedback'),
@@ -23,4 +23,3 @@
         = I18n.t('pugin.components.status.election_day_text')
         = succeed "." do
           %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

@@ -1,25 +1,26 @@
 %li
-  .list--details
-    - 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
-      - if !constituencies.members.empty?
-        %p= constituencies.current_member_display_name
-        %p= constituencies.current_member_party_name
+  .card
+    .card__details
+      - 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
+        - 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
-        %p= I18n.t('pugin.constituencies.list.current_constituency.vacant').capitalize
-    - else
-      %h2
-        - date_string = " (#{l(constituencies.start_date, format: :year_only)} - #{l(constituencies.end_date, format: :year_only)})" if constituencies.respond_to?(:start_date) && constituencies.respond_to?(:end_date)
-        %a{:href => "/constituencies/#{constituencies.graph_id}"}= "#{constituencies.name}#{date_string}"
-      %p= "#{t('pugin.constituencies.list.former_constituency.former').capitalize} #{t('pugin.constituencies.list.former_constituency.constituency')}"
+        %h2
+          - date_string = " (#{l(constituencies.start_date, format: :year_only)} - #{l(constituencies.end_date, format: :year_only)})" if constituencies.respond_to?(:start_date) && constituencies.respond_to?(:end_date)
+          %a{:href => "/constituencies/#{constituencies.graph_id}"}= "#{constituencies.name}#{date_string}"
+        %p= "#{t('pugin.constituencies.list.former_constituency.former').capitalize} #{t('pugin.constituencies.list.former_constituency.constituency')}"

data/app/views/pugin/people/list/lord/_lord.html.haml

@@ -1,26 +1,27 @@
-- if Pugin::Feature::Bandiera.show_list_images?
-  %figure
-    %a{ href: "/people/#{lord.graph_id}", aria: { hidden: "true" }, tabindex: "-1" }
-      %picture
-        - if lord.image_id != "placeholder"
-          %img{ src: "#{ENV['IMAGE_SERVICE_URL']}/#{lord.image_id}.jpeg?crop=CU_1:1&width=186&quality=80", alt: "#{lord.display_name}" }
-        - else
-          %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
+.card
+  - if Pugin::Feature::Bandiera.show_list_images?
+    %figure
+      %a{ href: "/people/#{lord.graph_id}", aria: { hidden: "true" }, tabindex: "-1" }
+        %picture
+          - if lord.image_id != "placeholder"
+            %img{ src: "#{ENV['IMAGE_SERVICE_URL']}/#{lord.image_id}.jpeg?crop=CU_1:1&width=186&quality=80", alt: "#{lord.display_name}" }
+          - else
+            %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
-.list--details
-  %h2
-    %a{href: "/people/#{lord.graph_id}"}= lord.display_name
+  .card__details
+    %h2
+      %a{href: "/people/#{lord.graph_id}"}= lord.display_name
 
-  -# Currently only takes the most recent incumbency as part of that parliamentary period
-  - most_recent_incumbency = lord.most_recent_seat_incumbency
+    -# Currently only takes the most recent incumbency as part of that parliamentary period
+    - most_recent_incumbency = lord.most_recent_seat_incumbency
 
-  - if @parliament # parliament lord
-    %p= "Member of the #{t('house_of_lords')}"
-    %p= lord&.parties&.first&.name
+    - if @parliament # parliament lord
+      %p= "Member of the #{t('house_of_lords')}"
+      %p= lord&.parties&.first&.name
 
-  - elsif most_recent_incumbency&.current? # current lord
-    %p= lord.statuses[:house_membership_status].join(' and ')
-    %p= lord.try(:current_party).try(:name)
+    - elsif most_recent_incumbency&.current? # current lord
+      %p= lord.statuses[:house_membership_status].join(' and ')
+      %p= lord.try(:current_party).try(:name)
 
-  - else # former lord
-    %p= lord.statuses[:house_membership_status].join(' and ')
+    - else # former lord
+      %p= lord.statuses[:house_membership_status].join(' and ')

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

@@ -1,30 +1,31 @@
-- if Pugin::Feature::Bandiera.show_list_images?
-  %figure
-    %a{ href: "/people/#{member.graph_id}", aria: { hidden: "true" }, tabindex: "-1" }
-      %picture
-        - if member.image_id != "placeholder"
-          %img{ src: "#{ENV['IMAGE_SERVICE_URL']}/#{member.image_id}.jpeg?crop=CU_1:1&width=186&quality=80", alt: "#{member.display_name}" }
-        - else
-          %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
+.card
+  - if Pugin::Feature::Bandiera.show_list_images?
+    %figure
+      %a{ href: "/people/#{member.graph_id}", aria: { hidden: "true" }, tabindex: "-1" }
+        %picture
+          - if member.image_id != "placeholder"
+            %img{ src: "#{ENV['IMAGE_SERVICE_URL']}/#{member.image_id}.jpeg?crop=CU_1:1&width=186&quality=80", alt: "#{member.display_name}" }
+          - else
+            %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
-.list--details
-  %h2
-    %a{href: "/people/#{member.graph_id}"}= member.display_name
+  .card__details
+    %h2
+      %a{href: "/people/#{member.graph_id}"}= member.display_name
 
-  -# Currently only takes the most recent incumbency as part of that parliamentary period
-  - parliament_incumbency = member.most_recent_seat_incumbency
-  - current_incumbency = member.current_seat_incumbency
+    -# Currently only takes the most recent incumbency as part of that parliamentary period
+    - parliament_incumbency = member.most_recent_seat_incumbency
+    - current_incumbency = member.current_seat_incumbency
 
-  - if @parliament # parliament member
-    - if parliament_incumbency&.constituency && parliament_incumbency&.start_date
-      %p
-        = "#{parliament_incumbency.constituency.name} from #{l(parliament_incumbency.start_date, format: :default)}"
-        = parliament_incumbency&.end_date.nil? ? "#{I18n.t('shared.to_present')}" : "- #{l(parliament_incumbency.end_date, format: :default)}"
-      %p= member&.parties&.first&.name
+    - if @parliament # parliament member
+      - if parliament_incumbency&.constituency && parliament_incumbency&.start_date
+        %p
+          = "#{parliament_incumbency.constituency.name} from #{l(parliament_incumbency.start_date, format: :default)}"
+          = parliament_incumbency&.end_date.nil? ? "#{I18n.t('shared.to_present')}" : "- #{l(parliament_incumbency.end_date, format: :default)}"
+        %p= member&.parties&.first&.name
 
-  - elsif current_incumbency&.constituency # current member
-    %p= "#{I18n.t('pugin.people.list.member.mp_for')} #{current_incumbency&.constituency&.name}"
-    %p= member.try(:current_party).try(:name)
+    - elsif current_incumbency&.constituency # current member
+      %p= "#{I18n.t('pugin.people.list.member.mp_for')} #{current_incumbency&.constituency&.name}"
+      %p= member.try(:current_party).try(:name)
 
-  - else # former member
-    %p= member.statuses[:house_membership_status].join(' and ')
+    - else # former member
+      %p= member.statuses[:house_membership_status].join(' and ')

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.8.1'.freeze
+  ASSET_VERSION = '1.9.0'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.pugin-website')
   STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets')
   STATIC_ASSET_PUBLIC_LOCATION_URL = ENV.fetch('STATIC_ASSET_PUBLIC_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets-public')

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.6.23'.freeze
+  VERSION = '1.7.0'.freeze
 end

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

@@ -56,13 +56,15 @@ describe 'pugin/cards/_person-list.html.haml', type: :view do
 <<DATA
 <ol class='list--block'>
 <li>
-<div class='list--details'>
+<div class='card'>
+<div class='card__details'>
 <h2>
 <a href='/people/123'>Jane Smith</a>
 </h2>
 <p>Current MP for Hackney</p>
 <p>Labour</p>
 </div>
+</div>
 </li>
 </ol>
 DATA
@@ -81,12 +83,14 @@ DATA
       expect(response).to eq(<<DATA
 <ol class='list--block'>
 <li>
-<div class='list--details'>
+<div class='card'>
+<div class='card__details'>
 <p>
 There are no results
 
 </p>
 </div>
+</div>
 </li>
 </ol>
 DATA
@@ -162,13 +166,15 @@ DATA
 <<DATA
 <ol class='list--block'>
 <li>
-<div class='list--details'>
+<div class='card'>
+<div class='card__details'>
 <h2>
 <a href='/people/123'></a>
 </h2>
 <p>Current MP for Hackney</p>
 <p>Labour</p>
 </div>
+</div>
 </li>
 </ol>
 DATA
@@ -210,12 +216,14 @@ DATA
 <<DATA
 <ol class='list--block'>
 <li>
-<div class='list--details'>
+<div class='card'>
+<div class='card__details'>
 <h2>
 <a href='/people/123'>Jane Smith</a>
 </h2>
 <p>Labour</p>
 </div>
+</div>
 </li>
 </ol>
 DATA
@@ -256,12 +264,14 @@ DATA
 <<DATA
 <ol class='list--block'>
 <li>
-<div class='list--details'>
+<div class='card'>
+<div class='card__details'>
 <h2>
 <a href='/people/123'>Jane Smith</a>
 </h2>
 <p>Current MP for Hackney</p>
 </div>
+</div>
 </li>
 </ol>
 DATA

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.6.23
+  version: 1.7.0
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails