pugin 1.8.2 → 1.8.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/pugin/layouts/_layout.html.haml +1 -3
- data/config/locales/en.yml +0 -8
- data/lib/pugin.rb +3 -3
- data/lib/pugin/version.rb +1 -1
- data/spec/views/pugin/layouts/_layout.html.haml_spec.rb +0 -23
- data/spec/views/pugin/people/list/member/_member.html.haml_spec.rb +4 -21
- metadata +2 -3
- data/app/views/pugin/meta/_application_insights.html.haml +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bd9e4da2563d36e12f10c9aa7d47f64a4ef78058
|
4
|
+
data.tar.gz: 8db0af10adbdf8b4d333ee2b594adce5054e7dfd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f227cf33d7f45c989d4f117b40c0b6f71bd73832c10fb2180317d11afe2770a3ea70cfbef36f9173560086f98fa4a5ae5d8f5e0fc106db6738d0a8afb41e77fc
|
7
|
+
data.tar.gz: 6f10b155feabbee60d5624e72a2b989b14d8b79d54be149544dd3ae7529d3fa3a6e1f824f66bd714a621060d75617dd2fc1c3106ab34f70d8967b4b6bb95ea8b
|
@@ -6,11 +6,9 @@
|
|
6
6
|
%title= page_title
|
7
7
|
%link{rel: 'stylesheet', href: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/stylesheets/main.css" }
|
8
8
|
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
|
9
|
-
%meta{'http-equiv'
|
9
|
+
%meta{'http-equiv': 'X-UA-Compatible', content: 'IE=edge'}
|
10
10
|
%link{rel: 'shortcut icon', type: 'image/x-icon', href: "#{Pugin::STATIC_ASSET_LOCATION_URL}/favicon.ico"}
|
11
11
|
%link{rel: 'search', type: 'application/opensearchdescription+xml', href: opensearch_description_url, title: I18n.t('pugin.layouts.pugin.website_brand')}
|
12
|
-
- if @app_insights_request_id
|
13
|
-
= render partial: 'pugin/meta/application_insights', locals: { app_insights_request_id: @app_insights_request_id }
|
14
12
|
- if ENV['GTM_KEY']
|
15
13
|
= render partial: 'pugin/javascript/google_tag_manager'
|
16
14
|
- unless Pugin.alternates.empty?
|
data/config/locales/en.yml
CHANGED
@@ -1,17 +1,9 @@
|
|
1
1
|
en:
|
2
2
|
#global people translations
|
3
3
|
house_of_lords: 'House of Lords'
|
4
|
-
date:
|
5
|
-
day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
|
6
|
-
abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
|
7
|
-
|
8
|
-
# Don't forget the nil at the beginning; there's no such thing as a 0th month
|
9
|
-
month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
|
10
|
-
abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
|
11
4
|
time:
|
12
5
|
formats:
|
13
6
|
year_only: "%Y"
|
14
|
-
default: '%-d %b %Y'
|
15
7
|
pugin:
|
16
8
|
hints:
|
17
9
|
beta: 'beta'
|
data/lib/pugin.rb
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
require 'pugin/version'
|
2
2
|
|
3
3
|
module Pugin
|
4
|
-
ASSET_VERSION = '1.9.
|
5
|
-
ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://
|
4
|
+
ASSET_VERSION = '1.9.1'.freeze
|
5
|
+
ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://static.parliament.uk/pugin')
|
6
6
|
STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets')
|
7
|
-
STATIC_ASSET_PUBLIC_LOCATION_URL = ENV.fetch('STATIC_ASSET_PUBLIC_LOCATION_URL', 'https://
|
7
|
+
STATIC_ASSET_PUBLIC_LOCATION_URL = ENV.fetch('STATIC_ASSET_PUBLIC_LOCATION_URL', 'https://static.parliament.uk/assets-public')
|
8
8
|
class << self
|
9
9
|
attr_writer :alternates
|
10
10
|
|
data/lib/pugin/version.rb
CHANGED
@@ -128,27 +128,4 @@ describe 'pugin/layouts/_layout.html.haml', type: :view do
|
|
128
128
|
end
|
129
129
|
end
|
130
130
|
end
|
131
|
-
|
132
|
-
describe 'ApplictaionInsights' do
|
133
|
-
context 'with request ID set' do
|
134
|
-
before :each do
|
135
|
-
assign(:app_insights_request_id, '|12345678abcdefgh.')
|
136
|
-
render
|
137
|
-
end
|
138
|
-
|
139
|
-
it 'render the expected meta tag' do
|
140
|
-
expect(rendered).to include("<meta content='|12345678abcdefgh.' name='applicationinsights-request-id'>")
|
141
|
-
end
|
142
|
-
end
|
143
|
-
|
144
|
-
context 'without request ID set' do
|
145
|
-
before :each do
|
146
|
-
render
|
147
|
-
end
|
148
|
-
|
149
|
-
it 'does not render the meta tag' do
|
150
|
-
expect(rendered).not_to include('name="applicationinsights-request-id"')
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|
154
131
|
end
|
@@ -82,8 +82,8 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
|
|
82
82
|
allow(parliament_mp_constituency).to receive(:name).and_return('constituency1')
|
83
83
|
|
84
84
|
allow(parliament_mp_seat_incumbency).to receive(:current?).and_return(false)
|
85
|
-
allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,
|
86
|
-
allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(
|
85
|
+
allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,5,6))
|
86
|
+
allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2017,2,3,4,5,6))
|
87
87
|
allow(parliament_mp_seat_incumbency).to receive(:constituency).and_return(parliament_mp_constituency)
|
88
88
|
|
89
89
|
allow(parliament_mp_party).to receive(:name).and_return('Green Party')
|
@@ -103,27 +103,10 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
|
|
103
103
|
render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
|
104
104
|
expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
|
105
105
|
expect(response).to include("<p>
|
106
|
-
constituency1 from
|
107
|
-
-
|
106
|
+
constituency1 from Fri, 03 Feb 2017 04:05:06 +0000
|
107
|
+
- Fri, 03 Feb 2017 04:05:06 +0000
|
108
108
|
</p>")
|
109
109
|
expect(response).to include("<p>Green Party</p>")
|
110
110
|
end
|
111
|
-
|
112
|
-
context 'current' do
|
113
|
-
before :each do
|
114
|
-
allow(@people.first.current_seat_incumbency).to receive(:end_date).and_return(nil)
|
115
|
-
end
|
116
|
-
|
117
|
-
it "renders the parliament MP data" do
|
118
|
-
render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
|
119
|
-
expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
|
120
|
-
expect(response).to include("<p>
|
121
|
-
constituency1 from 3 Feb 2017
|
122
|
-
to present
|
123
|
-
</p>")
|
124
|
-
expect(response).to include("<p>Green Party</p>")
|
125
|
-
end
|
126
|
-
|
127
|
-
end
|
128
111
|
end
|
129
112
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pugin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.8.
|
4
|
+
version: 1.8.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Matt Rayner
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-05-
|
11
|
+
date: 2018-05-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -217,7 +217,6 @@ files:
|
|
217
217
|
- app/views/pugin/javascript/_pingdom.haml
|
218
218
|
- app/views/pugin/layouts/_layout.html.haml
|
219
219
|
- app/views/pugin/layouts/pugin.html.erb
|
220
|
-
- app/views/pugin/meta/_application_insights.html.haml
|
221
220
|
- app/views/pugin/meta/_opengraph.html.haml
|
222
221
|
- app/views/pugin/parties/list/_list.html.haml
|
223
222
|
- app/views/pugin/parties/list/current/current_party.html.haml
|
@@ -1 +0,0 @@
|
|
1
|
-
%meta{ name: 'applicationinsights-request-id', content: app_insights_request_id }
|