slimmer 9.0.1 → 9.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cccb8e264581553257ae79c647ddf59080300f07
4
- data.tar.gz: a111c190cd49364c2c9c87f97414571accfb9419
3
+ metadata.gz: 75ed5125f21b8ffde308600b2d649d12e45a5166
4
+ data.tar.gz: 8a689fb2a310302d865d56dc9b666613360967e8
5
5
  SHA512:
6
- metadata.gz: cc63baa7960746171715ebc691a126d20a0d6927ac4bc3ed4beec1dfbda646e035f5bce969bb2f991677d4aa73c7ee69ad98019f0861ea849af6b3c7bf14d019
7
- data.tar.gz: e8a1f0cd314d184edb5a811d8e50ca6cd5c4cd8a97ffb87cc52cc96c09553e211c4be2496ac571de016355b9cdef1297f495f3385c73795a8f84434f5a910a8a
6
+ metadata.gz: da744e5afa6a84e8944a05cc20ee2e5da214c1a7af671f4190e1db67e1a34d7a9e5f550c68edd3f912fecb8cc038acd515b7282ec337cde60786eda2128a9a91
7
+ data.tar.gz: 24170d05c56821d21052a40aa17899ba27fbefb1e34248cb4b1193d43a10567a689bcad2ad76f60ee869c0cb6cecc5bf5885c13c76344c7aebcfe4cba08467ad
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 9.1.0
2
+
3
+ * Allow applications to request components using full or partial component
4
+ paths, eg "name", "name.raw" and "name.raw.html.erb". This allows
5
+ components to be nested within other components.
6
+
1
7
  # 9.0.1
2
8
 
3
9
  * Change the find_templates method signature to add an optional arg that
@@ -56,7 +56,8 @@ module Slimmer
56
56
  end
57
57
 
58
58
  def template_url(template_path)
59
- [static_host, "templates", "#{template_path}.raw.html.erb"].join('/')
59
+ path = template_path.sub(/\.raw(\.html\.erb)?$/, '')
60
+ [static_host, "templates", "#{path}.raw.html.erb"].join('/')
60
61
  end
61
62
 
62
63
  def static_host
@@ -1,3 +1,3 @@
1
1
  module Slimmer
2
- VERSION = '9.0.1'
2
+ VERSION = '9.1.0'
3
3
  end
@@ -11,12 +11,15 @@ describe Slimmer::ComponentResolver do
11
11
  end
12
12
 
13
13
  it "should request a valid template from the server" do
14
- expected_url = "http://static.dev.gov.uk/templates/govuk_component/name.raw.html.erb"
15
- stub_request(:get, expected_url).to_return :body => "<foo />"
14
+ assert_valid_template_requested('name', 'name.raw.html.erb')
15
+ end
16
16
 
17
- templates = @resolver.find_templates('name', 'govuk_component', false, {}, false)
18
- assert_requested :get, expected_url
19
- assert_equal '<foo />', templates.first.args[0]
17
+ it "should request a valid template from the server when a raw template is requested" do
18
+ assert_valid_template_requested('name.raw', 'name.raw.html.erb')
19
+ end
20
+
21
+ it "should request a valid template from the server when the full template filename is requested" do
22
+ assert_valid_template_requested('name.raw.html.erb', 'name.raw.html.erb')
20
23
  end
21
24
 
22
25
  it "should return a known template in test mode" do
@@ -26,4 +29,13 @@ describe Slimmer::ComponentResolver do
26
29
  assert_match /<test-govuk-component data-template="govuk_component-name">/, templates.first.args[0]
27
30
  end
28
31
  end
32
+
33
+ def assert_valid_template_requested(requested, expected)
34
+ expected_url = "http://static.dev.gov.uk/templates/govuk_component/#{expected}"
35
+ stub_request(:get, expected_url).to_return body: "<foo />"
36
+
37
+ templates = @resolver.find_templates(requested, 'govuk_component', false, {}, false)
38
+ assert_requested :get, expected_url
39
+ assert_equal '<foo />', templates.first.args[0]
40
+ end
29
41
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: slimmer
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.0.1
4
+ version: 9.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-26 00:00:00.000000000 Z
12
+ date: 2016-02-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nokogiri
@@ -341,32 +341,32 @@ signing_key:
341
341
  specification_version: 4
342
342
  summary: Thinner than the skinner
343
343
  test_files:
344
- - test/headers_test.rb
345
- - test/processors/body_inserter_test.rb
346
- - test/processors/search_path_setter_test.rb
347
- - test/processors/navigation_mover_test.rb
348
- - test/processors/report_a_problem_inserter_test.rb
349
- - test/processors/tag_mover_test.rb
350
- - test/processors/search_parameter_inserter_test.rb
351
- - test/processors/related_items_inserter_test.rb
352
- - test/processors/search_remover_test.rb
353
- - test/processors/metadata_inserter_test.rb
354
- - test/processors/header_context_inserter_test.rb
355
- - test/processors/meta_viewport_remover_test.rb
356
- - test/processors/section_inserter_test.rb
357
- - test/test_template_dependency_on_static_test.rb
358
- - test/test_helper.rb
344
+ - test/component_resolver_test.rb
345
+ - test/changelog_test.rb
346
+ - test/test_helpers/shared_templates_test.rb
359
347
  - test/typical_usage_test.rb
360
- - test/artefact_test.rb
361
348
  - test/skin_test.rb
362
- - test/component_resolver_test.rb
363
- - test/fixtures/core_layout.html.erb
364
- - test/fixtures/report_a_problem.raw.html.erb
349
+ - test/artefact_test.rb
350
+ - test/fixtures/500.html.erb
351
+ - test/fixtures/proposition_menu.html.erb
365
352
  - test/fixtures/410.html.erb
353
+ - test/fixtures/core_layout.html.erb
366
354
  - test/fixtures/404.html.erb
355
+ - test/fixtures/report_a_problem.raw.html.erb
367
356
  - test/fixtures/related.raw.html.erb
368
- - test/fixtures/500.html.erb
369
- - test/fixtures/proposition_menu.html.erb
370
- - test/test_helpers/shared_templates_test.rb
357
+ - test/headers_test.rb
358
+ - test/test_template_dependency_on_static_test.rb
371
359
  - test/cache_test.rb
372
- - test/changelog_test.rb
360
+ - test/test_helper.rb
361
+ - test/processors/header_context_inserter_test.rb
362
+ - test/processors/body_inserter_test.rb
363
+ - test/processors/navigation_mover_test.rb
364
+ - test/processors/related_items_inserter_test.rb
365
+ - test/processors/search_path_setter_test.rb
366
+ - test/processors/meta_viewport_remover_test.rb
367
+ - test/processors/search_parameter_inserter_test.rb
368
+ - test/processors/search_remover_test.rb
369
+ - test/processors/section_inserter_test.rb
370
+ - test/processors/report_a_problem_inserter_test.rb
371
+ - test/processors/tag_mover_test.rb
372
+ - test/processors/metadata_inserter_test.rb