slimmer 3.12.0 → 3.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/slimmer/headers.rb +16 -2
  2. data/lib/slimmer/test_template.rb +1 -1
  3. data/lib/slimmer/version.rb +1 -1
  4. data/test/headers_test.rb +29 -0
  5. metadata +50 -50
data/lib/slimmer/headers.rb CHANGED
@@ -46,9 +46,24 @@ module Slimmer
46
46
  headers[ARTEFACT_HEADER] = artefact.to_json
47
47
  end
48
48
 
49
+ def set_slimmer_artefact_overriding_section(artefact_input, details = {})
50
+ if tag = slimmer_section_tag_for_details(details)
51
+ artefact_input = artefact_input.dup
52
+ artefact_input["tags"] = [tag] + (artefact_input["tags"] || [])
53
+ end
54
+ set_slimmer_artefact(artefact_input)
55
+ end
56
+
49
57
  def set_slimmer_dummy_artefact(details = {})
50
58
  artefact = {}
51
59
  artefact["title"] = details[:title] if details[:title]
60
+ if tag = slimmer_section_tag_for_details(details)
61
+ artefact["tags"] = [tag]
62
+ end
63
+ set_slimmer_artefact(artefact)
64
+ end
65
+
66
+ def slimmer_section_tag_for_details(details)
52
67
  if details[:section_name] and details[:section_link]
53
68
  tag = {
54
69
  "title" => details[:section_name],
@@ -61,9 +76,8 @@ module Slimmer
61
76
  "content_with_tag" => {"web_url" => details[:parent][:section_link]},
62
77
  }
63
78
  end
64
- artefact["tags"] = [tag]
79
+ tag
65
80
  end
66
- headers[ARTEFACT_HEADER] = artefact.to_json
67
81
  end
68
82
  end
69
83
  end
data/lib/slimmer/test_template.rb CHANGED
@@ -8,7 +8,7 @@ module Slimmer::TestTemplate
8
8
  </head>
9
9
  <body>
10
10
  <header id="global-header"></header>
11
- <div id="global-navigation" class="header-context">
11
+ <div id="global-breadcrumb" class="header-context">
12
12
  <nav role="navigation">
13
13
  <ol class="group">
14
14
  <li><a href="/">Home</a></li>
data/lib/slimmer/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Slimmer
2
- VERSION = '3.12.0'
2
+ VERSION = '3.13.0'
3
3
  end
data/test/headers_test.rb CHANGED
@@ -115,6 +115,35 @@ describe Slimmer::Headers do
115
115
  end
116
116
  end
117
117
 
118
+ describe "setting the artefact and adding a dummy section" do
119
+ it "should setup a section tag for the given name and link" do
120
+ artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
121
+ self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/something/foo")
122
+
123
+ artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
124
+
125
+ assert_equal "Foo", artefact["tags"][0]["title"]
126
+ assert_equal "section", artefact["tags"][0]["details"]["type"]
127
+ assert_equal "/something/foo", artefact["tags"][0]["content_with_tag"]["web_url"]
128
+ end
129
+
130
+ it "should not overwrite existing tags" do
131
+ artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions", "tags" => ["foo", "bar"]}
132
+ self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/something/foo")
133
+
134
+ artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
135
+
136
+ assert_equal ["foo", "bar"], artefact["tags"][1..-1]
137
+ end
138
+
139
+ it "should not have side-effects on the passed in hash" do
140
+ artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
141
+ artefact_copy = artefact.dup
142
+ self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/foo")
143
+ assert_equal artefact_copy, artefact
144
+ end
145
+ end
146
+
118
147
  describe "setting a dummy artefact in the artefact header" do
119
148
  it "should setup an artefact title" do
120
149
  self.set_slimmer_dummy_artefact(:title => "Foo")
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: slimmer
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 3.12.0
5
+ version: 3.13.0
6
6
  platform: ruby
7
7
  authors:
8
8
  - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2013-03-01 00:00:00 Z
14
+ date: 2013-03-04 00:00:00 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: nokogiri
@@ -180,57 +180,57 @@ extra_rdoc_files: []
180
180
  files:
181
181
  - README.md
182
182
  - CHANGELOG.md
183
- - lib/slimmer.rb
184
- - lib/slimmer/app.rb
185
- - lib/slimmer/test_template.rb
183
+ - lib/tasks/slimmer.rake
186
184
  - lib/slimmer/version.rb
187
- - lib/slimmer/railtie.rb
188
- - lib/slimmer/processors/tag_mover.rb
189
185
  - lib/slimmer/processors/body_class_copier.rb
186
+ - lib/slimmer/processors/google_analytics_configurator.rb
187
+ - lib/slimmer/processors/related_items_inserter.rb
188
+ - lib/slimmer/processors/body_inserter.rb
190
189
  - lib/slimmer/processors/logo_class_inserter.rb
191
- - lib/slimmer/processors/beta_notice_inserter.rb
192
- - lib/slimmer/processors/header_context_inserter.rb
193
- - lib/slimmer/processors/meta_viewport_remover.rb
194
- - lib/slimmer/processors/search_index_setter.rb
195
190
  - lib/slimmer/processors/report_a_problem_inserter.rb
196
- - lib/slimmer/processors/campaign_notification_inserter.rb
197
191
  - lib/slimmer/processors/footer_remover.rb
198
- - lib/slimmer/processors/google_analytics_configurator.rb
199
- - lib/slimmer/processors/title_inserter.rb
200
- - lib/slimmer/processors/related_items_inserter.rb
201
- - lib/slimmer/processors/section_inserter.rb
192
+ - lib/slimmer/processors/campaign_notification_inserter.rb
202
193
  - lib/slimmer/processors/conditional_comment_mover.rb
203
- - lib/slimmer/processors/body_inserter.rb
194
+ - lib/slimmer/processors/beta_notice_inserter.rb
195
+ - lib/slimmer/processors/section_inserter.rb
196
+ - lib/slimmer/processors/tag_mover.rb
197
+ - lib/slimmer/processors/title_inserter.rb
198
+ - lib/slimmer/processors/search_index_setter.rb
199
+ - lib/slimmer/processors/header_context_inserter.rb
200
+ - lib/slimmer/processors/meta_viewport_remover.rb
201
+ - lib/slimmer/template.rb
202
+ - lib/slimmer/railtie.rb
203
+ - lib/slimmer/test.rb
204
204
  - lib/slimmer/artefact.rb
205
205
  - lib/slimmer/skin.rb
206
+ - lib/slimmer/app.rb
206
207
  - lib/slimmer/headers.rb
207
- - lib/slimmer/template.rb
208
- - lib/slimmer/test.rb
209
- - lib/tasks/slimmer.rake
208
+ - lib/slimmer/test_template.rb
209
+ - lib/slimmer.rb
210
210
  - Rakefile
211
- - test/processors/header_context_inserter_test.rb
212
- - test/processors/google_analytics_test.rb
213
- - test/processors/body_inserter_test.rb
214
- - test/processors/search_index_setter_test.rb
215
211
  - test/processors/meta_viewport_remover_test.rb
212
+ - test/processors/related_items_inserter_test.rb
216
213
  - test/processors/report_a_problem_inserter_test.rb
217
214
  - test/processors/section_inserter_test.rb
218
- - test/processors/campaign_notification_inserter_test.rb
219
- - test/processors/related_items_inserter_test.rb
215
+ - test/processors/google_analytics_test.rb
216
+ - test/processors/search_index_setter_test.rb
217
+ - test/processors/header_context_inserter_test.rb
218
+ - test/processors/body_inserter_test.rb
220
219
  - test/processors/logo_class_inserter_test.rb
221
- - test/test_template_dependency_on_static_test.rb
222
- - test/headers_test.rb
223
- - test/test_helper.rb
224
- - test/typical_usage_test.rb
220
+ - test/processors/campaign_notification_inserter_test.rb
225
221
  - test/artefact_test.rb
226
222
  - test/skin_test.rb
227
- - test/fixtures/campaign.html.erb
223
+ - test/headers_test.rb
224
+ - test/test_template_dependency_on_static_test.rb
225
+ - test/typical_usage_test.rb
226
+ - test/fixtures/500.html.erb
228
227
  - test/fixtures/404.html.erb
229
228
  - test/fixtures/beta_notice.html.erb
230
- - test/fixtures/500.html.erb
231
- - test/fixtures/wrapper.html.erb
232
- - test/fixtures/related.raw.html.erb
233
229
  - test/fixtures/report_a_problem.raw.html.erb
230
+ - test/fixtures/campaign.html.erb
231
+ - test/fixtures/related.raw.html.erb
232
+ - test/fixtures/wrapper.html.erb
233
+ - test/test_helper.rb
234
234
  - bin/render_slimmer_error
235
235
  homepage: http://github.com/alphagov/slimmer
236
236
  licenses: []
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
245
245
  requirements:
246
246
  - - ">="
247
247
  - !ruby/object:Gem::Version
248
- hash: -3232249318320008172
248
+ hash: 2926130443012514444
249
249
  segments:
250
250
  - 0
251
251
  version: "0"
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
254
254
  requirements:
255
255
  - - ">="
256
256
  - !ruby/object:Gem::Version
257
- hash: -3232249318320008172
257
+ hash: 2926130443012514444
258
258
  segments:
259
259
  - 0
260
260
  version: "0"
@@ -266,26 +266,26 @@ signing_key:
266
266
  specification_version: 3
267
267
  summary: Thinner than the skinner
268
268
  test_files:
269
- - test/processors/header_context_inserter_test.rb
270
- - test/processors/google_analytics_test.rb
271
- - test/processors/body_inserter_test.rb
272
- - test/processors/search_index_setter_test.rb
273
269
  - test/processors/meta_viewport_remover_test.rb
270
+ - test/processors/related_items_inserter_test.rb
274
271
  - test/processors/report_a_problem_inserter_test.rb
275
272
  - test/processors/section_inserter_test.rb
276
- - test/processors/campaign_notification_inserter_test.rb
277
- - test/processors/related_items_inserter_test.rb
273
+ - test/processors/google_analytics_test.rb
274
+ - test/processors/search_index_setter_test.rb
275
+ - test/processors/header_context_inserter_test.rb
276
+ - test/processors/body_inserter_test.rb
278
277
  - test/processors/logo_class_inserter_test.rb
279
- - test/test_template_dependency_on_static_test.rb
280
- - test/headers_test.rb
281
- - test/test_helper.rb
282
- - test/typical_usage_test.rb
278
+ - test/processors/campaign_notification_inserter_test.rb
283
279
  - test/artefact_test.rb
284
280
  - test/skin_test.rb
285
- - test/fixtures/campaign.html.erb
281
+ - test/headers_test.rb
282
+ - test/test_template_dependency_on_static_test.rb
283
+ - test/typical_usage_test.rb
284
+ - test/fixtures/500.html.erb
286
285
  - test/fixtures/404.html.erb
287
286
  - test/fixtures/beta_notice.html.erb
288
- - test/fixtures/500.html.erb
289
- - test/fixtures/wrapper.html.erb
290
- - test/fixtures/related.raw.html.erb
291
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/wrapper.html.erb
291
+ - test/test_helper.rb