pugin 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d909450967839cf8cd587211a8bcfc9080174d
-  data.tar.gz: 976f7f282d3c6166828d8efe58f9eab018ab3065
+  metadata.gz: 622eab2c3d8d1c4d7260efd7731d0733877f7898
+  data.tar.gz: 6533fdaf33f2c48446228d31a21589100a9219c7
 SHA512:
-  metadata.gz: 21318a7954bb56927b8737add30ac9e6614498fb3fbc69d604114b49ab84439e5989bdb4fddfc03c9fc6e4e239a1091fec7d61de3b3691c63daf886cb0b75ddb
-  data.tar.gz: 48c417775418fa72d88a482c72407d9d97a86b0e7c534ab1f05544b39fba902cbdd6ea0b1602054d92ddd1eb23e1f44e239e740b3c79a65d7ad9bf689e4a577a
+  metadata.gz: 428cc72cf64692d4880645a0720d4e27bd6037289ac6692d1b41c797974e0cce1e0ef4a23d1c84575d36a9ae7f70d4f797651c4e76ffce6ccd4a28aee08bee81
+  data.tar.gz: e44fcf729a343a79759fdf80ce9d39e0994e20288ceba4ab5e4fa2ccee04b289a8a742a49740526c6619661c76aa1fe35a0dcd4d37ada9c75d349f691b3e4bdc

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

@@ -6,6 +6,6 @@
       %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'), constituencies_current_a_z_letter_path('a'))
+        = 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/app/views/pugin/constituencies/list/_list.html.haml

@@ -20,5 +20,6 @@
         %p= I18n.t('pugin.constituencies.list.current_constituency.vacant').capitalize
     - else
       %h2
-        %a{:href => "/constituencies/#{constituencies.graph_id}"}= "#{constituencies.name} (#{l(constituencies.start_date, format: :year_only)} - #{l(constituencies.end_date, format: :year_only)})"
+        - 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/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

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

@@ -17,7 +17,7 @@ describe 'pugin/components/_navigation-main.html.haml', type: :view do
   	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(:constituencies_current_a_z_letter_path).and_return("constituencies/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
 
@@ -26,7 +26,7 @@ describe 'pugin/components/_navigation-main.html.haml', type: :view do
 		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="constituencies/current/a-z/a">Constituencies</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

data/spec/views/pugin/constituencies/list/_list.html.haml_spec.rb

@@ -71,22 +71,64 @@ describe 'pugin/constituencies/list/_list.html.haml', type: :view do
 
   context 'with a previous constituency data set' do
 
-    before :each do
-      constituency = Class.new
-      allow(constituency).to receive(:current?).and_return(false)
-      allow(constituency).to receive(:name).and_return('Aberavon')
-      allow(constituency).to receive(:graph_id).and_return('123')
-      allow(constituency).to receive(:start_date).and_return(DateTime.new(1929))
-      allow(constituency).to receive(:end_date).and_return(DateTime.new(1950))
+    context 'with full date' do
+      before :each do
+        constituency = Class.new
+        allow(constituency).to receive(:current?).and_return(false)
+        allow(constituency).to receive(:name).and_return('Aberavon')
+        allow(constituency).to receive(:graph_id).and_return('123')
+        allow(constituency).to receive(:start_date).and_return(DateTime.new(1929))
+        allow(constituency).to receive(:end_date).and_return(DateTime.new(1950))
 
-      @constituencies = [constituency]
+        @constituencies = [constituency]
+      end
+
+      it 'displays the previous constituency i18n message' do
+        render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
+        expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon (1929 - 1950)</a>\n</h2>")
+        expect(response).to include("<p>Former constituency</p>")
+      end
     end
 
-    it 'displays the previous constituency i18n message' do
-      render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
-      expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon (1929 - 1950)</a>\n</h2>")
-      expect(response).to include("<p>Former constituency</p>")
+    context 'with partial date' do
+      # should never actually happen as current is based on start without end
+      context 'only start' do
+        before :each do
+          constituency = Class.new
+          allow(constituency).to receive(:current?).and_return(false)
+          allow(constituency).to receive(:name).and_return('Aberavon')
+          allow(constituency).to receive(:graph_id).and_return('123')
+          allow(constituency).to receive(:start_date).and_return(DateTime.new(1929))
+
+          @constituencies = [constituency]
+        end
+
+        it 'displays the previous constituency i18n message' do
+          render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
+          expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon</a>\n</h2>")
+          expect(response).to include("<p>Former constituency</p>")
+        end
+      end
+
+      context 'only end' do
+        before :each do
+          constituency = Class.new
+          allow(constituency).to receive(:current?).and_return(false)
+          allow(constituency).to receive(:name).and_return('Aberavon')
+          allow(constituency).to receive(:graph_id).and_return('123')
+          allow(constituency).to receive(:end_date).and_return(DateTime.new(1950))
+
+          @constituencies = [constituency]
+        end
+
+        it 'displays the previous constituency i18n message' do
+          render partial: "pugin/constituencies/list/list", collection: @constituencies, as: "constituencies".to_sym
+          expect(response).to include("<h2>\n<a href='/constituencies/123'>Aberavon</a>\n</h2>")
+          expect(response).to include("<p>Former constituency</p>")
+        end
+      end
     end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Matt Rayner