slimmer 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 361c0fd71af9a4a6397baa789bf4a507c46ca742
-  data.tar.gz: fc1f266dc3dd608f544f959747f1a7b37c975d77
+  metadata.gz: cccb8e264581553257ae79c647ddf59080300f07
+  data.tar.gz: a111c190cd49364c2c9c87f97414571accfb9419
 SHA512:
-  metadata.gz: b308845c4566a6d6d010929ef50695182437d52fb6cbe270c8e7972f0bd1f524591b5d1f091a1cb1714473cabc631a4f1f824ec18235b06b059d02d17f38b2bb
-  data.tar.gz: 3186905e90ce23d219c1dd0b4009a43e23c8e896b136fbe7db35294119f202b579c6a541a2c7f41082da07ed602f4ba985f6ade60332c7b3b3c91a49875c8058
+  metadata.gz: cc63baa7960746171715ebc691a126d20a0d6927ac4bc3ed4beec1dfbda646e035f5bce969bb2f991677d4aa73c7ee69ad98019f0861ea849af6b3c7bf14d019
+  data.tar.gz: e8a1f0cd314d184edb5a811d8e50ca6cd5c4cd8a97ffb87cc52cc96c09553e211c4be2496ac571de016355b9cdef1297f495f3385c73795a8f84434f5a910a8a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 9.0.1
+
+* Change the find_templates method signature to add an optional arg that
+  Rails now calls after CVE-2016-0752. No functionality changes.
+
 # 9.0.0
 
 * Change default template to `core_layout` from `wrapper`.

data/lib/slimmer/component_resolver.rb

@@ -11,7 +11,7 @@ module Slimmer
       false
     end
 
-    def find_templates(name, prefix, partial, details)
+    def find_templates(name, prefix, partial, details, outside_app_allowed = false)
       return [] unless prefix == 'govuk_component'
       cache = Cache.instance
 

data/lib/slimmer/version.rb

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

data/test/component_resolver_test.rb

@@ -7,14 +7,14 @@ describe Slimmer::ComponentResolver do
     end
 
     it "should return nothing if the prefix doesn't match 'govuk_component'" do
-      assert_equal [], @resolver.find_templates('name', 'prefix', false, {})
+      assert_equal [], @resolver.find_templates('name', 'prefix', false, {}, false)
     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 />"
 
-      templates = @resolver.find_templates('name', 'govuk_component', false, {})
+      templates = @resolver.find_templates('name', 'govuk_component', false, {}, false)
       assert_requested :get, expected_url
       assert_equal '<foo />', templates.first.args[0]
     end
@@ -22,7 +22,7 @@ describe Slimmer::ComponentResolver do
     it "should return a known template in test mode" do
       @resolver.expects(:test?).returns(true)
 
-      templates = @resolver.find_templates('name', 'govuk_component', false, {})
+      templates = @resolver.find_templates('name', 'govuk_component', false, {}, false)
       assert_match /<test-govuk-component data-template="govuk_component-name">/, 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.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -185,20 +185,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.18.0
-- !ruby/object:Gem::Dependency
-  name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -247,14 +233,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.5.1
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -355,32 +341,32 @@ signing_key:
 specification_version: 4
 summary: Thinner than the skinner
 test_files:
-- test/component_resolver_test.rb
-- test/changelog_test.rb
-- test/test_helpers/shared_templates_test.rb
-- test/typical_usage_test.rb
-- test/skin_test.rb
-- 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/headers_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/cache_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/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/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/fixtures/410.html.erb
+- test/fixtures/404.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/cache_test.rb
+- test/changelog_test.rb