pugin 0.8.8 → 0.8.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/pugin/people/list/lord/_lord.html.haml +7 -6
  3. data/app/views/pugin/people/list/member/_member.html.haml +10 -9
  4. data/lib/pugin.rb +1 -1
  5. data/lib/pugin/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2463a6b85e377d1cd2e02188c6c62154a0a4089b
4
- data.tar.gz: 26ad945fca8fd366742174d70d942a1ee9be45ea
3
+ metadata.gz: 90158b803120cb366be6df4c1d010ed4f7e80249
4
+ data.tar.gz: ba063200603d98c648cc533eb2200ce3f472e65c
5
5
  SHA512:
6
- metadata.gz: a20dc06f48d7284661cecaf6c2e3a58753a883226dd534447dccf88641b9c5968aef80a978643b3d6fe0d53409ac579f88c7ac391437269a6a2a7d237c925b43
7
- data.tar.gz: 7899f161c3e97de17f6eefc73a5b8c1c8d8e01a0b6b8a6e67ccc70166fab8eb6e0f33cbe4c5ef1cd84ac386ff77e3cc2db0e1ea34e12a598c0bb09b2a3c7c8f5
6
+ metadata.gz: fcb9a801b71c8754efa4e10d8e4c6805dbc7953cd93aa76d80e45e5aa5d0c2942273c317e3b0c17300bb4f287c11e93bfb2a4204fb7e9365171050b3447b1eef
7
+ data.tar.gz: 4ff0f37907d3a3e08a0c6cb3e40ed011b25c197f702ff244fe5bbbccd13f73f07ecdebf5f9f8b8fa25a16dab6b3fce4e1fa05449eb86e26a44aada19de99299b
data/app/views/pugin/people/list/lord/_lord.html.haml CHANGED
@@ -1,16 +1,17 @@
1
1
  - current_incumbency = lord.house_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
2
2
  - if Pugin::Feature::Bandiera.show_list_images?
3
- - if lord.image_id != "placeholder"
4
- %img{:src => "#{ENV['IMAGE_SERVICE_URL']}/#{lord.image_id}.jpg?crop=CU_1:1&height=93", :alt => "#{lord.display_name}"}
5
- - else
6
- %img{:src => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_placeholder_list_image.png", :alt => "placeholder"}
3
+ %figure
4
+ - if lord.image_id != "placeholder"
5
+ %img{src: "#{ENV['IMAGE_SERVICE_URL']}/#{lord.image_id}.jpeg?crop=CU_1:1&width=186&quality=100", alt: "#{lord.display_name}"}
6
+ - else
7
+ %img{src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "placeholder"}
7
8
 
8
9
  .list--details
9
10
  - if !instance_variable_get("@parliament").nil? # parliament lord
10
11
 
11
12
  - elsif current_incumbency.current? # current lord
12
13
  %h2
13
- %a{:href => "/people/#{lord.graph_id}"}= lord.display_name
14
+ %a{href: "/people/#{lord.graph_id}"}= lord.display_name
14
15
  - unless lord.statuses[:house_membership_status].empty? && !lord.statuses[:house_membership_status].include?('Current MP')
15
16
  %p= lord.statuses[:house_membership_status].join(' and ')
16
17
  - unless lord.parties.empty?
@@ -20,6 +21,6 @@
20
21
 
21
22
  - else # former lord
22
23
  %h2
23
- %a{:href => "/people/#{lord.graph_id}"}= lord.display_name
24
+ %a{href: "/people/#{lord.graph_id}"}= lord.display_name
24
25
  - unless lord.statuses[:house_membership_status].empty? && !lord.statuses[:house_membership_status].include?('Current MP')
25
26
  %p= lord.statuses[:house_membership_status].join(' and ')
data/app/views/pugin/people/list/member/_member.html.haml CHANGED
@@ -1,14 +1,16 @@
1
1
  - current_incumbency = member.seat_incumbencies.select(&:current?).first
2
2
 
3
3
  - if Pugin::Feature::Bandiera.show_list_images?
4
- - if member.image_id != "placeholder"
5
- %img{:src => "#{ENV['IMAGE_SERVICE_URL']}/#{member.image_id}.jpg?crop=CU_1:1&height=93", :alt => "#{member.display_name}"}
6
- - else
7
- %img{:src => "https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/images/uk_parliament_placeholder_list_image.png", :alt => "placeholder"}
4
+ %figure
5
+ - if member.image_id != "placeholder"
6
+ %img{src: "#{ENV['IMAGE_SERVICE_URL']}/#{member.image_id}.jpeg?crop=CU_1:1&width=186&quality=100", alt: "#{member.display_name}"}
7
+ - else
8
+ %img{src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "placeholder"}
9
+
8
10
  .list--details
9
11
  - if !instance_variable_get("@parliament").nil? # parliament member
10
12
  %h2
11
- %a{:href => "/people/#{member.graph_id}"}= member.display_name
13
+ %a{href: "/people/#{member.graph_id}"}= member.display_name
12
14
  - unless member.constituencies.empty?
13
15
  - unless member.seat_incumbencies.nil?
14
16
  - member.seat_incumbencies.each do |seat_incumbency|
@@ -20,7 +22,7 @@
20
22
 
21
23
  - elsif !current_incumbency.nil? # current member
22
24
  %h2
23
- %a{:href => "/people/#{member.graph_id}"}= member.display_name
25
+ %a{href: "/people/#{member.graph_id}"}= member.display_name
24
26
  - unless member.constituencies.empty?
25
27
  - seat_incumbency = member.seat_incumbencies.select(&:current?).first
26
28
  - unless seat_incumbency.nil?
@@ -33,7 +35,6 @@
33
35
  - else # former member
34
36
 
35
37
  %h2
36
- %a{:href => "/people/#{member.graph_id}"}= member.display_name
38
+ %a{href: "/people/#{member.graph_id}"}= member.display_name
37
39
  - unless member.statuses[:house_membership_status].empty? && !member.statuses[:house_membership_status].include?('Current MP')
38
- %p= member.statuses[:house_membership_status].join(' and ')
39
-
40
+ %p= member.statuses[:house_membership_status].join(' and ')
data/lib/pugin.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'pugin/version'
2
2
 
3
3
  module Pugin
4
- ASSET_VERSION = '1.5.2'.freeze
4
+ ASSET_VERSION = '1.5.3'.freeze
5
5
  ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.pugin-website')
6
6
  STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.static-assets')
7
7
  class << self
data/lib/pugin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Pugin
2
- VERSION = '0.8.8'.freeze
2
+ VERSION = '0.8.9'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pugin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.8
4
+ version: 0.8.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Rayner
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-17 00:00:00.000000000 Z
11
+ date: 2017-07-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails