slimmer 3.9.3 → 3.9.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/lib/slimmer/test_template.rb +14 -14
  2. data/lib/slimmer/version.rb +1 -1
  3. data/test/test_template_dependency_on_static_test.rb +8 -1
  4. metadata +56 -56
data/lib/slimmer/test_template.rb CHANGED
@@ -3,20 +3,20 @@ module Slimmer::TestTemplate
3
3
  <html>
4
4
  <head>
5
5
  <title>Test Template</title>
6
- <script src="http://static.preview.alphagov.co.uk/static/libs/jquery/jquery-1.7.2.min.js"></script><!-- no defer on jquery -->
7
- <script src="http://static.preview.alphagov.co.uk/static/libs/jquery/jquery-ui-1.8.16.custom.min.js" defer></script>
8
- <script src="http://static.preview.alphagov.co.uk/static/libs/jquery/plugins/jquery.base64.js" defer></script>
9
- <script src="http://static.preview.alphagov.co.uk/static/libs/jquery/plugins/jquery.mustache.js" defer></script>
10
- <script src="http://static.preview.alphagov.co.uk/static/search.js" defer></script>
11
- <script src="http://static.preview.alphagov.co.uk/static/core.js" defer></script>
12
- <script src="http://static.preview.alphagov.co.uk/static/devolution.js" defer></script>
13
- <script src="http://static.preview.alphagov.co.uk/static/popup.js" defer></script>
14
- <script src="http://static.preview.alphagov.co.uk/static/geo-locator.js" defer></script>
15
- <script src="http://static.preview.alphagov.co.uk/static/customisation-settings.js" defer></script>
16
- <script src="http://static.preview.alphagov.co.uk/static/welcome.js" defer></script>
17
- <script src="http://static.preview.alphagov.co.uk/static/browse.js" defer></script>
18
- <script src="http://static.preview.alphagov.co.uk/static/jquery.history.js" defer></script>
19
- <script src="http://static.preview.alphagov.co.uk/static/jquery.tabs.js" defer></script>
6
+ <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/jquery-1.7.2.min.js"></script><!-- no defer on jquery -->
7
+ <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/jquery-ui-1.8.16.custom.min.js" defer></script>
8
+ <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/plugins/jquery.base64.js" defer></script>
9
+ <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/plugins/jquery.mustache.js" defer></script>
10
+ <script src="https://static.preview.alphagov.co.uk/static/search.js" defer></script>
11
+ <script src="https://static.preview.alphagov.co.uk/static/core.js" defer></script>
12
+ <script src="https://static.preview.alphagov.co.uk/static/devolution.js" defer></script>
13
+ <script src="https://static.preview.alphagov.co.uk/static/popup.js" defer></script>
14
+ <script src="https://static.preview.alphagov.co.uk/static/geo-locator.js" defer></script>
15
+ <script src="https://static.preview.alphagov.co.uk/static/customisation-settings.js" defer></script>
16
+ <script src="https://static.preview.alphagov.co.uk/static/welcome.js" defer></script>
17
+ <script src="https://static.preview.alphagov.co.uk/static/browse.js" defer></script>
18
+ <script src="https://static.preview.alphagov.co.uk/static/jquery.history.js" defer></script>
19
+ <script src="https://static.preview.alphagov.co.uk/static/jquery.tabs.js" defer></script>
20
20
  </head>
21
21
  <body>
22
22
  <div class="header-context">
data/lib/slimmer/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Slimmer
2
- VERSION = '3.9.3'
2
+ VERSION = '3.9.4'
3
3
  end
data/test/test_template_dependency_on_static_test.rb CHANGED
@@ -7,7 +7,14 @@ class TestTemplateDependencyOnStaticTest < MiniTest::Unit::TestCase
7
7
  scripts = doc.search("script").map { |node| node.attributes["src"].value }
8
8
  failing_scripts = allowing_real_web_connections do
9
9
  scripts.select do |script_src|
10
- Net::HTTP.get_response(URI.parse(script_src)).code != "200"
10
+ uri = URI.parse(script_src)
11
+ http = Net::HTTP.new(uri.host, uri.port)
12
+ if uri.scheme == "https"
13
+ http.use_ssl = true
14
+ http.verify_mode = OpenSSL::SSL::VERIFY_NONE
15
+ end
16
+ response = http.get(uri.request_uri)
17
+ response.code != "200"
11
18
  end
12
19
  end
13
20
  assert failing_scripts.empty?, "Some scripts could not be loaded: #{failing_scripts.inspect}"
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: slimmer
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 3.9.3
5
+ version: 3.9.4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Ben Griffiths
@@ -180,58 +180,58 @@ extra_rdoc_files: []
180
180
  files:
181
181
  - README.md
182
182
  - CHANGELOG.md
183
- - lib/tasks/slimmer.rake
184
183
  - lib/slimmer.rb
185
- - lib/slimmer/skin.rb
186
- - lib/slimmer/railtie.rb
187
- - lib/slimmer/template.rb
188
- - lib/slimmer/test_template.rb
189
- - lib/slimmer/test.rb
190
184
  - lib/slimmer/app.rb
185
+ - lib/slimmer/test_template.rb
186
+ - lib/slimmer/version.rb
187
+ - lib/slimmer/railtie.rb
188
+ - lib/slimmer/processors/tag_mover.rb
189
+ - lib/slimmer/processors/body_class_copier.rb
191
190
  - lib/slimmer/processors/logo_class_inserter.rb
191
+ - lib/slimmer/processors/header_context_inserter.rb
192
+ - lib/slimmer/processors/meta_viewport_remover.rb
192
193
  - lib/slimmer/processors/search_index_setter.rb
193
- - lib/slimmer/processors/body_class_copier.rb
194
- - lib/slimmer/processors/tag_mover.rb
194
+ - lib/slimmer/processors/report_a_problem_inserter.rb
195
+ - lib/slimmer/processors/campaign_notification_inserter.rb
196
+ - lib/slimmer/processors/footer_remover.rb
197
+ - lib/slimmer/processors/google_analytics_configurator.rb
198
+ - lib/slimmer/processors/admin_title_inserter.rb
195
199
  - lib/slimmer/processors/search_path_setter.rb
196
200
  - lib/slimmer/processors/title_inserter.rb
197
- - lib/slimmer/processors/google_analytics_configurator.rb
198
- - lib/slimmer/processors/conditional_comment_mover.rb
199
201
  - lib/slimmer/processors/related_items_inserter.rb
200
- - lib/slimmer/processors/header_context_inserter.rb
201
- - lib/slimmer/processors/body_inserter.rb
202
- - lib/slimmer/processors/admin_title_inserter.rb
203
- - lib/slimmer/processors/report_a_problem_inserter.rb
204
- - lib/slimmer/processors/meta_viewport_remover.rb
205
- - lib/slimmer/processors/campaign_notification_inserter.rb
206
202
  - lib/slimmer/processors/section_inserter.rb
207
- - lib/slimmer/processors/footer_remover.rb
208
- - lib/slimmer/headers.rb
209
- - lib/slimmer/version.rb
203
+ - lib/slimmer/processors/conditional_comment_mover.rb
204
+ - lib/slimmer/processors/body_inserter.rb
210
205
  - lib/slimmer/artefact.rb
206
+ - lib/slimmer/skin.rb
207
+ - lib/slimmer/headers.rb
208
+ - lib/slimmer/template.rb
209
+ - lib/slimmer/test.rb
210
+ - lib/tasks/slimmer.rake
211
211
  - Rakefile
212
- - test/headers_test.rb
213
- - test/artefact_test.rb
214
- - test/fixtures/related.raw.html.erb
215
- - test/fixtures/campaign.html.erb
216
- - test/fixtures/500.html.erb
217
- - test/fixtures/404.html.erb
218
- - test/fixtures/wrapper.html.erb
219
- - test/fixtures/report_a_problem.raw.html.erb
220
- - test/skin_test.rb
221
- - test/processors/campaign_notification_inserter_test.rb
222
- - test/processors/meta_viewport_remover_test.rb
223
- - test/processors/logo_class_inserter_test.rb
224
- - test/processors/search_index_setter_test.rb
212
+ - test/processors/header_context_inserter_test.rb
225
213
  - test/processors/google_analytics_test.rb
226
- - test/processors/report_a_problem_inserter_test.rb
227
214
  - test/processors/body_inserter_test.rb
228
- - test/processors/search_path_setter_test.rb
215
+ - test/processors/search_index_setter_test.rb
216
+ - test/processors/meta_viewport_remover_test.rb
217
+ - test/processors/report_a_problem_inserter_test.rb
229
218
  - test/processors/section_inserter_test.rb
219
+ - test/processors/campaign_notification_inserter_test.rb
220
+ - test/processors/search_path_setter_test.rb
230
221
  - test/processors/related_items_inserter_test.rb
231
- - test/processors/header_context_inserter_test.rb
232
- - test/typical_usage_test.rb
222
+ - test/processors/logo_class_inserter_test.rb
233
223
  - test/test_template_dependency_on_static_test.rb
224
+ - test/headers_test.rb
234
225
  - test/test_helper.rb
226
+ - test/typical_usage_test.rb
227
+ - test/artefact_test.rb
228
+ - test/skin_test.rb
229
+ - test/fixtures/campaign.html.erb
230
+ - test/fixtures/404.html.erb
231
+ - test/fixtures/500.html.erb
232
+ - test/fixtures/wrapper.html.erb
233
+ - test/fixtures/related.raw.html.erb
234
+ - test/fixtures/report_a_problem.raw.html.erb
235
235
  - bin/render_slimmer_error
236
236
  homepage: http://github.com/alphagov/slimmer
237
237
  licenses: []
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
246
246
  requirements:
247
247
  - - ">="
248
248
  - !ruby/object:Gem::Version
249
- hash: 4458894568603330614
249
+ hash: 4061718624435070501
250
250
  segments:
251
251
  - 0
252
252
  version: "0"
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
255
255
  requirements:
256
256
  - - ">="
257
257
  - !ruby/object:Gem::Version
258
- hash: 4458894568603330614
258
+ hash: 4061718624435070501
259
259
  segments:
260
260
  - 0
261
261
  version: "0"
@@ -267,26 +267,26 @@ signing_key:
267
267
  specification_version: 3
268
268
  summary: Thinner than the skinner
269
269
  test_files:
270
- - test/headers_test.rb
271
- - test/artefact_test.rb
272
- - test/fixtures/related.raw.html.erb
273
- - test/fixtures/campaign.html.erb
274
- - test/fixtures/500.html.erb
275
- - test/fixtures/404.html.erb
276
- - test/fixtures/wrapper.html.erb
277
- - test/fixtures/report_a_problem.raw.html.erb
278
- - test/skin_test.rb
279
- - test/processors/campaign_notification_inserter_test.rb
280
- - test/processors/meta_viewport_remover_test.rb
281
- - test/processors/logo_class_inserter_test.rb
282
- - test/processors/search_index_setter_test.rb
270
+ - test/processors/header_context_inserter_test.rb
283
271
  - test/processors/google_analytics_test.rb
284
- - test/processors/report_a_problem_inserter_test.rb
285
272
  - test/processors/body_inserter_test.rb
286
- - test/processors/search_path_setter_test.rb
273
+ - test/processors/search_index_setter_test.rb
274
+ - test/processors/meta_viewport_remover_test.rb
275
+ - test/processors/report_a_problem_inserter_test.rb
287
276
  - test/processors/section_inserter_test.rb
277
+ - test/processors/campaign_notification_inserter_test.rb
278
+ - test/processors/search_path_setter_test.rb
288
279
  - test/processors/related_items_inserter_test.rb
289
- - test/processors/header_context_inserter_test.rb
290
- - test/typical_usage_test.rb
280
+ - test/processors/logo_class_inserter_test.rb
291
281
  - test/test_template_dependency_on_static_test.rb
282
+ - test/headers_test.rb
292
283
  - test/test_helper.rb
284
+ - test/typical_usage_test.rb
285
+ - test/artefact_test.rb
286
+ - test/skin_test.rb
287
+ - test/fixtures/campaign.html.erb
288
+ - test/fixtures/404.html.erb
289
+ - test/fixtures/500.html.erb
290
+ - test/fixtures/wrapper.html.erb
291
+ - test/fixtures/related.raw.html.erb
292
+ - test/fixtures/report_a_problem.raw.html.erb