pugin 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb510cc6d68c860168a5de918b19f6246ee7d71
-  data.tar.gz: b77732cc776ba2204ba01e13a751024227187ff3
+  metadata.gz: 3246715f31f6b86d9d1533066aeae2d2de94ff9c
+  data.tar.gz: 973ab9b9f8be37a99242529540d01174054695a6
 SHA512:
-  metadata.gz: 65e9598adee17d7a493882a8b949dce6f06290befe460e13b5172362953edfca21aa5f800351f83f1f279d8a7c2a6a5b55612c3a1499dcb6c9d19249b61242e1
-  data.tar.gz: 006046e981b9abdc12f8b49dd86c8e87bfb7a2102a307ba80959285d990e8a25785944755eaa34f1ed9062ba5a4f8402b91a17a53ec48011bf992cf7a3f32d8b
+  metadata.gz: 413363d0a2ae9db72bec03c7eb8da231110fdf287b14257f8b3c93eea51268304fb308271d4503ab5b78778a75ab8b95f18ff1f7858d43529d62ebd8c7ad5da1
+  data.tar.gz: d37295264f43a2caa71d43f130399a33529506abc7c3d4484ce530b5f6a341129aed473d5e0c47dd6bcb69d54e00944d5ab58f6dd0909b6b0e9f69b879829dad

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

@@ -28,7 +28,6 @@
     = 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?
     %main
       = yield
     = render 'pugin/components/footer'

data/config/locales/en.yml

@@ -46,12 +46,6 @@ en:
         select_letter: "select a letter"
         showing_results: "Showing results for"
         all: "all"
-      navigation-main:
-        aria_label: "navigation"
-        item_1: "MPs"
-        item_2: "Lords"
-        item_3: "Parties and groups"
-        item_4: "Constituencies"
       status-cookie:
         cookie_content: 'Parliament.uk uses cookies to make the site simpler. %{link}.'
         about_cookies: 'Find out more about cookies'

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.10.2'.freeze
+  ASSET_VERSION = '1.10.3'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://static.parliament.uk/pugin')
   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://static.parliament.uk/assets-public')

data/lib/pugin/feature.rb

@@ -1,7 +1,6 @@
 require 'pugin/feature/simple_feature'
 require 'pugin/feature/status_banner'
 require 'pugin/feature/global_search'
-require 'pugin/feature/top_navigation'
 require 'pugin/feature/pingdom_feature'
 require 'pugin/feature/asset_overrides'
 require 'pugin/feature/bandiera'

data/lib/pugin/helpers/controller_helpers.rb

@@ -20,14 +20,6 @@ module Pugin
         Pugin::Feature.disable('GlobalSearch')
       end
 
-      def enable_top_navigation
-        Pugin::Feature.enable('TopNavigation')
-      end
-
-      def disable_top_navigation
-        Pugin::Feature.disable('TopNavigation')
-      end
-
       def enable_asset_overrides
         Pugin::Feature.enable('AssetOverrides')
       end

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.9.3'.freeze
+  VERSION = '1.9.4'.freeze
 end

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

@@ -16,20 +16,12 @@ describe Pugin::Feature::SimpleFeature do
       it 'only enables that sub class' do
         expect(Pugin::Feature::SimpleFeature.enabled?).to equal(false)
 
-        Pugin::Feature::TopNavigation.enable
-        expect(Pugin::Feature::TopNavigation.enabled?).to equal(true)
         expect(Pugin::Feature::SimpleFeature.enabled?).to equal(false)
 
-        Pugin::Feature::TopNavigation.disable
-        expect(Pugin::Feature::TopNavigation.enabled?).to equal(false)
-
         Pugin::Feature::SimpleFeature.enable
-        expect(Pugin::Feature::TopNavigation.enabled?).to equal(false)
         expect(Pugin::Feature::SimpleFeature.enabled?).to equal(true)
 
-        Pugin::Feature::TopNavigation.enable
         Pugin::Feature::SimpleFeature.disable
-        expect(Pugin::Feature::TopNavigation.enabled?).to equal(true)
         expect(Pugin::Feature::SimpleFeature.enabled?).to equal(false)
       end
     end

data/spec/lib/pugin/helpers/controller_helpers_spec.rb

@@ -48,25 +48,6 @@ describe 'pugin/helpers/controller_helpers.rb' do
 			expect(Pugin::Feature::GlobalSearch.disabled?).to equal(true)
 		end
 	end
-
-	context '#enable_top_navigation' do
-		it 'enables the top navigation' do
-			subject.enable_top_navigation
-			expect(Pugin::Feature::TopNavigation.enabled?).to equal(true)
-		end
-	end
-
-	context '#disable_top_navigation' do
-		before :each do
-			Pugin::Feature::TopNavigation.enable
-		end
-
-		it 'disables the top navigation' do
-			expect(Pugin::Feature::TopNavigation.disabled?).to equal(false)
-			subject.disable_top_navigation
-			expect(Pugin::Feature::TopNavigation.disabled?).to equal(true)
-		end
-	end
 	
 	context '#reset_bandiera_features' do
 		before :each do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -198,7 +198,6 @@ files:
 - app/views/pugin/components/_global-search.haml
 - app/views/pugin/components/_header.haml
 - app/views/pugin/components/_navigation-letter.haml
-- app/views/pugin/components/_navigation-main.haml
 - app/views/pugin/components/_status-cookie.haml
 - app/views/pugin/components/_status.haml
 - app/views/pugin/constituencies/list/_list.html.haml
@@ -238,7 +237,6 @@ files:
 - lib/pugin/feature/pingdom_feature.rb
 - lib/pugin/feature/simple_feature.rb
 - lib/pugin/feature/status_banner.rb
-- lib/pugin/feature/top_navigation.rb
 - lib/pugin/helpers/controller_helpers.rb
 - lib/pugin/railtie.rb
 - lib/pugin/version.rb
@@ -301,7 +299,6 @@ files:
 - spec/lib/pugin/feature/bandiera_spec.rb
 - spec/lib/pugin/feature/simple_feature_spec.rb
 - spec/lib/pugin/feature/status_banner_spec.rb
-- spec/lib/pugin/feature/top_navigation_spec.rb
 - spec/lib/pugin/feature_spec.rb
 - spec/lib/pugin/helpers/controller_helpers_spec.rb
 - spec/pugin/engine_spec.rb
@@ -312,7 +309,6 @@ files:
 - spec/views/pugin/components/_footer.html.haml_spec.rb
 - spec/views/pugin/components/_header.html.haml_spec.rb
 - spec/views/pugin/components/_navigation-letter.html.haml_spec.rb
-- spec/views/pugin/components/_navigation-main.html.haml_spec.rb
 - spec/views/pugin/components/_status.html.haml_spec.rb
 - spec/views/pugin/constituencies/list/_list.html.haml_spec.rb
 - spec/views/pugin/elements/_list.html.haml_spec.rb
@@ -403,7 +399,6 @@ test_files:
 - spec/lib/pugin/feature_spec.rb
 - spec/lib/pugin/helpers/controller_helpers_spec.rb
 - spec/lib/pugin/feature/status_banner_spec.rb
-- spec/lib/pugin/feature/top_navigation_spec.rb
 - spec/lib/pugin/feature/simple_feature_spec.rb
 - spec/lib/pugin/feature/bandiera_spec.rb
 - spec/lib/pugin/feature/asset_overrides_spec.rb
@@ -415,7 +410,6 @@ test_files:
 - spec/views/pugin/components/_header.html.haml_spec.rb
 - spec/views/pugin/components/_navigation-letter.html.haml_spec.rb
 - spec/views/pugin/components/_footer.html.haml_spec.rb
-- spec/views/pugin/components/_navigation-main.html.haml_spec.rb
 - spec/views/pugin/elements/_list.html.haml_spec.rb
 - spec/views/pugin/people/list/lord/_lord.html.haml_spec.rb
 - spec/views/pugin/people/list/member/_member.html.haml_spec.rb

data/app/views/pugin/components/_navigation-main.haml

@@ -1,11 +0,0 @@
-%nav.navigation--main{aria:{ label: I18n.t('pugin.components.navigation-main.aria_label') } }
-  .container
-    %ul
-      %li 
-        = link_to(I18n.t('pugin.components.navigation-main.item_1'), mps_path)
-      %li
-        = link_to(I18n.t('pugin.components.navigation-main.item_2'), house_members_current_a_z_letter_path(Parliament::Utils::Helpers::HousesHelper.lords_id, 'a'))
-      %li
-        = link_to(I18n.t('pugin.components.navigation-main.item_4'), find_your_constituency_path)
-      %li
-        = link_to(I18n.t('pugin.components.navigation-main.item_3'), house_parties_current_path(Parliament::Utils::Helpers::HousesHelper.commons_id))

data/lib/pugin/feature/top_navigation.rb

@@ -1,6 +0,0 @@
-module Pugin
-	module Feature
-		class TopNavigation < Pugin::Feature::SimpleFeature
-		end
-	end
-end

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

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Pugin::Feature::TopNavigation do
-	it_behaves_like 'a simple pugin feature'
-end

data/spec/views/pugin/components/_navigation-main.html.haml_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'haml'
-
-describe 'pugin/components/_navigation-main.html.haml', type: :view do
-
-	before :each do
-		module Parliament
-			module Utils
-				module Helpers
-					module HousesHelper
-					end
-				end
-			end
-		end
-		# Parliament::Utils::Helpers::HousesHelper = Class.new
-  	allow(Parliament::Utils::Helpers::HousesHelper).to receive(:commons_id).and_return('123')
-  	allow(Parliament::Utils::Helpers::HousesHelper).to receive(:lords_id).and_return('456')
-		allow(view).to receive(:mps_path).and_return("/mps")
-		allow(view).to receive(:house_members_current_a_z_letter_path).and_return("houses/#{Parliament::Utils::Helpers::HousesHelper.lords_id}/members/current/a-z/a")
-		allow(view).to receive(:find_your_constituency_path).and_return("/find-your-constituency")
-		allow(view).to receive(:house_parties_current_path).and_return("houses/#{Parliament::Utils::Helpers::HousesHelper.commons_id}/parties/current/")
-	end
-
-	it 'renders correctly' do
-		render
-		expect(rendered).to include("<nav aria-label='navigation' class='navigation--main'>")
-		expect(rendered).to include('<a href="/mps">MPs</a>')
-		expect(rendered).to include('<a href="houses/456/members/current/a-z/a">Lords</a>')
-		expect(rendered).to include('<a href="/find-your-constituency">Constituencies</a>')
-		expect(rendered).to include('<a href="houses/123/parties/current/">Parties and groups</a>')
-	end
-end