pugin 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9e4da2563d36e12f10c9aa7d47f64a4ef78058
-  data.tar.gz: 8db0af10adbdf8b4d333ee2b594adce5054e7dfd
+  metadata.gz: 8db055b1fdf469b649e82b43f8985774e760f3d8
+  data.tar.gz: d45a64511b0895f37eaf94beddc9dd202c8d6ac6
 SHA512:
-  metadata.gz: f227cf33d7f45c989d4f117b40c0b6f71bd73832c10fb2180317d11afe2770a3ea70cfbef36f9173560086f98fa4a5ae5d8f5e0fc106db6738d0a8afb41e77fc
-  data.tar.gz: 6f10b155feabbee60d5624e72a2b989b14d8b79d54be149544dd3ae7529d3fa3a6e1f824f66bd714a621060d75617dd2fc1c3106ab34f70d8967b4b6bb95ea8b
+  metadata.gz: dadf8ab9964343cb8df84595ae0636c016470f71e1bc44bdfedcc3a451fc1fc9f70de6aa583757d9813b392b574fccd941cecdad53a1f49d5dc4ad81ea2e4e93
+  data.tar.gz: 29708f768ebfdf28ec42a8941438a40813490c49d5d716ab9eb90f0aa13e2bbf19ff8314b31958bd2c62a4bce4342f694b74855c454f2cb9e81b418d5f2b9511

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

@@ -6,9 +6,11 @@
     %title= page_title
     %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'}
-    %link{rel: 'shortcut icon', type: 'image/x-icon', href: "#{Pugin::STATIC_ASSET_LOCATION_URL}/favicon.ico"}
+    %meta{'http-equiv' => 'X-UA-Compatible', content: 'IE=edge'}
+    %link{rel: 'shortcut icon', type: 'image/x-icon', href: "#{Pugin::STATIC_ASSET_PUBLIC_LOCATION_URL}/favicon.ico"}
     %link{rel: 'search', type: 'application/opensearchdescription+xml', href: opensearch_description_url, title: I18n.t('pugin.layouts.pugin.website_brand')}
+    - if @app_insights_request_id
+      = render partial: 'pugin/meta/application_insights', locals: { app_insights_request_id: @app_insights_request_id }
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager'
     - unless Pugin.alternates.empty?

data/app/views/pugin/meta/_application_insights.html.haml

@@ -0,0 +1 @@
+%meta{ name: 'applicationinsights-request-id', content: app_insights_request_id }

data/config/locales/en.yml

@@ -1,9 +1,17 @@
 en:
   #global people translations
   house_of_lords: 'House of Lords'
+  date:
+    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
+    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
+    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
   time:
     formats:
       year_only: "%Y"
+      default: '%-d %b %Y'
   pugin:
     hints:
       beta: 'beta'

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.8.3'.freeze
+  VERSION = '1.8.4'.freeze
 end

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

@@ -128,4 +128,27 @@ describe 'pugin/layouts/_layout.html.haml', type: :view do
       end
     end
   end
+
+  describe 'ApplictaionInsights' do
+    context 'with request ID set' do
+      before :each do
+        assign(:app_insights_request_id, '|12345678abcdefgh.')
+        render
+      end
+
+      it 'render the expected meta tag' do
+        expect(rendered).to include("<meta content='|12345678abcdefgh.' name='applicationinsights-request-id'>")
+      end
+    end
+
+    context 'without request ID set' do
+      before :each do
+        render
+      end
+
+      it 'does not render the meta tag' do
+        expect(rendered).not_to include('name="applicationinsights-request-id"')
+      end
+    end
+  end
 end

data/spec/views/pugin/people/list/member/_member.html.haml_spec.rb

@@ -82,8 +82,8 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
       allow(parliament_mp_constituency).to receive(:name).and_return('constituency1')
 
       allow(parliament_mp_seat_incumbency).to receive(:current?).and_return(false)
-      allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,5,6))
-      allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2017,2,3,4,5,6))
+      allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,0,0))
+      allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2018,3,16,3,0,0))
       allow(parliament_mp_seat_incumbency).to receive(:constituency).and_return(parliament_mp_constituency)
 
       allow(parliament_mp_party).to receive(:name).and_return('Green Party')
@@ -103,10 +103,27 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
       render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
       expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
       expect(response).to include("<p>
-constituency1 from Fri, 03 Feb 2017 04:05:06 +0000
-- Fri, 03 Feb 2017 04:05:06 +0000
+constituency1 from 3 Feb 2017
+- 16 Mar 2018
 </p>")
       expect(response).to include("<p>Green Party</p>")
     end
+
+    context 'current' do
+      before :each do
+        allow(@people.first.current_seat_incumbency).to receive(:end_date).and_return(nil)
+      end
+
+      it "renders the parliament MP data" do
+        render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
+        expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
+        expect(response).to include("<p>
+constituency1 from 3 Feb 2017
+to present
+</p>")
+        expect(response).to include("<p>Green Party</p>")
+      end
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Matt Rayner
@@ -217,6 +217,7 @@ files:
 - app/views/pugin/javascript/_pingdom.haml
 - app/views/pugin/layouts/_layout.html.haml
 - app/views/pugin/layouts/pugin.html.erb
+- app/views/pugin/meta/_application_insights.html.haml
 - app/views/pugin/meta/_opengraph.html.haml
 - app/views/pugin/parties/list/_list.html.haml
 - app/views/pugin/parties/list/current/current_party.html.haml