pugin 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: febc48d95711e46c7655331803cd21a99f6abac3
-  data.tar.gz: f922b607f64643d1ba90d1d3bd164d97faf8065b
+  metadata.gz: 8dac6bcc0d2b09d29aac46e0e7ed1a1e6f764cda
+  data.tar.gz: 1561a7f11e4aa36c3019b671848ffc288dfd3853
 SHA512:
-  metadata.gz: f6dcda9d6e9c03876dcac3b2d5d77a35797eee6b24f471bd0167cb70266d9e55a05184c6120a288a7633b83d90a73936496bdf34a60056732c632d751553d6bb
-  data.tar.gz: 60c5d87d2d3e166af7b5482874c6f921fd6ffed0bdf84f0228a75318975c43cbce318a520b991e800ebb649e6b6464ebbb07c7f6f32af837d2c019da7f5d7b78
+  metadata.gz: ffa4ee3787a25699378037edd3ce2edb924d72b95c455cad42a53c067e6812b6bc97188738b32b1bee8e3d75ac7c117c945e18274d2cb64393db2fbecc066e58
+  data.tar.gz: af8fb5067f17c8aa34af6d80c0cf7286ccde0a6c3c122b93e7dd74ddf6576a11738a5ac6b06634b10a9251cfdcb3547bb8a5ebe3b9782b8e022087a8baffb405

data/app/views/pugin/cards/_person-list.haml

@@ -1,7 +1,9 @@
 -if people.empty?
   %ol.list--box
     %li
-      %p= I18n.t('no_content.empty_list.members.description', letter: letter.upcase)
+      %p
+        = "#{I18n.t('no_content.empty_list.members.description')}" 
+        = params[:letter].nil? ? "" : "#{I18n.t('no_content.empty_list.members.for')} '#{params[:letter].upcase}'"
 -else
   %ol.list--box
     - people.each do |person|

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

@@ -9,7 +9,6 @@
           - unless letter == params[:letter]
             = navigation_link(route_symbol: route_symbol, letter: letter, primary_id: local_assigns.fetch(:primary_id, nil), secondary_id: local_assigns.fetch(:secondary_id, nil))
           - else
-            = letter
+            %span= letter
         - else 
-          = letter
-
+          %span= letter

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

@@ -8,7 +8,7 @@
         - if defined?(FlagHelper.register_to_vote?) && FlagHelper.register_to_vote?
           %a{ href: 'https://www.gov.uk/register-to-vote' }= I18n.t('pugin.components.status.register_to_vote')
           = I18n.t('pugin.components.status.election_text_1')
-        - else 
+        - else
           = I18n.t('pugin.components.status.election_text_2')
-
-
+          %a{ href: 'http://www.parliament.uk/get-involved/elections/voting/', target: '_blank', title: I18n.t('open_new_window')}= I18n.t('pugin.components.status.how_to_vote')
+          = I18n.t('pugin.components.status.election_text_3')

data/app/views/pugin/constituencies/list/_list.html.haml

@@ -1,3 +1,8 @@
-- constituency_status = data.current? ? "current" : "former" 
-%li.list__item
-  = render partial: "pugin/constituencies/list/#{constituency_status}/#{constituency_status}_constituency", locals: { constituency: local_assigns.fetch(:data, []) }
+%li
+  - if constituencies.current?
+    %h2= link_to(constituencies.name, constituency_path(constituencies.graph_id))
+    //- Constituency has a member? TRUE = Member's Name : FALSE = "Vacant" text
+    %p= constituencies.members.empty? ? I18n.t('pugin.constituencies.list.current.vacant').capitalize : constituencies.members.first.display_name
+  - else 
+    %h2= link_to constituencies.name, constituency_path(constituencies.graph_id)
+    %p= "#{t('former').capitalize} #{t('constituency')}"

data/app/views/pugin/constituencies/list/current/_current_constituency.html.haml

@@ -1,6 +1,5 @@
-%ul
-  %li= link_to(constituency.name, constituency_path(constituency.graph_id))
-  - if constituency.members.empty?
-    %li= t('constituencies.shared_translations.vacant_by_election').capitalize
-  - else
-    %li= constituency.members.first.display_name
+%h2= link_to(constituency.name, constituency_path(constituency.graph_id))
+- if constituency.members.empty?
+  %p= I18n.t('pugin.constituencies.list.current.vacant').capitalize
+- else
+  %p= constituency.members.first.display_name

data/app/views/pugin/constituencies/list/former/_former_constituency.html.haml

@@ -1,3 +1,2 @@
-%ul
-  %li= link_to constituency.name, constituency_path(constituency.graph_id)
-  %li= constituency.current? ? "#{t('current').capitalize} #{t('constituency')}" : "#{t('former').capitalize} #{t('constituency')}"
+%h2= link_to constituency.name, constituency_path(constituency.graph_id)
+%p= constituency.current? ? "#{t('current').capitalize} #{t('constituency')}" : "#{t('former').capitalize} #{t('constituency')}"

data/app/views/pugin/elements/_list.html.haml

@@ -1,7 +1,7 @@
 - list_tag = local_assigns.fetch(:ordered?, false) ? :ol : :ul
-= content_tag(list_tag, class: "list") do
+= content_tag(list_tag, class: "list--box") do
   - if data.empty?
-    %li.list__item
+    %li
       %p= t('no_content.empty_list.members.description', letter: params[:letter])
   - else 
-    = render partial: "pugin/#{item_type}/list/list", collection: local_assigns.fetch(:data, []), as: :data
+    = render partial: "pugin/#{item_type}/list/list", collection: local_assigns.fetch(:data, []), as: item_type.to_sym

data/config/locales/en.yml

@@ -9,10 +9,12 @@ en:
       status:
         status_text_1: 'This is a test website, so may be inaccurate.'
         status_text_2: 'to help improve it.'
-        election_text_1: 'in the General Election by 22 May.'
-        election_text_2: 'Remember to vote in the general election on 8th June.'
+        election_text_1: 'in the general election by 22 May.'
+        election_text_2: 'Find out'
+        election_text_3: 'in the general election on 8 June.'
         give_feedback: 'Give feedback'
         register_to_vote: 'Register to vote'
+        how_to_vote: 'how to vote'
       footer:
         uk_parliament: "UK Parliament"
         current_website: "Current Parliament.uk website"
@@ -33,6 +35,10 @@ en:
             current:
               current_member:
                 current_mp_for: "Current MP for"
+    constituencies: 
+      list:
+        current: 
+          vacant: 'vacant'
     layouts:
       pugin:
         website_brand: "UK Parliament"
@@ -40,4 +46,5 @@ en:
   no_content:
     empty_list:
       members:
-        description: "Sorry there are no results for '%{letter}'"
+        description: 'There are no results'
+        for: 'for'

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.4.1'.freeze
+  ASSET_VERSION = '1.4.3'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.pugin-website')
 
   class << self

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

data/spec/views/pugin/cards/_person-list.html.haml_spec.rb

@@ -74,12 +74,15 @@ DATA
     end
 
     it 'renders as expected' do
-      render partial: 'pugin/cards/person-list', locals: { people: @people, letter: 'a' }
+      render partial: 'pugin/cards/person-list', locals: { people: @people }
 
       expect(response).to eq(<<DATA
 <ol class='list--box'>
 <li>
-<p>Sorry there are no results for &#39;A&#39;</p>
+<p>
+There are no results
+
+</p>
 </li>
 </ol>
 DATA

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

@@ -3,105 +3,90 @@ require 'haml'
 
 describe 'pugin/components/_navigation-letter.html.haml', type: :view do
 
-  context 'with no data' do
+  context 'with all letters containing data' do
 
     before :each do
-      @letters = []
+      # Variables used in testing
+      @primary_id = '1234'
+      @secondary_id = '5678'
+      @letters = ('A'..'Z')
+
+      # Allow URLS to be generated
+      #   - Simple Letter
+      ('a'..'z').each do |letter|
+        allow(view).to receive(:people_letter_path).with(letter).and_return("/people/a-z/#{letter}")
+      end
+
+      #  - Letter with Primary ID
+      ('a'..'z').each do |letter|
+        allow(view).to receive(:party_members_letter_path).with(@primary_id, letter).and_return("/parties/#{@primary_id}/members/a-z/#{letter}")
+      end
+
+      #  - Letter with Primary ID and Secondary ID
+      ('a'..'z').each do |letter|
+        allow(view).to receive(:house_party_members_letter_path).with(@primary_id, @secondary_id, letter).and_return("/houses/#{@primary_id}/parties/#{@secondary_id}/members/a-z/#{letter}")
+      end
+
+    end
+
+    # Test for simple letter
+    context 'and with no active letter' do
+      before :each do
+        render partial: 'pugin/components/navigation-letter', locals: { route_symbol: :people_letter_path }
+      end
+      ('a'..'z').each do |letter|
+        it "doesn't render any list items with the active class" do
+          expect(rendered).not_to include("<li class='active' data-letter=#{letter}>")
+        end
+      end
+    end
+
+    context 'and with an active letter "a"' do
+      before :each do
+        params[:letter] = "a"
+        render partial: 'pugin/components/navigation-letter', locals: { route_symbol: :people_letter_path }
+      end
+      it "renders the list items with the active class and no link" do
+        expect(rendered).to include("<li class='active' data-letter='a'>\n<span>a</span>\n</li>")
+      end
+    end
+
+    # Test for primary id and letter
+    context 'and a primary id' do
+      before :each do
+        render partial: 'pugin/components/navigation-letter', locals: { route_symbol: :party_members_letter_path, primary_id: @primary_id }
+      end
+
+      ('a'..'z').each do |letter|
+        it "renders a navigation link for /parties/1234/a-z/#{letter}" do
+          expect(rendered).to include("<a data-atoz-see=\"true\" href=\"/parties/1234/members/a-z/#{letter}\">#{letter}</a>")
+        end
+      end
+    end
+
+    context 'and both a primary and secondary id' do
+      before :each do
+        render partial: 'pugin/components/navigation-letter', locals: { route_symbol: :house_party_members_letter_path, primary_id: @primary_id, secondary_id: @secondary_id }
+      end
+      ('a'..'z').each do |letter|
+        it "renders a navigation link for /houses/1234/parties/5678/members/a-z/#{letter}" do
+          expect(rendered).to include("<a data-atoz-see=\"true\" href=\"/houses/1234/parties/5678/members/a-z/#{letter}\">#{letter}</a>")
+        end
+      end
     end
 
-    it 'displays a navigation list with no links' do
-      render partial: 'pugin/components/navigation-letter', locals: { route_symbol: '/people' }
+    context "doesn't render links for empty letters" do
+      before :each do
+        @letters = []
+        render partial: 'pugin/components/navigation-letter', locals: { route_symbol: :party_members_letter_path, primary_id: @primary_id }
+      end
 
-      expect(rendered).to eq(
-<<DATA
-<p>
-A to Z -
-select a letter
-</p>
-<nav aria-label='Paged navigation' class='navigation--letter'>
-<ul>
-<li data-letter='a'>
-a
-</li>
-<li data-letter='b'>
-b
-</li>
-<li data-letter='c'>
-c
-</li>
-<li data-letter='d'>
-d
-</li>
-<li data-letter='e'>
-e
-</li>
-<li data-letter='f'>
-f
-</li>
-<li data-letter='g'>
-g
-</li>
-<li data-letter='h'>
-h
-</li>
-<li data-letter='i'>
-i
-</li>
-<li data-letter='j'>
-j
-</li>
-<li data-letter='k'>
-k
-</li>
-<li data-letter='l'>
-l
-</li>
-<li data-letter='m'>
-m
-</li>
-<li data-letter='n'>
-n
-</li>
-<li data-letter='o'>
-o
-</li>
-<li data-letter='p'>
-p
-</li>
-<li data-letter='q'>
-q
-</li>
-<li data-letter='r'>
-r
-</li>
-<li data-letter='s'>
-s
-</li>
-<li data-letter='t'>
-t
-</li>
-<li data-letter='u'>
-u
-</li>
-<li data-letter='v'>
-v
-</li>
-<li data-letter='w'>
-w
-</li>
-<li data-letter='x'>
-x
-</li>
-<li data-letter='y'>
-y
-</li>
-<li data-letter='z'>
-z
-</li>
-</ul>
-</nav>
-DATA
-                              )
+      ('a'..'z').each do |letter|
+        it "just renders the letter #{letter}" do
+          expect(rendered).not_to include("<a data-atoz-see=\"true\" href=\"/parties/1234/members/a-z/#{letter}\">#{letter}</a>")
+          expect(rendered).to include("<li data-letter='#{letter}'>\n<span>#{letter}</span>\n</li>")
+        end
+      end
     end
   end
-end
+end

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

@@ -50,7 +50,6 @@ DATA
 
     it 'renders a message that shows a link to register to vote' do
       render partial: 'pugin/components/status', locals: { status: nil }
-      p FlagHelper.dissolution?
       expect(response).to eq(
 <<DATA
 <div class='highlight--status highlight--default'>
@@ -60,7 +59,7 @@ This is a test website, so may be inaccurate.
 <a href='https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&amp;amp;category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&amp;amp;isPublished=false' target='_blank' title='website opens in a new window'>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.
+in the general election by 22 May.
 </p>
 </div>
 </div>
@@ -93,7 +92,9 @@ DATA
 This is a test website, so may be inaccurate.
 <a href='https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&amp;amp;category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&amp;amp;isPublished=false' target='_blank' title='website opens in a new window'>Give feedback</a>
 to help improve it.
-Remember to vote in the general election on 8th June.
+Find out
+<a href='http://www.parliament.uk/get-involved/elections/voting/' target='_blank' title='website opens in a new window'>how to vote</a>
+in the general election on 8 June.
 </p>
 </div>
 </div>

metadata

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