slimmer 3.6.0 → 3.6.1

data/lib/slimmer/processors/search_index_setter.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Slimmer::Processors
   include ERB::Util
 
@@ -7,20 +9,21 @@ module Slimmer::Processors
     end
 
     def filter(content_document, page_template)
-      if search_index && page_template.at_css('form#search')
-        page_template.at_css('form#search') << hidden_input_element
+      if search_index && (form = page_template.at_css('form#search'))
+        uri = URI(form['action'])
+        uri.fragment = search_index_fragment
+        form['action'] = uri.to_s
       end
     end
 
     private
 
-    def search_index
-      @response.headers[Slimmer::Headers::SEARCH_INDEX_HEADER]
+    def search_index_fragment
+      "#{search_index}-results"
     end
 
-    def hidden_input_element
-      html = ERB.new('<input type="hidden" name="search-index" value="<%= search_index %>">').result(binding)
-      Nokogiri::HTML.fragment(html)
+    def search_index
+      @response.headers[Slimmer::Headers::SEARCH_INDEX_HEADER]
     end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 end

data/test/processors/search_index_setter_test.rb

@@ -23,8 +23,8 @@ module SearchIndexSetterTest
     given_response 200, DOCUMENT_WITH_SEARCH, headers
 
     def test_should_insert_index_field
-      search_index = Nokogiri::HTML.parse(last_response.body).at_css('#search input[name=search-index]')['value']
-      assert_equal "government", search_index
+      search_action = Nokogiri::HTML.parse(last_response.body).at_css('#search')['action']
+      assert_equal "/path/to/search#government-results", search_action
     end
   end
 
@@ -32,8 +32,7 @@ module SearchIndexSetterTest
     given_response 200, DOCUMENT_WITH_SEARCH, {}
 
     def test_should_not_insert_index_field
-      search_index = Nokogiri::HTML.parse(last_response.body).at_css('#search input[name=search-index]')
-      assert_equal nil, search_index
+      assert_equal Nokogiri::HTML.parse(last_response.body).at_css('#search')['action'], '/path/to/search'
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-28 00:00:00 Z
+date: 2012-10-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -180,53 +180,53 @@ 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/skin.rb
 - lib/slimmer/railtie.rb
-- lib/slimmer/processors/tag_mover.rb
-- lib/slimmer/processors/body_class_copier.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/header_context_inserter.rb
 - lib/slimmer/processors/search_index_setter.rb
-- lib/slimmer/processors/report_a_problem_inserter.rb
-- lib/slimmer/processors/footer_remover.rb
-- lib/slimmer/processors/google_analytics_configurator.rb
-- lib/slimmer/processors/admin_title_inserter.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/related_items_inserter.rb
-- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/google_analytics_configurator.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/artefact.rb
-- lib/slimmer/skin.rb
+- lib/slimmer/processors/admin_title_inserter.rb
+- lib/slimmer/processors/report_a_problem_inserter.rb
+- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/footer_remover.rb
 - lib/slimmer/headers.rb
-- lib/slimmer/template.rb
-- lib/slimmer/test.rb
-- lib/tasks/slimmer.rake
+- lib/slimmer/version.rb
+- lib/slimmer/artefact.rb
 - Rakefile
-- test/processors/header_context_inserter_test.rb
-- test/processors/google_analytics_test.rb
-- test/processors/body_inserter_test.rb
+- test/headers_test.rb
+- test/artefact_test.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/500.html.erb
+- test/fixtures/404.html.erb
+- test/fixtures/wrapper.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
+- test/skin_test.rb
+- test/processors/logo_class_inserter_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/section_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/logo_class_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/typical_usage_test.rb
 - test/test_template_dependency_on_static_test.rb
-- test/headers_test.rb
 - test/test_helper.rb
-- test/typical_usage_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
-- test/fixtures/404.html.erb
-- test/fixtures/500.html.erb
-- test/fixtures/wrapper.html.erb
-- 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: []
@@ -241,7 +241,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2398001210038307961
+      hash: 4260756547194608291
       segments: 
       - 0
       version: "0"
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2398001210038307961
+      hash: 4260756547194608291
       segments: 
       - 0
       version: "0"
@@ -262,23 +262,23 @@ 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/headers_test.rb
+- test/artefact_test.rb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/500.html.erb
+- test/fixtures/404.html.erb
+- test/fixtures/wrapper.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
+- test/skin_test.rb
+- test/processors/logo_class_inserter_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/section_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/logo_class_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/typical_usage_test.rb
 - test/test_template_dependency_on_static_test.rb
-- test/headers_test.rb
 - test/test_helper.rb
-- test/typical_usage_test.rb
-- test/artefact_test.rb
-- test/skin_test.rb
-- test/fixtures/404.html.erb
-- test/fixtures/500.html.erb
-- test/fixtures/wrapper.html.erb
-- test/fixtures/related.raw.html.erb
-- test/fixtures/report_a_problem.raw.html.erb