slimmer 3.13.0 → 3.13.1

data/lib/slimmer/headers.rb

@@ -43,24 +43,25 @@ module Slimmer
       elsif artefact_input.respond_to?(:to_hash)
         artefact = artefact_input.to_hash
       end
+      yield artefact if block_given?
       headers[ARTEFACT_HEADER] = artefact.to_json
     end
 
     def set_slimmer_artefact_overriding_section(artefact_input, details = {})
-      if tag = slimmer_section_tag_for_details(details)
-        artefact_input = artefact_input.dup
-        artefact_input["tags"] = [tag] + (artefact_input["tags"] || [])
+      set_slimmer_artefact(artefact_input) do |artefact|
+        if tag = slimmer_section_tag_for_details(details)
+          artefact["tags"] = [tag] + (artefact["tags"] || [])
+        end
       end
-      set_slimmer_artefact(artefact_input)
     end
 
     def set_slimmer_dummy_artefact(details = {})
-      artefact = {}
-      artefact["title"] = details[:title] if details[:title]
-      if tag = slimmer_section_tag_for_details(details)
-        artefact["tags"] = [tag]
+      set_slimmer_artefact({}) do |artefact|
+        artefact["title"] = details[:title] if details[:title]
+        if tag = slimmer_section_tag_for_details(details)
+          artefact["tags"] = [tag]
+        end
       end
-      set_slimmer_artefact(artefact)
     end
 
     def slimmer_section_tag_for_details(details)

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.13.0'
+  VERSION = '3.13.1'
 end

data/test/headers_test.rb

@@ -117,8 +117,8 @@ describe Slimmer::Headers do
 
   describe "setting the artefact and adding a dummy section" do
     it "should setup a section tag for the given name and link" do
-      artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
-      self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/something/foo")
+      artefact_input = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
+      self.set_slimmer_artefact_overriding_section(artefact_input, :section_name => "Foo", :section_link => "/something/foo")
 
       artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
 
@@ -128,8 +128,8 @@ describe Slimmer::Headers do
     end
 
     it "should not overwrite existing tags" do
-      artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions", "tags" => ["foo", "bar"]}
-      self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/something/foo")
+      artefact_input = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions", "tags" => ["foo", "bar"]}
+      self.set_slimmer_artefact_overriding_section(artefact_input, :section_name => "Foo", :section_link => "/something/foo")
 
       artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
 
@@ -137,10 +137,22 @@ describe Slimmer::Headers do
     end
 
     it "should not have side-effects on the passed in hash" do
-      artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
-      artefact_copy = artefact.dup
-      self.set_slimmer_artefact_overriding_section(artefact, :section_name => "Foo", :section_link => "/foo")
-      assert_equal artefact_copy, artefact
+      artefact_input = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
+      artefact_copy = artefact_input.dup
+      self.set_slimmer_artefact_overriding_section(artefact_input, :section_name => "Foo", :section_link => "/foo")
+      assert_equal artefact_copy, artefact_input
+    end
+
+    it "should work correctly with a gds_api response object" do
+      input_artefact = {"foo" => "bar", "slug" => "vat-rates", "actions" => "some_actions"}
+      api_response = GdsApi::Response.new(stub("HTTP Response", :code => 200, :body => input_artefact.to_json))
+      self.set_slimmer_artefact_overriding_section(api_response, :section_name => "Foo", :section_link => "/something/foo")
+
+      artefact = JSON.parse(headers[Slimmer::Headers::ARTEFACT_HEADER])
+
+      assert_equal "Foo", artefact["tags"][0]["title"]
+      assert_equal "section", artefact["tags"][0]["details"]["type"]
+      assert_equal "/something/foo", artefact["tags"][0]["content_with_tag"]["web_url"]
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -180,57 +180,57 @@ extra_rdoc_files: []
 files: 
 - README.md
 - CHANGELOG.md
-- lib/tasks/slimmer.rake
+- lib/slimmer.rb
+- lib/slimmer/app.rb
+- lib/slimmer/test_template.rb
 - lib/slimmer/version.rb
+- lib/slimmer/railtie.rb
+- lib/slimmer/processors/tag_mover.rb
 - lib/slimmer/processors/body_class_copier.rb
-- lib/slimmer/processors/google_analytics_configurator.rb
-- lib/slimmer/processors/related_items_inserter.rb
-- lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/processors/logo_class_inserter.rb
-- lib/slimmer/processors/report_a_problem_inserter.rb
-- lib/slimmer/processors/footer_remover.rb
-- lib/slimmer/processors/campaign_notification_inserter.rb
-- lib/slimmer/processors/conditional_comment_mover.rb
 - lib/slimmer/processors/beta_notice_inserter.rb
-- lib/slimmer/processors/section_inserter.rb
-- lib/slimmer/processors/tag_mover.rb
-- lib/slimmer/processors/title_inserter.rb
-- lib/slimmer/processors/search_index_setter.rb
 - lib/slimmer/processors/header_context_inserter.rb
 - lib/slimmer/processors/meta_viewport_remover.rb
-- lib/slimmer/template.rb
-- lib/slimmer/railtie.rb
-- lib/slimmer/test.rb
+- lib/slimmer/processors/search_index_setter.rb
+- lib/slimmer/processors/report_a_problem_inserter.rb
+- lib/slimmer/processors/campaign_notification_inserter.rb
+- lib/slimmer/processors/footer_remover.rb
+- lib/slimmer/processors/google_analytics_configurator.rb
+- lib/slimmer/processors/title_inserter.rb
+- lib/slimmer/processors/related_items_inserter.rb
+- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/conditional_comment_mover.rb
+- lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/artefact.rb
 - lib/slimmer/skin.rb
-- lib/slimmer/app.rb
 - lib/slimmer/headers.rb
-- lib/slimmer/test_template.rb
-- lib/slimmer.rb
+- lib/slimmer/template.rb
+- lib/slimmer/test.rb
+- lib/tasks/slimmer.rake
 - Rakefile
+- test/processors/header_context_inserter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/search_index_setter_test.rb
 - test/processors/meta_viewport_remover_test.rb
-- test/processors/related_items_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
 - test/processors/section_inserter_test.rb
-- test/processors/google_analytics_test.rb
-- test/processors/search_index_setter_test.rb
-- test/processors/header_context_inserter_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/logo_class_inserter_test.rb
 - test/processors/campaign_notification_inserter_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
-- test/headers_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/logo_class_inserter_test.rb
 - test/test_template_dependency_on_static_test.rb
+- test/headers_test.rb
+- test/test_helper.rb
 - test/typical_usage_test.rb
-- test/fixtures/500.html.erb
+- test/artefact_test.rb
+- test/skin_test.rb
+- test/fixtures/campaign.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/beta_notice.html.erb
-- test/fixtures/report_a_problem.raw.html.erb
-- test/fixtures/campaign.html.erb
-- test/fixtures/related.raw.html.erb
+- test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
-- test/test_helper.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
 - bin/render_slimmer_error
 homepage: http://github.com/alphagov/slimmer
 licenses: []
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2926130443012514444
+      hash: -2221718135592804125
       segments: 
       - 0
       version: "0"
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2926130443012514444
+      hash: -2221718135592804125
       segments: 
       - 0
       version: "0"
@@ -266,26 +266,26 @@ signing_key:
 specification_version: 3
 summary: Thinner than the skinner
 test_files: 
+- test/processors/header_context_inserter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/search_index_setter_test.rb
 - test/processors/meta_viewport_remover_test.rb
-- test/processors/related_items_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
 - test/processors/section_inserter_test.rb
-- test/processors/google_analytics_test.rb
-- test/processors/search_index_setter_test.rb
-- test/processors/header_context_inserter_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/logo_class_inserter_test.rb
 - test/processors/campaign_notification_inserter_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
-- test/headers_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/logo_class_inserter_test.rb
 - test/test_template_dependency_on_static_test.rb
+- test/headers_test.rb
+- test/test_helper.rb
 - test/typical_usage_test.rb
-- test/fixtures/500.html.erb
+- test/artefact_test.rb
+- test/skin_test.rb
+- test/fixtures/campaign.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/beta_notice.html.erb
-- test/fixtures/report_a_problem.raw.html.erb
-- test/fixtures/campaign.html.erb
-- test/fixtures/related.raw.html.erb
+- test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
-- test/test_helper.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/report_a_problem.raw.html.erb