pugin 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 259303eb81965bae622a9971052d92e96bd4b3a6
-  data.tar.gz: 7bdcda8a14b878b8d6a5d73e8fd7698e2ac65a56
+  metadata.gz: db65a3038af4b286b56e3a3c703bd546aedb00b5
+  data.tar.gz: 8ea7bfb273301fb92b98fb4d8a21c3db85efa09e
 SHA512:
-  metadata.gz: d8421e31c9923d5ad4348cd92397cacdd05da6dff2797b1768e043281dc240772503092f968792cc25254ba0c9dfcbbd1e39fc8b8af983e01caad0e2a42cc320
-  data.tar.gz: 5989219a43c3b68ccc1cdff33e30ca8d148544a500896f127455f58e73cab2156b22b0dc8e2317c3ec9ae3e131da7f75aab9cd3578604203156e3b78ffd60020
+  metadata.gz: 6c7b14a7c08bd6634705f888521490c9676aa55d60edf21f988abb1a824ea2d0702587d6a39bf0d8406b84f9b74d2fcb5bdf73bb63275a6412c8082e82b6085f
+  data.tar.gz: 0b124f735acbfcd8f9d0d4c8c5fdde974b94c573ba386e5b0451bad1a2911d08865e333f21ac83f1961347248541dc159648f1d596ec4d98a389c58fb7df9ee2

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

@@ -6,7 +6,7 @@
         - 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: "placeholder" }
+          %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
 .list--details
   - if !instance_variable_get("@parliament").nil? # parliament lord

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

@@ -7,7 +7,7 @@
         - 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: "placeholder" }
+          %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
 .list--details
   - if !instance_variable_get("@parliament").nil? # parliament member

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.6.4'.freeze
+  ASSET_VERSION = '1.7.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')
   class << self

data/lib/pugin/feature/bandiera.rb

@@ -37,8 +37,11 @@ module Pugin
 
 					@features.fetch('show-government-roles', false)
 				end
+                                def show_opposition_roles?
+                                        get_features
 
-
+                                        @features.fetch('show-opposition-roles', false)
+                                end
 
 				# Reset cached features
 				def reset

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.6.1'.freeze
+  VERSION = '1.6.3'.freeze
 end

data/spec/lib/pugin/feature/bandiera_spec.rb

@@ -10,7 +10,8 @@ describe 'The bandiera client feature set' do
         'show-post-election': :post_election?,
         'show-list-images': :show_list_images?,
         'show-committees': :show_committees?,
-        'show-government-roles': :show_government_roles?        
+        'show-government-roles': :show_government_roles?,
+        'show-opposition-roles': :show_opposition_roles?
     }
 
     method_hash.each do |flag_name, method_name|

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

@@ -14,21 +14,9 @@ describe 'pugin/components/_status.html.haml', type: :view do
     it 'renders a message not related to the dissolution' do
       render partial: 'pugin/components/status', locals: { status: nil }
 
-      expect(response).to eq(
-<<DATA
-<div class='status--banner'>
-<div class='container'>
-<p>
-<img alt='' aria-hidden='true' aria-label='caution' class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.4/icons/caution-circle-white.svg'>
-<span class='sr-only'>caution</span>
-This is a test website, so may be inaccurate.
-<a href='http://www.smartsurvey.co.uk/s/ukparliament-beta-website-feedback/'>Give feedback</a>
-to help improve it.
-</p>
-</div>
-</div>
-DATA
-      )
+      expect(rendered).not_to include(I18n.t('pugin.components.status.election_text_1'))
+      expect(rendered).not_to include(I18n.t('pugin.components.status.election_text_3'))
+      expect(rendered).not_to include(I18n.t('pugin.components.status.how_to_vote'))
     end
   end
 
@@ -41,23 +29,8 @@ DATA
 
     it 'renders a message that shows a link to register to vote' do
       render partial: 'pugin/components/status', locals: { status: nil }
-      expect(response).to eq(
-<<DATA
-<div class='status--banner'>
-<div class='container'>
-<p>
-<img alt='' aria-hidden='true' aria-label='caution' class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.4/icons/caution-circle-white.svg'>
-<span class='sr-only'>caution</span>
-This is a test website, so may be inaccurate.
-<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.
-</p>
-</div>
-</div>
-DATA
-      )
+
+      expect(rendered).to include("<a href='https://www.gov.uk/register-to-vote'>Register to vote</a>")
     end
   end
 
@@ -71,24 +44,7 @@ DATA
     it 'renders a message that reminds the user of the general election date' do
       render partial: 'pugin/components/status', locals: { status: nil }
 
-      expect(response).to eq(
-<<DATA
-<div class='status--banner'>
-<div class='container'>
-<p>
-<img alt='' aria-hidden='true' aria-label='caution' class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.4/icons/caution-circle-white.svg'>
-<span class='sr-only'>caution</span>
-This is a test website, so may be inaccurate.
-<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/'>how to vote</a>
-in the general election on 8 June.
-</p>
-</div>
-</div>
-DATA
-      )
+      expect(rendered).to include(I18n.t('pugin.components.status.election_text_2'))
     end
   end
 
@@ -103,23 +59,7 @@ DATA
     it 'renders a message that reminds the user of the general election date' do
       render partial: 'pugin/components/status', locals: { status: nil }
 
-      expect(response).to eq(
-<<DATA
-<div class='status--banner'>
-<div class='container'>
-<p>
-<img alt='' aria-hidden='true' aria-label='caution' class='icon--inline' src='https://s3-eu-west-1.amazonaws.com/web1live.pugin-website/1.6.4/icons/caution-circle-white.svg'>
-<span class='sr-only'>caution</span>
-This is a test website, so may be inaccurate.
-<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/'>how to vote</a>.
-</p>
-</div>
-</div>
-DATA
-      )
+      expect(rendered).to include(I18n.t('pugin.components.status.election_day_text'))
     end
   end
 

metadata

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