pugin 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21155ec1b0d35348a4a36c06779930e029640a84
-  data.tar.gz: be85a1ffa2cc92346541f53a0916245c73212823
+  metadata.gz: 8a5b6e369134c7091a88ca167a361d95facaddbc
+  data.tar.gz: 5c74be1364544a07ce711166f134d6c0cfd30c34
 SHA512:
-  metadata.gz: 2be2a35269c81cb83f2fd9ae3c4506ebd9b60f09d86a238e787245a32ff81ebac0f96295a2b91fb0b4a90e372cab9f6c1898d26e3da0e53a607a0f74fc85a1fa
-  data.tar.gz: d1c8ad210131eed9374bed5736498fee411c0d1d5d4a8b40d3dd6d9eaf1e1faa38f7ca9093580ba82cd434a85d8c58f449b1e6a07feed05f010ea023d810776d
+  metadata.gz: 4a6eb720e7916fde7a28becdcb9f59d3dfb6c5b1b51ad7891b3ecc03c6f244f5f7275c9c85565f89f0cf6941f43b01845dcb5d1ab087858d516da2bda399d233
+  data.tar.gz: a52bdbb2717ad7871e49f0622348654c6bed6a83a8f12035429f1a8078990345c038d8050c32d89fed9c3f35104bb0949ceb8fccf0376221ad7315431f01ecd4

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

@@ -2,7 +2,5 @@
   .container
     %h2.logo= I18n.t('pugin.components.footer.uk_parliament')
     %ul.list
-      %li
-        %a{:href => 'https://www.parliament.uk/'}= I18n.t('pugin.components.footer.current_website')
-      %li
-        %a{:href => 'http://beta.parliament.uk/meta/cookie-policy'}= I18n.t('pugin.components.footer.cookie_policy')
+      %li= link_to( I18n.t('pugin.components.footer.current_website'), root_path() )
+      %li= link_to( I18n.t('pugin.components.footer.cookie_policy'), meta_cookie_policy_path() )

data/app/views/pugin/layouts/_layout.html.haml

@@ -17,10 +17,10 @@
       %link{rel: 'alternate', type: alternate[:type], href: alternate[:href]}
   %body
     = render partial: 'pugin/javascript/has_js'
-    = render partial: 'pugin/components/status-cookie'
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager_noscript'
     = render partial: 'pugin/elements/skip-content'
+    = render partial: 'pugin/components/status-cookie'
     = render partial: 'pugin/components/status', locals: { status: nil } if Pugin::Feature::StatusBanner.enabled?
     = render 'pugin/components/header'
     = render partial: 'pugin/components/navigation-main' if Pugin::Feature::TopNavigation.enabled?

data/lib/pugin/feature/bandiera.rb

@@ -32,6 +32,12 @@ module Pugin
 
 					@features.fetch('show-committees', false)
 				end
+				def show_government_roles?
+					get_features
+
+					@features.fetch('show-government-roles', false)
+				end
+
 
 
 				# Reset cached features
@@ -47,5 +53,5 @@ module Pugin
 				end
 			end
 		end
-	end 
+	end
 end

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.0'.freeze
 end

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

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

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

@@ -3,20 +3,21 @@ require 'haml'
 
 describe 'pugin/components/_footer.html.haml', type: :view do
 
-  it 'renders as expected' do
+  before do
+    allow(view).to receive(:root_path).and_return("/")
+    allow(view).to receive(:meta_cookie_policy_path).and_return("/meta/cookie-policy")
+
     render
+  end
 
+  it 'renders as expected' do
     expect(response).to eq(<<DATA
 <footer>
 <div class='container'>
 <h2 class='logo'>UK Parliament</h2>
 <ul class='list'>
-<li>
-<a href='https://www.parliament.uk/'>Current Parliament.uk website</a>
-</li>
-<li>
-<a href='http://beta.parliament.uk/meta/cookie-policy'>Cookie Policy</a>
-</li>
+<li><a href="/">Current Parliament.uk website</a></li>
+<li><a href="/meta/cookie-policy">Cookie Policy</a></li>
 </ul>
 </div>
 </footer>

data/spec/views/pugin/layouts/_layout.html.haml_spec.rb

@@ -20,6 +20,7 @@ describe 'pugin/layouts/_layout.html.haml', type: :view do
     allow(view).to receive(:house_parties_current_path).and_return("houses/#{Parliament::Utils::Helpers::HousesHelper.commons_id}/parties/current/")
     allow(view).to receive(:find_your_constituency_path).and_return("/find-your-constituency")
     allow(view).to receive(:opensearch_description_url).and_return("http://localhost:3000/search/opensearch")
+    allow(view).to receive(:root_path).and_return("/")
     allow(view).to receive(:meta_cookie_policy_path).and_return("/meta/cookie-policy")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails