slimmer 3.17.0 → 3.18.0

data/lib/slimmer/headers.rb

@@ -5,10 +5,12 @@ module Slimmer
     HEADER_PREFIX = "X-Slimmer"
 
     SLIMMER_HEADER_MAPPING = {
+      application_name:     "Application-Name",
       beta:                 "Beta",
       campaign_notification:"Campaign-Notification",
       format:               "Format",
       need_id:              "Need-ID",
+      page_owner:           "Page-Owner",
       proposition:          "Proposition",
       organisations:        "Organisations",
       remove_meta_viewport: "Remove-Meta-Viewport",
@@ -18,11 +20,13 @@ module Slimmer
       template:             "Template",
     }
 
+    APPLICATION_NAME_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:application_name]}"
     ARTEFACT_HEADER = "#{HEADER_PREFIX}-Artefact"
     BETA_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:beta]}"
     CAMPAIGN_NOTIFICATION = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:campaign_notification]}"
     FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}"
     ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
+    PAGE_OWNER_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:page_owner]}"
     REMOVE_META_VIEWPORT = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_meta_viewport]}"
     RESULT_COUNT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:result_count]}"
     SEARCH_INDEX_HEADER = "#{HEADER_PREFIX}-Search-Index"

data/lib/slimmer/processors/report_a_problem_inserter.rb

@@ -2,9 +2,10 @@ module Slimmer::Processors
   class ReportAProblemInserter
     include ERB::Util
 
-    def initialize(skin, url)
+    def initialize(skin, url, headers)
       @skin = skin
       @request_url = url
+      @headers = headers
     end
 
     def filter(content_document, page_template)
@@ -15,6 +16,8 @@ module Slimmer::Processors
 
     def report_a_problem_block
       request_url = @request_url
+      source      = @headers[Slimmer::Headers::APPLICATION_NAME_HEADER]
+      page_owner  = @headers[Slimmer::Headers::PAGE_OWNER_HEADER]
       report_a_problem_template = @skin.template('report_a_problem.raw')
       html = ERB.new(report_a_problem_template).result(binding)
       Nokogiri::HTML.fragment(html)

data/lib/slimmer/skin.rb

@@ -127,7 +127,7 @@ module Slimmer
         Processors::SearchPathSetter.new(response),
         Processors::RelatedItemsInserter.new(self, artefact),
         Processors::LogoClassInserter.new(artefact),
-        Processors::ReportAProblemInserter.new(self, source_request.url),
+        Processors::ReportAProblemInserter.new(self, source_request.url, response.headers),
         Processors::SearchIndexSetter.new(response),
         Processors::MetaViewportRemover.new(response),
         Processors::CampaignNotificationInserter.new(self, response.headers),

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.17.0'
+  VERSION = '3.18.0'
 end

data/test/fixtures/report_a_problem.raw.html.erb

@@ -3,6 +3,8 @@
   <form accept-charset="UTF-8" action="/feedback" method="post">
     <div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"></div>
     <input id="url" name="url" type="hidden" value="<%= request_url %>">
+    <input id="url" name="source" type="hidden" value="<%= source %>">
+    <input id="url" name="page_owner" type="hidden" value="<%= page_owner %>">
     <label for="what_doing">
       What were you doing?
       <input id="what_doing" name="what_doing" type="text">

data/test/headers_test.rb

@@ -24,9 +24,14 @@ class HeadersTest < MiniTest::Unit::TestCase
     assert_equal "rhubarb", headers["X-Slimmer-Format"]
   end
 
-  def test_should_set_proposition_header
-    set_slimmer_headers proposition: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Proposition"]
+  def test_should_set_application_name_header
+    set_slimmer_headers application_name: "whitehall"
+    assert_equal "whitehall", headers["X-Slimmer-Application-Name"]
+  end
+
+  def test_should_set_page_owner_header
+    set_slimmer_headers page_owner: "bobby"
+    assert_equal "bobby", headers["X-Slimmer-Page-Owner"]
   end
 
   def test_should_set_organisations_header

data/test/processors/report_a_problem_inserter_test.rb

@@ -11,19 +11,21 @@ class ReportAProblemInserterTest < MiniTest::Unit::TestCase
   def test_should_add_report_a_problem_form_using_the_template_from_static
     @skin.expects(:template).with('report_a_problem.raw').returns(@report_a_problem_template)
 
-    template = as_nokogiri %{
-      <html>
-        <body">
-          <div id="wrapper">
-            <div id="report-a-problem"></div>
-          </div>
-        </body>
-      </html>
-    }
+    headers = { Slimmer::Headers::APPLICATION_NAME_HEADER => 'government' }
+    Slimmer::Processors::ReportAProblemInserter.new(@skin, "http://www.example.com/somewhere?foo=bar", headers).filter(:any_source, template)
 
-    Slimmer::Processors::ReportAProblemInserter.new(@skin, "http://www.example.com/somewhere?foo=bar").filter(:any_source, template)
     assert_in template, "#wrapper div.report-a-problem-container"
     assert_in template, "div.report-a-problem-container form input[name=url][value='http://www.example.com/somewhere?foo=bar']"
+    assert_in template, "div.report-a-problem-container form input[name=source][value='government']"
+  end
+
+  def test_should_add_page_owner_if_provided_in_headers
+    @skin.expects(:template).with('report_a_problem.raw').returns(@report_a_problem_template)
+    headers = { Slimmer::Headers::PAGE_OWNER_HEADER => 'hmrc' }
+    Slimmer::Processors::ReportAProblemInserter.new(@skin, "http://www.example.com/somewhere", headers).filter(:any_source, template)
+
+    assert_in template, "#wrapper div.report-a-problem-container"
+    assert_in template, "div.report-a-problem-container form input[name=page_owner][value='hmrc']"
   end
 
   def test_should_not_add_report_a_problem_form_if_wrapper_element_missing
@@ -38,7 +40,21 @@ class ReportAProblemInserterTest < MiniTest::Unit::TestCase
 
     @skin.expects(:template).never # Shouldn't fetch template when not inserting block
 
-    Slimmer::Processors::ReportAProblemInserter.new(@skin, "").filter(:any_source, template)
+    Slimmer::Processors::ReportAProblemInserter.new(@skin, "", {}).filter(:any_source, template)
     assert_not_in template, "div.report-a-problem-container"
   end
+
+  private
+
+  def template
+    @template ||= as_nokogiri %{
+      <html>
+        <body">
+          <div id="wrapper">
+            <div id="report-a-problem"></div>
+          </div>
+        </body>
+      </html>
+    }
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-18 00:00:00 Z
+date: 2013-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -117,9 +117,9 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "1.7"
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: *id010
@@ -181,60 +181,60 @@ files:
 - README.md
 - CHANGELOG.md
 - lib/tasks/slimmer.rake
-- lib/slimmer/version.rb
+- lib/slimmer.rb
+- lib/slimmer/skin.rb
+- lib/slimmer/railtie.rb
+- lib/slimmer/template.rb
+- lib/slimmer/test_template.rb
+- lib/slimmer/test.rb
+- lib/slimmer/app.rb
+- lib/slimmer/processors/logo_class_inserter.rb
+- lib/slimmer/processors/search_index_setter.rb
 - lib/slimmer/processors/body_class_copier.rb
+- lib/slimmer/processors/tag_mover.rb
+- lib/slimmer/processors/search_path_setter.rb
+- lib/slimmer/processors/title_inserter.rb
 - lib/slimmer/processors/google_analytics_configurator.rb
+- lib/slimmer/processors/navigation_mover.rb
+- lib/slimmer/processors/conditional_comment_mover.rb
 - lib/slimmer/processors/related_items_inserter.rb
+- lib/slimmer/processors/header_context_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/meta_viewport_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/search_path_setter.rb
-- lib/slimmer/processors/navigation_mover.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/artefact.rb
-- lib/slimmer/skin.rb
-- lib/slimmer/app.rb
+- lib/slimmer/processors/footer_remover.rb
 - lib/slimmer/headers.rb
-- lib/slimmer/test_template.rb
-- lib/slimmer.rb
+- lib/slimmer/version.rb
+- lib/slimmer/artefact.rb
 - Rakefile
-- 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/processors/navigation_mover_test.rb
-- test/processors/search_path_setter_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
 - test/headers_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/typical_usage_test.rb
+- test/artefact_test.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/campaign.html.erb
 - test/fixtures/500.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/proposition_menu.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/wrapper.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
+- test/skin_test.rb
+- test/processors/campaign_notification_inserter_test.rb
+- test/processors/meta_viewport_remover_test.rb
+- test/processors/logo_class_inserter_test.rb
+- test/processors/navigation_mover_test.rb
+- test/processors/search_index_setter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/report_a_problem_inserter_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/search_path_setter_test.rb
+- test/processors/section_inserter_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/typical_usage_test.rb
+- test/test_template_dependency_on_static_test.rb
 - test/test_helper.rb
 - bin/render_slimmer_error
 homepage: http://github.com/alphagov/slimmer
@@ -250,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4605535357493844384
+      hash: -4305673931480993366
       segments: 
       - 0
       version: "0"
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4605535357493844384
+      hash: -4305673931480993366
       segments: 
       - 0
       version: "0"
@@ -271,29 +271,29 @@ signing_key:
 specification_version: 3
 summary: Thinner than the skinner
 test_files: 
-- 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/processors/navigation_mover_test.rb
-- test/processors/search_path_setter_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
 - test/headers_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/typical_usage_test.rb
+- test/artefact_test.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/campaign.html.erb
 - test/fixtures/500.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/proposition_menu.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/wrapper.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
+- test/skin_test.rb
+- test/processors/campaign_notification_inserter_test.rb
+- test/processors/meta_viewport_remover_test.rb
+- test/processors/logo_class_inserter_test.rb
+- test/processors/navigation_mover_test.rb
+- test/processors/search_index_setter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/report_a_problem_inserter_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/search_path_setter_test.rb
+- test/processors/section_inserter_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/typical_usage_test.rb
+- test/test_template_dependency_on_static_test.rb
 - test/test_helper.rb