slimmer 9.0.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cccb8e264581553257ae79c647ddf59080300f07
-  data.tar.gz: a111c190cd49364c2c9c87f97414571accfb9419
+  metadata.gz: 75ed5125f21b8ffde308600b2d649d12e45a5166
+  data.tar.gz: 8a689fb2a310302d865d56dc9b666613360967e8
 SHA512:
-  metadata.gz: cc63baa7960746171715ebc691a126d20a0d6927ac4bc3ed4beec1dfbda646e035f5bce969bb2f991677d4aa73c7ee69ad98019f0861ea849af6b3c7bf14d019
-  data.tar.gz: e8a1f0cd314d184edb5a811d8e50ca6cd5c4cd8a97ffb87cc52cc96c09553e211c4be2496ac571de016355b9cdef1297f495f3385c73795a8f84434f5a910a8a
+  metadata.gz: da744e5afa6a84e8944a05cc20ee2e5da214c1a7af671f4190e1db67e1a34d7a9e5f550c68edd3f912fecb8cc038acd515b7282ec337cde60786eda2128a9a91
+  data.tar.gz: 24170d05c56821d21052a40aa17899ba27fbefb1e34248cb4b1193d43a10567a689bcad2ad76f60ee869c0cb6cecc5bf5885c13c76344c7aebcfe4cba08467ad

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 9.1.0
+
+* Allow applications to request components using full or partial component
+  paths, eg "name", "name.raw" and "name.raw.html.erb". This allows
+  components to be nested within other components.
+
 # 9.0.1
 
 * Change the find_templates method signature to add an optional arg that

data/lib/slimmer/component_resolver.rb

@@ -56,7 +56,8 @@ module Slimmer
     end
 
     def template_url(template_path)
-      [static_host, "templates", "#{template_path}.raw.html.erb"].join('/')
+      path = template_path.sub(/\.raw(\.html\.erb)?$/, '')
+      [static_host, "templates", "#{path}.raw.html.erb"].join('/')
     end
 
     def static_host

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '9.0.1'
+  VERSION = '9.1.0'
 end

data/test/component_resolver_test.rb

@@ -11,12 +11,15 @@ describe Slimmer::ComponentResolver do
     end
 
     it "should request a valid template from the server" do
-      expected_url = "http://static.dev.gov.uk/templates/govuk_component/name.raw.html.erb"
-      stub_request(:get, expected_url).to_return :body => "<foo />"
+      assert_valid_template_requested('name', 'name.raw.html.erb')
+    end
 
-      templates = @resolver.find_templates('name', 'govuk_component', false, {}, false)
-      assert_requested :get, expected_url
-      assert_equal '<foo />', templates.first.args[0]
+    it "should request a valid template from the server when a raw template is requested" do
+      assert_valid_template_requested('name.raw', 'name.raw.html.erb')
+    end
+
+    it "should request a valid template from the server when the full template filename is requested" do
+      assert_valid_template_requested('name.raw.html.erb', 'name.raw.html.erb')
     end
 
     it "should return a known template in test mode" do
@@ -26,4 +29,13 @@ describe Slimmer::ComponentResolver do
       assert_match /<test-govuk-component data-template="govuk_component-name">/, templates.first.args[0]
     end
   end
+
+  def assert_valid_template_requested(requested, expected)
+    expected_url = "http://static.dev.gov.uk/templates/govuk_component/#{expected}"
+    stub_request(:get, expected_url).to_return body: "<foo />"
+
+    templates = @resolver.find_templates(requested, 'govuk_component', false, {}, false)
+    assert_requested :get, expected_url
+    assert_equal '<foo />', templates.first.args[0]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -341,32 +341,32 @@ signing_key:
 specification_version: 4
 summary: Thinner than the skinner
 test_files:
-- test/headers_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/search_path_setter_test.rb
-- test/processors/navigation_mover_test.rb
-- test/processors/report_a_problem_inserter_test.rb
-- test/processors/tag_mover_test.rb
-- test/processors/search_parameter_inserter_test.rb
-- test/processors/related_items_inserter_test.rb
-- test/processors/search_remover_test.rb
-- test/processors/metadata_inserter_test.rb
-- test/processors/header_context_inserter_test.rb
-- test/processors/meta_viewport_remover_test.rb
-- test/processors/section_inserter_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/test_helper.rb
+- test/component_resolver_test.rb
+- test/changelog_test.rb
+- test/test_helpers/shared_templates_test.rb
 - test/typical_usage_test.rb
-- test/artefact_test.rb
 - test/skin_test.rb
-- test/component_resolver_test.rb
-- test/fixtures/core_layout.html.erb
-- test/fixtures/report_a_problem.raw.html.erb
+- test/artefact_test.rb
+- test/fixtures/500.html.erb
+- test/fixtures/proposition_menu.html.erb
 - test/fixtures/410.html.erb
+- test/fixtures/core_layout.html.erb
 - test/fixtures/404.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
 - test/fixtures/related.raw.html.erb
-- test/fixtures/500.html.erb
-- test/fixtures/proposition_menu.html.erb
-- test/test_helpers/shared_templates_test.rb
+- test/headers_test.rb
+- test/test_template_dependency_on_static_test.rb
 - test/cache_test.rb
-- test/changelog_test.rb
+- test/test_helper.rb
+- test/processors/header_context_inserter_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/navigation_mover_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/search_path_setter_test.rb
+- test/processors/meta_viewport_remover_test.rb
+- test/processors/search_parameter_inserter_test.rb
+- test/processors/search_remover_test.rb
+- test/processors/section_inserter_test.rb
+- test/processors/report_a_problem_inserter_test.rb
+- test/processors/tag_mover_test.rb
+- test/processors/metadata_inserter_test.rb