slimmer 3.19.0 → 3.20.0

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 +4 -2
  2. data/lib/slimmer/version.rb +1 -1
  3. data/test/processors/report_a_problem_inserter_test.rb +1 -1
  4. metadata +236 -172
data/lib/slimmer/test_template.rb CHANGED
@@ -3,8 +3,6 @@ module Slimmer::TestTemplate
3
3
  <html>
4
4
  <head>
5
5
  <title>Test Template</title>
6
- <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/jquery-1.7.2.min.js" type="text/javascript"></script><!-- no defer on jquery -->
7
- <script src="https://static.preview.alphagov.co.uk/static/application.js" type="text/javascript" defer="defer"></script>
8
6
  </head>
9
7
  <body>
10
8
  <header id="global-header"></header>
@@ -19,6 +17,10 @@ module Slimmer::TestTemplate
19
17
  <div id="wrapper"></div>
20
18
 
21
19
  <footer id="footer"></footer>
20
+
21
+ <script src="https://static.preview.alphagov.co.uk/static/govuk-template.js" type="text/javascript"></script>
22
+ <script src="https://static.preview.alphagov.co.uk/static/libs/jquery/jquery-1.7.2.min.js" type="text/javascript"></script>
23
+ <script src="https://static.preview.alphagov.co.uk/static/application.js" type="text/javascript"></script>
22
24
  </body>
23
25
  </html>
24
26
  }
data/lib/slimmer/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Slimmer
2
- VERSION = '3.19.0'
2
+ VERSION = '3.20.0'
3
3
  end
data/test/processors/report_a_problem_inserter_test.rb CHANGED
@@ -4,7 +4,7 @@ class ReportAProblemInserterTest < MiniTest::Unit::TestCase
4
4
 
5
5
  def setup
6
6
  super
7
- @report_a_problem_template = File.read( File.dirname(__FILE__) + "/../fixtures/report_a_problem.raw.html.erb" )
7
+ @report_a_problem_template = File.read( File.dirname(__FILE__) + "/../fixtures/report_a_problem.raw.html.erb", :encoding => 'utf-8')
8
8
  @skin = stub("Skin", :template => nil)
9
9
  end
10
10
 
metadata CHANGED
@@ -1,299 +1,363 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: slimmer
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 3.20.0
4
5
  prerelease:
5
- version: 3.19.0
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Ben Griffiths
9
9
  - James Stewart
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
-
14
- date: 2013-07-23 00:00:00 Z
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
13
+ date: 2013-09-26 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
17
16
  name: nokogiri
18
- requirement: &id001 !ruby/object:Gem::Requirement
17
+ requirement: !ruby/object:Gem::Requirement
19
18
  none: false
20
- requirements:
19
+ requirements:
21
20
  - - ~>
22
- - !ruby/object:Gem::Version
21
+ - !ruby/object:Gem::Version
23
22
  version: 1.5.0
24
23
  type: :runtime
25
24
  prerelease: false
26
- version_requirements: *id001
27
- - !ruby/object:Gem::Dependency
25
+ version_requirements: !ruby/object:Gem::Requirement
26
+ none: false
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ version: 1.5.0
31
+ - !ruby/object:Gem::Dependency
28
32
  name: rack
29
- requirement: &id002 !ruby/object:Gem::Requirement
33
+ requirement: !ruby/object:Gem::Requirement
30
34
  none: false
31
- requirements:
32
- - - ">="
33
- - !ruby/object:Gem::Version
35
+ requirements:
36
+ - - ! '>='
37
+ - !ruby/object:Gem::Version
34
38
  version: 1.3.5
35
39
  type: :runtime
36
40
  prerelease: false
37
- version_requirements: *id002
38
- - !ruby/object:Gem::Dependency
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: 1.3.5
47
+ - !ruby/object:Gem::Dependency
39
48
  name: plek
40
- requirement: &id003 !ruby/object:Gem::Requirement
49
+ requirement: !ruby/object:Gem::Requirement
41
50
  none: false
42
- requirements:
43
- - - ">="
44
- - !ruby/object:Gem::Version
51
+ requirements:
52
+ - - ! '>='
53
+ - !ruby/object:Gem::Version
45
54
  version: 0.1.8
46
55
  type: :runtime
47
56
  prerelease: false
48
- version_requirements: *id003
49
- - !ruby/object:Gem::Dependency
57
+ version_requirements: !ruby/object:Gem::Requirement
58
+ none: false
59
+ requirements:
60
+ - - ! '>='
61
+ - !ruby/object:Gem::Version
62
+ version: 0.1.8
63
+ - !ruby/object:Gem::Dependency
50
64
  name: json
51
- requirement: &id004 !ruby/object:Gem::Requirement
65
+ requirement: !ruby/object:Gem::Requirement
52
66
  none: false
53
- requirements:
54
- - - ">="
55
- - !ruby/object:Gem::Version
56
- version: "0"
67
+ requirements:
68
+ - - ! '>='
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
57
71
  type: :runtime
58
72
  prerelease: false
59
- version_requirements: *id004
60
- - !ruby/object:Gem::Dependency
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
79
+ - !ruby/object:Gem::Dependency
61
80
  name: null_logger
62
- requirement: &id005 !ruby/object:Gem::Requirement
81
+ requirement: !ruby/object:Gem::Requirement
63
82
  none: false
64
- requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- version: "0"
83
+ requirements:
84
+ - - ! '>='
85
+ - !ruby/object:Gem::Version
86
+ version: '0'
68
87
  type: :runtime
69
88
  prerelease: false
70
- version_requirements: *id005
71
- - !ruby/object:Gem::Dependency
89
+ version_requirements: !ruby/object:Gem::Requirement
90
+ none: false
91
+ requirements:
92
+ - - ! '>='
93
+ - !ruby/object:Gem::Version
94
+ version: '0'
95
+ - !ruby/object:Gem::Dependency
72
96
  name: lrucache
73
- requirement: &id006 !ruby/object:Gem::Requirement
97
+ requirement: !ruby/object:Gem::Requirement
74
98
  none: false
75
- requirements:
99
+ requirements:
76
100
  - - ~>
77
- - !ruby/object:Gem::Version
101
+ - !ruby/object:Gem::Version
78
102
  version: 0.1.3
79
103
  type: :runtime
80
104
  prerelease: false
81
- version_requirements: *id006
82
- - !ruby/object:Gem::Dependency
105
+ version_requirements: !ruby/object:Gem::Requirement
106
+ none: false
107
+ requirements:
108
+ - - ~>
109
+ - !ruby/object:Gem::Version
110
+ version: 0.1.3
111
+ - !ruby/object:Gem::Dependency
83
112
  name: rake
84
- requirement: &id007 !ruby/object:Gem::Requirement
113
+ requirement: !ruby/object:Gem::Requirement
85
114
  none: false
86
- requirements:
115
+ requirements:
87
116
  - - ~>
88
- - !ruby/object:Gem::Version
117
+ - !ruby/object:Gem::Version
89
118
  version: 0.9.2.2
90
119
  type: :development
91
120
  prerelease: false
92
- version_requirements: *id007
93
- - !ruby/object:Gem::Dependency
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ none: false
123
+ requirements:
124
+ - - ~>
125
+ - !ruby/object:Gem::Version
126
+ version: 0.9.2.2
127
+ - !ruby/object:Gem::Dependency
94
128
  name: rack-test
95
- requirement: &id008 !ruby/object:Gem::Requirement
129
+ requirement: !ruby/object:Gem::Requirement
96
130
  none: false
97
- requirements:
131
+ requirements:
98
132
  - - ~>
99
- - !ruby/object:Gem::Version
133
+ - !ruby/object:Gem::Version
100
134
  version: 0.6.1
101
135
  type: :development
102
136
  prerelease: false
103
- version_requirements: *id008
104
- - !ruby/object:Gem::Dependency
137
+ version_requirements: !ruby/object:Gem::Requirement
138
+ none: false
139
+ requirements:
140
+ - - ~>
141
+ - !ruby/object:Gem::Version
142
+ version: 0.6.1
143
+ - !ruby/object:Gem::Dependency
105
144
  name: mocha
106
- requirement: &id009 !ruby/object:Gem::Requirement
145
+ requirement: !ruby/object:Gem::Requirement
107
146
  none: false
108
- requirements:
147
+ requirements:
109
148
  - - ~>
110
- - !ruby/object:Gem::Version
149
+ - !ruby/object:Gem::Version
111
150
  version: 0.12.4
112
151
  type: :development
113
152
  prerelease: false
114
- version_requirements: *id009
115
- - !ruby/object:Gem::Dependency
153
+ version_requirements: !ruby/object:Gem::Requirement
154
+ none: false
155
+ requirements:
156
+ - - ~>
157
+ - !ruby/object:Gem::Version
158
+ version: 0.12.4
159
+ - !ruby/object:Gem::Dependency
116
160
  name: webmock
117
- requirement: &id010 !ruby/object:Gem::Requirement
161
+ requirement: !ruby/object:Gem::Requirement
118
162
  none: false
119
- requirements:
120
- - - "="
121
- - !ruby/object:Gem::Version
163
+ requirements:
164
+ - - '='
165
+ - !ruby/object:Gem::Version
122
166
  version: 1.11.0
123
167
  type: :development
124
168
  prerelease: false
125
- version_requirements: *id010
126
- - !ruby/object:Gem::Dependency
169
+ version_requirements: !ruby/object:Gem::Requirement
170
+ none: false
171
+ requirements:
172
+ - - '='
173
+ - !ruby/object:Gem::Version
174
+ version: 1.11.0
175
+ - !ruby/object:Gem::Dependency
127
176
  name: therubyracer
128
- requirement: &id011 !ruby/object:Gem::Requirement
177
+ requirement: !ruby/object:Gem::Requirement
129
178
  none: false
130
- requirements:
179
+ requirements:
131
180
  - - ~>
132
- - !ruby/object:Gem::Version
181
+ - !ruby/object:Gem::Version
133
182
  version: 0.10.2
134
183
  type: :development
135
184
  prerelease: false
136
- version_requirements: *id011
137
- - !ruby/object:Gem::Dependency
185
+ version_requirements: !ruby/object:Gem::Requirement
186
+ none: false
187
+ requirements:
188
+ - - ~>
189
+ - !ruby/object:Gem::Version
190
+ version: 0.10.2
191
+ - !ruby/object:Gem::Dependency
138
192
  name: gem_publisher
139
- requirement: &id012 !ruby/object:Gem::Requirement
193
+ requirement: !ruby/object:Gem::Requirement
140
194
  none: false
141
- requirements:
195
+ requirements:
142
196
  - - ~>
143
- - !ruby/object:Gem::Version
197
+ - !ruby/object:Gem::Version
144
198
  version: 1.1.1
145
199
  type: :development
146
200
  prerelease: false
147
- version_requirements: *id012
148
- - !ruby/object:Gem::Dependency
201
+ version_requirements: !ruby/object:Gem::Requirement
202
+ none: false
203
+ requirements:
204
+ - - ~>
205
+ - !ruby/object:Gem::Version
206
+ version: 1.1.1
207
+ - !ruby/object:Gem::Dependency
149
208
  name: gds-api-adapters
150
- requirement: &id013 !ruby/object:Gem::Requirement
209
+ requirement: !ruby/object:Gem::Requirement
151
210
  none: false
152
- requirements:
153
- - - "="
154
- - !ruby/object:Gem::Version
211
+ requirements:
212
+ - - '='
213
+ - !ruby/object:Gem::Version
155
214
  version: 2.7.1
156
215
  type: :development
157
216
  prerelease: false
158
- version_requirements: *id013
159
- - !ruby/object:Gem::Dependency
217
+ version_requirements: !ruby/object:Gem::Requirement
218
+ none: false
219
+ requirements:
220
+ - - '='
221
+ - !ruby/object:Gem::Version
222
+ version: 2.7.1
223
+ - !ruby/object:Gem::Dependency
160
224
  name: timecop
161
- requirement: &id014 !ruby/object:Gem::Requirement
225
+ requirement: !ruby/object:Gem::Requirement
162
226
  none: false
163
- requirements:
227
+ requirements:
164
228
  - - ~>
165
- - !ruby/object:Gem::Version
229
+ - !ruby/object:Gem::Version
166
230
  version: 0.5.1
167
231
  type: :development
168
232
  prerelease: false
169
- version_requirements: *id014
233
+ version_requirements: !ruby/object:Gem::Requirement
234
+ none: false
235
+ requirements:
236
+ - - ~>
237
+ - !ruby/object:Gem::Version
238
+ version: 0.5.1
170
239
  description: Rack middleware for skinning pages using a specific template
171
- email:
240
+ email:
172
241
  - bengriffiths@gmail.com
173
242
  - james.stewart@digital.cabinet-office.gov.uk
174
- executables:
243
+ executables:
175
244
  - render_slimmer_error
176
245
  extensions: []
177
-
178
246
  extra_rdoc_files: []
179
-
180
- files:
247
+ files:
181
248
  - README.md
182
249
  - CHANGELOG.md
183
- - lib/slimmer.rb
250
+ - lib/slimmer/railtie.rb
251
+ - lib/slimmer/headers.rb
252
+ - lib/slimmer/skin.rb
184
253
  - lib/slimmer/app.rb
185
- - lib/slimmer/test_template.rb
254
+ - lib/slimmer/test.rb
186
255
  - lib/slimmer/version.rb
187
- - lib/slimmer/railtie.rb
188
- - lib/slimmer/processors/tag_mover.rb
189
- - lib/slimmer/processors/body_class_copier.rb
190
- - lib/slimmer/processors/logo_class_inserter.rb
191
- - lib/slimmer/processors/beta_notice_inserter.rb
256
+ - lib/slimmer/artefact.rb
257
+ - lib/slimmer/template.rb
258
+ - lib/slimmer/test_template.rb
259
+ - lib/slimmer/processors/campaign_notification_inserter.rb
192
260
  - lib/slimmer/processors/header_context_inserter.rb
193
- - lib/slimmer/processors/meta_viewport_remover.rb
194
- - lib/slimmer/processors/search_index_setter.rb
195
- - lib/slimmer/processors/report_a_problem_inserter.rb
196
261
  - lib/slimmer/processors/navigation_mover.rb
197
- - lib/slimmer/processors/campaign_notification_inserter.rb
198
- - lib/slimmer/processors/footer_remover.rb
199
262
  - lib/slimmer/processors/google_analytics_configurator.rb
200
- - lib/slimmer/processors/search_path_setter.rb
263
+ - lib/slimmer/processors/logo_class_inserter.rb
264
+ - lib/slimmer/processors/section_inserter.rb
265
+ - lib/slimmer/processors/tag_mover.rb
266
+ - lib/slimmer/processors/meta_viewport_remover.rb
267
+ - lib/slimmer/processors/body_class_copier.rb
268
+ - lib/slimmer/processors/report_a_problem_inserter.rb
201
269
  - lib/slimmer/processors/title_inserter.rb
270
+ - lib/slimmer/processors/search_index_setter.rb
271
+ - lib/slimmer/processors/body_inserter.rb
272
+ - lib/slimmer/processors/footer_remover.rb
273
+ - lib/slimmer/processors/beta_notice_inserter.rb
202
274
  - lib/slimmer/processors/related_items_inserter.rb
203
- - lib/slimmer/processors/section_inserter.rb
275
+ - lib/slimmer/processors/search_path_setter.rb
204
276
  - lib/slimmer/processors/conditional_comment_mover.rb
205
- - lib/slimmer/processors/body_inserter.rb
206
- - lib/slimmer/artefact.rb
207
- - lib/slimmer/skin.rb
208
- - lib/slimmer/headers.rb
209
- - lib/slimmer/template.rb
210
- - lib/slimmer/test.rb
211
277
  - lib/tasks/slimmer.rake
278
+ - lib/slimmer.rb
212
279
  - Rakefile
280
+ - test/typical_usage_test.rb
281
+ - test/skin_test.rb
282
+ - test/artefact_test.rb
283
+ - test/fixtures/wrapper.html.erb
284
+ - test/fixtures/500.html.erb
285
+ - test/fixtures/proposition_menu.html.erb
286
+ - test/fixtures/404.html.erb
287
+ - test/fixtures/report_a_problem.raw.html.erb
288
+ - test/fixtures/campaign.html.erb
289
+ - test/fixtures/related.raw.html.erb
290
+ - test/fixtures/beta_notice.html.erb
291
+ - test/headers_test.rb
292
+ - test/test_template_dependency_on_static_test.rb
293
+ - test/test_helper.rb
294
+ - test/processors/search_index_setter_test.rb
213
295
  - test/processors/header_context_inserter_test.rb
214
- - test/processors/google_analytics_test.rb
215
- - test/processors/navigation_mover_test.rb
216
296
  - test/processors/body_inserter_test.rb
217
- - test/processors/search_index_setter_test.rb
297
+ - test/processors/navigation_mover_test.rb
298
+ - test/processors/related_items_inserter_test.rb
299
+ - test/processors/search_path_setter_test.rb
300
+ - test/processors/google_analytics_test.rb
218
301
  - test/processors/meta_viewport_remover_test.rb
219
- - test/processors/report_a_problem_inserter_test.rb
220
- - test/processors/section_inserter_test.rb
221
302
  - test/processors/campaign_notification_inserter_test.rb
222
- - test/processors/search_path_setter_test.rb
223
- - test/processors/related_items_inserter_test.rb
303
+ - test/processors/section_inserter_test.rb
304
+ - test/processors/report_a_problem_inserter_test.rb
224
305
  - test/processors/logo_class_inserter_test.rb
225
- - test/test_template_dependency_on_static_test.rb
226
- - test/headers_test.rb
227
- - test/test_helper.rb
228
- - test/typical_usage_test.rb
229
- - test/artefact_test.rb
230
- - test/skin_test.rb
231
- - test/fixtures/campaign.html.erb
232
- - test/fixtures/404.html.erb
233
- - test/fixtures/beta_notice.html.erb
234
- - test/fixtures/proposition_menu.html.erb
235
- - test/fixtures/500.html.erb
236
- - test/fixtures/wrapper.html.erb
237
- - test/fixtures/related.raw.html.erb
238
- - test/fixtures/report_a_problem.raw.html.erb
239
306
  - bin/render_slimmer_error
240
307
  homepage: http://github.com/alphagov/slimmer
241
308
  licenses: []
242
-
243
309
  post_install_message:
244
310
  rdoc_options: []
245
-
246
- require_paths:
311
+ require_paths:
247
312
  - lib
248
- required_ruby_version: !ruby/object:Gem::Requirement
313
+ required_ruby_version: !ruby/object:Gem::Requirement
249
314
  none: false
250
- requirements:
251
- - - ">="
252
- - !ruby/object:Gem::Version
253
- hash: 4491266919277024024
254
- segments:
315
+ requirements:
316
+ - - ! '>='
317
+ - !ruby/object:Gem::Version
318
+ version: '0'
319
+ segments:
255
320
  - 0
256
- version: "0"
257
- required_rubygems_version: !ruby/object:Gem::Requirement
321
+ hash: -3039332141406207246
322
+ required_rubygems_version: !ruby/object:Gem::Requirement
258
323
  none: false
259
- requirements:
260
- - - ">="
261
- - !ruby/object:Gem::Version
262
- hash: 4491266919277024024
263
- segments:
324
+ requirements:
325
+ - - ! '>='
326
+ - !ruby/object:Gem::Version
327
+ version: '0'
328
+ segments:
264
329
  - 0
265
- version: "0"
330
+ hash: -3039332141406207246
266
331
  requirements: []
267
-
268
332
  rubyforge_project: slimmer
269
- rubygems_version: 1.8.24
333
+ rubygems_version: 1.8.23
270
334
  signing_key:
271
335
  specification_version: 3
272
336
  summary: Thinner than the skinner
273
- test_files:
337
+ test_files:
338
+ - test/typical_usage_test.rb
339
+ - test/skin_test.rb
340
+ - test/artefact_test.rb
341
+ - test/fixtures/wrapper.html.erb
342
+ - test/fixtures/500.html.erb
343
+ - test/fixtures/proposition_menu.html.erb
344
+ - test/fixtures/404.html.erb
345
+ - test/fixtures/report_a_problem.raw.html.erb
346
+ - test/fixtures/campaign.html.erb
347
+ - test/fixtures/related.raw.html.erb
348
+ - test/fixtures/beta_notice.html.erb
349
+ - test/headers_test.rb
350
+ - test/test_template_dependency_on_static_test.rb
351
+ - test/test_helper.rb
352
+ - test/processors/search_index_setter_test.rb
274
353
  - test/processors/header_context_inserter_test.rb
275
- - test/processors/google_analytics_test.rb
276
- - test/processors/navigation_mover_test.rb
277
354
  - test/processors/body_inserter_test.rb
278
- - test/processors/search_index_setter_test.rb
355
+ - test/processors/navigation_mover_test.rb
356
+ - test/processors/related_items_inserter_test.rb
357
+ - test/processors/search_path_setter_test.rb
358
+ - test/processors/google_analytics_test.rb
279
359
  - test/processors/meta_viewport_remover_test.rb
280
- - test/processors/report_a_problem_inserter_test.rb
281
- - test/processors/section_inserter_test.rb
282
360
  - test/processors/campaign_notification_inserter_test.rb
283
- - test/processors/search_path_setter_test.rb
284
- - test/processors/related_items_inserter_test.rb
361
+ - test/processors/section_inserter_test.rb
362
+ - test/processors/report_a_problem_inserter_test.rb
285
363
  - test/processors/logo_class_inserter_test.rb
286
- - test/test_template_dependency_on_static_test.rb
287
- - test/headers_test.rb
288
- - test/test_helper.rb
289
- - test/typical_usage_test.rb
290
- - test/artefact_test.rb
291
- - test/skin_test.rb
292
- - test/fixtures/campaign.html.erb
293
- - test/fixtures/404.html.erb
294
- - test/fixtures/beta_notice.html.erb
295
- - test/fixtures/proposition_menu.html.erb
296
- - test/fixtures/500.html.erb
297
- - test/fixtures/wrapper.html.erb
298
- - test/fixtures/related.raw.html.erb
299
- - test/fixtures/report_a_problem.raw.html.erb