slimmer 3.29.0 → 4.0.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.0.0
+
+* Remove search-index header as there are no longer tabs on search
+
 # 3.29.0
 
 * Send processor exceptions to errbit via Airbrake gem if present

data/lib/slimmer.rb

@@ -1,5 +1,5 @@
        #.....................................................
-   #"""""" Look, Gradiented-Rounded corners....  It's 3.0 """""
+   #"""""" Look, Gradiented-Rounded corners....           """""
  #////////////////////////////////////////////////////////////////
 ###################################################################
 

data/lib/slimmer/headers.rb

@@ -30,7 +30,6 @@ module Slimmer
     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"
     SEARCH_PATH_HEADER = "#{HEADER_PREFIX}-Search-Path"
     SKIP_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:skip]}"
     TEMPLATE_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:template]}"

data/lib/slimmer/skin.rb

@@ -129,7 +129,6 @@ module Slimmer
         Processors::RelatedItemsInserter.new(self, artefact),
         Processors::LogoClassInserter.new(artefact),
         Processors::ReportAProblemInserter.new(self, source_request.url, response.headers),
-        Processors::SearchIndexSetter.new(response),
         Processors::MetaViewportRemover.new(response),
         Processors::BetaNoticeInserter.new(self, response.headers),
         Processors::BetaLabelInserter.new(self, response.headers)

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.29.0'
+  VERSION = '4.0.0'
 end

data/test/test_helper.rb

@@ -8,8 +8,6 @@ require 'mocha'
 require 'timecop'
 require 'gds_api/test_helpers/content_api'
 
-ENV['FACTER_govuk_platform'] = 'test'
-
 class MiniTest::Unit::TestCase
   def as_nokogiri(html_string)
     Nokogiri::HTML.parse(html_string.strip)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 3.29.0
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -287,7 +287,6 @@ files:
 - lib/slimmer/processors/beta_label_inserter.rb
 - lib/slimmer/processors/report_a_problem_inserter.rb
 - lib/slimmer/processors/title_inserter.rb
-- lib/slimmer/processors/search_index_setter.rb
 - lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/processors/footer_remover.rb
 - lib/slimmer/processors/beta_notice_inserter.rb
@@ -313,7 +312,6 @@ files:
 - test/headers_test.rb
 - test/test_template_dependency_on_static_test.rb
 - test/test_helper.rb
-- test/processors/search_index_setter_test.rb
 - test/processors/header_context_inserter_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/navigation_mover_test.rb
@@ -341,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4427512240627220463
+      hash: -2385505635737276457
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -350,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4427512240627220463
+      hash: -2385505635737276457
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.23
@@ -374,7 +372,6 @@ test_files:
 - test/headers_test.rb
 - test/test_template_dependency_on_static_test.rb
 - test/test_helper.rb
-- test/processors/search_index_setter_test.rb
 - test/processors/header_context_inserter_test.rb
 - test/processors/body_inserter_test.rb
 - test/processors/navigation_mover_test.rb

data/lib/slimmer/processors/search_index_setter.rb

@@ -1,32 +0,0 @@
-require 'uri'
-
-module Slimmer::Processors
-  include ERB::Util
-
-  class SearchIndexSetter
-    def initialize(response)
-      @response = response
-    end
-
-    def filter(content_document, page_template)
-      if search_index && (form = page_template.at_css('form#search'))
-        input_html = Nokogiri::HTML.fragment(tab_input_tag)
-        form.add_child(input_html)
-      end
-    end
-
-    private
-
-    def tab_input_tag
-      %Q{<input type="hidden" name="tab" value="#{search_index_tab}">}
-    end
-
-    def search_index_tab
-      "#{search_index}-results"
-    end
-
-    def search_index
-      @response.headers[Slimmer::Headers::SEARCH_INDEX_HEADER]
-    end
-  end
-end

data/test/processors/search_index_setter_test.rb

@@ -1,39 +0,0 @@
-require "test_helper"
-
-module SearchIndexSetterTest
-
-  DOCUMENT_WITH_SEARCH = <<-END
-    <html>
-      <head>
-      </head>
-      <body class="body_class">
-        <div id="wrapper">
-          <form id="search" action="/path/to/search">
-          </form>
-        </div>
-      </body>
-    </html>
-  END
-
-  class WithHeaderTest < SlimmerIntegrationTest
-    headers = {
-      "X-Slimmer-Search-Index" => "government",
-    }
-
-    given_response 200, DOCUMENT_WITH_SEARCH, headers
-
-    def test_should_insert_index_field
-      search_tab_field = Nokogiri::HTML.parse(last_response.body).at_css('input')['value']
-      assert_equal "government-results", search_tab_field
-    end
-  end
-
-  class WithoutHeaderTest < SlimmerIntegrationTest
-    given_response 200, DOCUMENT_WITH_SEARCH, {}
-
-    def test_should_not_insert_index_field
-      search_tab_field = Nokogiri::HTML.parse(last_response.body).css('input')
-      assert_equal 0, search_tab_field.length
-    end
-  end
-end