pugin 0.5.4 → 0.5.5.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bee6e0b7161011aceb3cea3e722e12fbeffd178c
-  data.tar.gz: 7da8a1f11967db37a11fc16e280b5a8307c8a1c0
+  metadata.gz: b8f493fc4f4dee25a2846df1c2ef844507cd637c
+  data.tar.gz: c1b8ccfb0a0a4dedf1458365b5a996c3cf92920a
 SHA512:
-  metadata.gz: e00ea8a7e9213c801d3e27de08ddce423d68796cbe8c2ca825e42e1707bb7f4f85272dc7bc411f944001c57da165feb0c3ec78dd04f0e5d32b49aaf2654c9b80
-  data.tar.gz: 9e481ae8538ad71056a9a50935cc99c89a60ccc3811d0aaa9c7f3fb70720a3a27f7282fa1e6e04113eb2be13d92ba20fcfa017c5a76f4ea0868c98973819074d
+  metadata.gz: 2a8c93c44c12da7ac4d285ad8ec781c1310d63550f6e664faef75af90166cd7f108607b54b42d249d218e0e5e490f62660b3f8e5d34d3449fff5e48d78f5638e
+  data.tar.gz: 835e0b10d2c5ad6c5fb4588eef02e0b0cace591eb9500d0996760d58902f4e07c9fc1c7dfcdaa3ba5ec83b147f3e9beb2ca1d1d90d9343368a1f1e5cd61807dd

data/app/views/pugin/cards/{_person-list.html.haml → _person-list.haml}

@@ -1,7 +1,7 @@
 -if people.empty?
   %ol.list
     %li.list__item
-      %p= t('no_content.empty_list.members.description', letter: letter.upcase)
+      %p= I18n.t('no_content.empty_list.members.description', letter: letter.upcase)
 -else
   %ol.list
     - people.each do |person|
@@ -14,7 +14,7 @@
           - if !person.constituencies.empty?
             - seat_incumbency = person.seat_incumbencies.select(&:current?).first
             - unless seat_incumbency.nil?
-              %p= "#{t('.current_mp_for')} #{seat_incumbency.constituency.name}"
+              %p= "#{I18n.t('pugin.cards.person-list.current_mp_for')} #{seat_incumbency.constituency.name}"
           - if !person.parties.empty?
             - party_membership = person.party_memberships.select(&:current?).first
             - unless party_membership.nil?

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

@@ -0,0 +1,8 @@
+%footer
+  .container--full-grid
+    %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')

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

@@ -0,0 +1,3 @@
+%header
+  .container--full-grid
+    %a.logo{:href => "/"}= I18n.t('pugin.components.header.parliament_header')

data/app/views/pugin/components/{_letter-navigation.html.haml → _letter-navigation.haml}

@@ -1,9 +1,9 @@
 .block
   %p.lead
     A to Z -
-    = params[:letter].present? ? "Showing results for #{params[:letter].capitalize}" : 'select a letter'
-  %nav{ aria:{ label: t('a_to_z.aria_label') } }
-    %ul.navigation__letter
+    = params[:letter].present? ? "#{I18n.t('pugin.components.letter-navigation.showing_results')} #{params[:letter].capitalize}" : "#{I18n.t('pugin.components.letter-navigation.select_letter')}"
+  %nav{ aria:{ label: I18n.t('pugin.components.letter-navigation.aria_label') } }
+    %ul.navigation
       - ('a'..'z').each do |letter|
         %li{ data: { letter: letter }, class: ('active' if (params[:letter] == letter)) }
           - if @letters.include?(letter.upcase)

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

@@ -0,0 +1,9 @@
+.highlight__status.status
+  .container--full-grid
+    %p
+      = I18n.t('pugin.components.status.status_text_1')
+      = precede ' - ' do
+        %a{ href: 'https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&isPublished=false', target: '_blank', title: I18n.t('open_new_window')}= I18n.t('pugin.components.status.give_feedback')
+      = I18n.t('pugin.components.status.status_text_2')
+      = succeed '.' do
+        %a{ href: 'https://www.parliament.uk' }= I18n.t('pugin.components.status.current_website')

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

@@ -0,0 +1,3 @@
+- 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, []) }

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

@@ -0,0 +1,6 @@
+%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

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

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

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

@@ -0,0 +1,7 @@
+- list_tag = local_assigns.fetch(:ordered?, false) ? :ol : :ul
+= content_tag(list_tag, class: "list") do
+  - if data.empty?
+    %li.list__item
+      %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

data/app/views/pugin/layouts/pugin-sinatra.haml

@@ -0,0 +1,22 @@
+!!! 5
+%html{lang:'en'}
+  %head
+    - title = yield_content :title
+    %title= ( title.nil? || title.empty? ) ? I18n.t('pugin.layouts.pugin.website_brand') : title + ' - ' + I18n.t('pugin.layouts.pugin.website_brand')
+    %link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
+    %meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
+    =# favicon_link_tag 'pugin/favicon.ico'
+    - if ENV['GTM_KEY']
+      = partial '/pugin/javascript/_google_tag_manager'
+  %body.no-js
+    - if ENV['GTM_KEY']
+      = partial '/pugin/javascript/_google_tag_manager_noscript'
+    = partial '/pugin/elements/_skip-content'
+    = partial '/pugin/components/_header'
+    = partial '/pugin/components/_status'
+    %main#content
+      .container--full-grid
+        = yield
+    = partial '/pugin/components/_footer'
+    %script{src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/javascripts/main.js"}

data/app/views/pugin/layouts/{pugin.html.haml → pugin.haml}

@@ -1,15 +1,15 @@
 !!! 5
 %html{lang:'en'}
   %head
-    %title= content_for?(:title) ? content_for(:title) + ' - ' + t('.website_brand') : t('.website_brand')
+    %title= content_for(:title).nil? ? I18n.t('pugin.layouts.pugin.website_brand') : content_for(:title) + ' - ' + I18n.t('pugin.layouts.pugin.website_brand')
     %link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
     %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
     %meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
-    = favicon_link_tag 'pugin/favicon.ico'
+    =# favicon_link_tag 'pugin/favicon.ico'
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager'
   %body.no-js
-    - if Rails.application.secrets.gtm_key
+    - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager_noscript'
     = render partial: 'pugin/elements/skip-content'
     = render 'pugin/components/header'

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

@@ -0,0 +1,3 @@
+- current_party = data.parties.current? ? "current" : "former" 
+%li.list__item
+  = render partial: "pugin/parties/list/#{person_type}/#{person_type}", locals: { data: local_assigns.fetch(:data, []) }

data/app/views/pugin/parties/list/current/current_party.html.haml

@@ -0,0 +1 @@
+%h1 Current

data/app/views/pugin/parties/list/former/former_party.html.haml

@@ -0,0 +1 @@
+%h1 Former

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

@@ -0,0 +1,3 @@
+- person_type = data.house_incumbencies.empty? ? "member" : "lord"
+%li.list__item
+  = render partial: "pugin/people/list/#{person_type}/#{person_type}", locals: { data: local_assigns.fetch(:data, []) }

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

@@ -0,0 +1,4 @@
+- current_incumbency = data.house_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
+- current_incumbency = current_incumbency.current? ? "current" : "former"
+
+= render partial: "pugin/people/list/lord/#{current_incumbency}/#{current_incumbency}_lord", locals: { data: local_assigns.fetch(:data, []) }

data/app/views/pugin/people/list/lord/current/_current_lord.html.haml

@@ -0,0 +1,12 @@
+%h2
+  %a{:href => "/people/#{data.graph_id}"}= data.display_name
+- if !data.statuses[:house_membership_status].empty? && !data.statuses[:house_membership_status].include?('Current MP')
+  %p= data.statuses[:house_membership_status].join(' and ')
+- if !data.constituencies.empty?
+  - seat_incumbency = data.seat_incumbencies.select(&:current?).first
+  - unless seat_incumbency.nil?
+    %p= "#{t('.current_mp_for')} #{seat_incumbency.constituency.name}"
+- if !data.parties.empty?
+  - party_membership = data.party_memberships.select(&:current?).first
+  - unless party_membership.nil?
+    %p= party_membership.party.name

data/app/views/pugin/people/list/lord/former/_former_lord.html.haml

@@ -0,0 +1,4 @@
+%h2
+  %a{:href => "/people/#{data.graph_id}"}= data.display_name
+- if !data.statuses[:house_membership_status].empty? && !data.statuses[:house_membership_status].include?('Current MP')
+  %p= data.statuses[:house_membership_status].join(' and ')

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

@@ -0,0 +1,4 @@
+- current_incumbency = data.seat_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
+- current_incumbency = current_incumbency.current? ? "current" : "former"
+
+= render partial: "pugin/people/list/member/#{current_incumbency}/#{current_incumbency}_member", locals: { data: local_assigns.fetch(:data, []) }

data/app/views/pugin/people/list/member/current/_current_member.html.haml

@@ -0,0 +1,10 @@
+%h2
+  %a{:href => "/people/#{data.graph_id}"}= data.display_name
+- if !data.constituencies.empty?
+  - seat_incumbency = data.seat_incumbencies.select(&:current?).first
+  - unless seat_incumbency.nil?
+    %p= "#{t('.current_mp_for')} #{seat_incumbency.constituency.name}"
+- if !data.parties.empty?
+  - party_membership = data.party_memberships.select(&:current?).first
+  - unless party_membership.nil?
+    %p= party_membership.party.name

data/app/views/pugin/people/list/member/former/_former_member.html.haml

@@ -0,0 +1,4 @@
+%h2
+  %a{:href => "/people/#{data.graph_id}"}= data.display_name
+- if !data.statuses[:house_membership_status].empty? && !data.statuses[:house_membership_status].include?('Current MP')
+  %p= data.statuses[:house_membership_status].join(' and ')

data/config/locales/en.yml

@@ -15,6 +15,16 @@ en:
         uk_parliament: "UK Parliament"
         current_website: "Current Parliament.uk website"
         cookie_policy: "Cookie Policy"
+      letter-navigation: 
+        aria_label: "Paged navigation"
+        select_letter: "select a letter"
+        showing_results: "Showing results for"
+    people:
+        list:
+          member:
+            current: 
+              current_member:
+                current_mp_for: "Current MP for"
     layouts: 
       pugin: 
         website_brand: "UK Parliament"

data/lib/pugin.rb

@@ -1,8 +1,78 @@
-require 'pugin/engine'
-require 'pugin/railtie'
 require 'pugin/version'
 
 module Pugin
   ASSET_VERSION = '1.2.8'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1devci.pugin-website')
+
+  class << self
+  	# Inspired by bootsrap-sass
+  	def load!
+  		if rails?
+  			register_rails_files
+  		elsif sinatra?
+  			add_i18n_paths
+  		elsif sprockets?
+  			register_sprockets
+			end
+		end
+
+		# Paths
+		def gem_path
+			@gem_path ||= File.expand_path '..', File.dirname(__FILE__)
+		end
+
+		def images_path
+			File.join assets_path, 'images'
+		end
+
+		def javascripts_path
+			File.join assets_path, 'javascripts'
+		end
+
+		def stylesheets_path
+			File.join assets_path, 'stylesheets'
+		end
+
+		def views_path
+			File.join gem_path, 'app', 'views'
+		end
+
+		def assets_path
+			@assets_path ||= File.join gem_path, 'app', 'assets'
+		end
+
+		# Environment detection helpers
+		def rails?
+			defined?(::Rails)
+		end
+
+		def sinatra?
+			defined?(::Sinatra)
+		end
+
+		def sprockets?
+			defined?(::Sprockets)
+		end
+
+		private
+
+		def register_rails_files
+			require 'pugin/engine'
+      require 'pugin/railtie'
+		end
+
+		def add_i18n_paths
+			require 'i18n'
+			I18n.load_path += Dir[File.join(gem_path, 'config', 'locales', '*.yml')]
+		end
+
+		def register_sprockets
+			Sprockets.append_path(images_path)
+			Sprockets.append_path(javascripts_path)
+			Sprockets.append_path(stylesheets_path)
+			Sprockets.append_path(views_path)
+		end
+	end
 end
+
+Pugin.load!

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5.pre'.freeze
 end

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

@@ -11,23 +11,12 @@ describe 'pugin/components/_status.html.haml', type: :view do
 <<DATA
 <div class='highlight__status status'>
 <div class='container--full-grid'>
-<p>This is a test website, so may be inaccurate or misleading - <a target="_blank" title="website opens in a new window" href="https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&amp;category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&amp;isPublished=false">give feedback</a> to help improve it. Return to <a href="https://www.parliament.uk">current website</a>.</p>
-</div>
-</div>
-DATA
-      )
-    end
-  end
-
-  context 'with a status message' do
-    it 'renders as expected' do
-      render partial: 'pugin/components/status', locals: { status: "test" }
-
-      expect(rendered).to eq(
-<<DATA
-<div class='highlight__status status__test'>
-<div class='container--full-grid'>
-<p>This is a test website, so may be inaccurate or misleading - <a target="_blank" title="website opens in a new window" href="https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&amp;category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&amp;isPublished=false">give feedback</a> to help improve it. Return to <a href="https://www.parliament.uk">current website</a>.</p>
+<p>
+This is a test website, so may be inaccurate or misleading
+ - <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. Return to
+<a href='https://www.parliament.uk'>current website</a>.
+</p>
 </div>
 </div>
 DATA

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5.pre
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '5.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -178,15 +178,30 @@ files:
 - app/assets/stylesheets/pugin/compiled/main.css
 - app/assets/stylesheets/pugin/overrides/asset_overrides.css.erb
 - app/assets/stylesheets/pugin/pugin.css
-- app/views/pugin/cards/_person-list.html.haml
-- app/views/pugin/components/_footer.html.haml
-- app/views/pugin/components/_header.html.haml
-- app/views/pugin/components/_letter-navigation.html.haml
-- app/views/pugin/components/_status.html.haml
-- app/views/pugin/elements/_skip-content.html.haml
-- app/views/pugin/javascript/_google_tag_manager.html.haml
-- app/views/pugin/javascript/_google_tag_manager_noscript.html.haml
-- app/views/pugin/layouts/pugin.html.haml
+- app/views/pugin/cards/_person-list.haml
+- app/views/pugin/components/_footer.haml
+- app/views/pugin/components/_header.haml
+- app/views/pugin/components/_letter-navigation.haml
+- app/views/pugin/components/_status.haml
+- app/views/pugin/constituencies/list/_list.html.haml
+- app/views/pugin/constituencies/list/current/_current_constituency.html.haml
+- app/views/pugin/constituencies/list/former/_former_constituency.html.haml
+- app/views/pugin/elements/_list.html.haml
+- app/views/pugin/elements/_skip-content.haml
+- app/views/pugin/javascript/_google_tag_manager.haml
+- app/views/pugin/javascript/_google_tag_manager_noscript.haml
+- app/views/pugin/layouts/pugin-sinatra.haml
+- app/views/pugin/layouts/pugin.haml
+- app/views/pugin/parties/list/_list.html.haml
+- app/views/pugin/parties/list/current/current_party.html.haml
+- app/views/pugin/parties/list/former/former_party.html.haml
+- app/views/pugin/people/list/_list.html.haml
+- app/views/pugin/people/list/lord/_lord.html.haml
+- app/views/pugin/people/list/lord/current/_current_lord.html.haml
+- app/views/pugin/people/list/lord/former/_former_lord.html.haml
+- app/views/pugin/people/list/member/_member.html.haml
+- app/views/pugin/people/list/member/current/_current_member.html.haml
+- app/views/pugin/people/list/member/former/_former_member.html.haml
 - config/application.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -270,9 +285,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.10

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

@@ -1,8 +0,0 @@
-%footer
-  .container--full-grid
-    %h2.logo= t('.uk_parliament')
-    %ul.list
-      %li
-        %a{:href => "https://www.parliament.uk/"}= t('.current_website')
-      %li
-        %a{:href => "http://beta.parliament.uk/meta/cookie-policy"}= t('.cookie_policy')

data/app/views/pugin/components/_header.html.haml

@@ -1,3 +0,0 @@
-%header
-  .container--full-grid
-    %a.logo{:href => "/"}= t('.parliament_header')

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

@@ -1,3 +0,0 @@
-.highlight__status{class: "status#{ status.nil? ? '' : "__#{status}"  }"}
-  .container--full-grid
-    %p #{t('.status_text_1')} - #{link_to t('.give_feedback'), 'https://ukparliament-self.achieveservice.com/AchieveForms/?form_uri=sandbox://AF-Form-337e2b87-4c8b-40f7-bb72-a80f15284b21&category=AF-Category-108691b0-e15c-46d7-9d16-7ad0d35cdb2a&isPublished=false', target: '_blank', title: t('open_new_window')} #{t('.status_text_2')} #{link_to t('.current_website'), 'https://www.parliament.uk'}.