slimmer 3.9.4 → 3.9.5

data/README.md

@@ -8,7 +8,7 @@ various other details, such as meta, script, and style tags.
 ## Use in a Rails app
 
 Slimmer provides a Railtie so no configuration is necessary. By default it will use the
-Plek gem to look for the 'assets' host for the current environment.
+Plek gem to look for the 'static' (previously 'assets') host for the current environment.
 
 If you want to use your own set of templates you will need to specify the appropriate host
 eg.

data/lib/slimmer.rb

@@ -25,7 +25,6 @@ module Slimmer
   autoload :Artefact, 'slimmer/artefact'
 
   module Processors
-    autoload :AdminTitleInserter, 'slimmer/processors/admin_title_inserter'
     autoload :BodyClassCopier, 'slimmer/processors/body_class_copier'
     autoload :BodyInserter, 'slimmer/processors/body_inserter'
     autoload :ConditionalCommentMover, 'slimmer/processors/conditional_comment_mover'
@@ -38,7 +37,6 @@ module Slimmer
     autoload :RelatedItemsInserter, 'slimmer/processors/related_items_inserter'
     autoload :ReportAProblemInserter, 'slimmer/processors/report_a_problem_inserter'
     autoload :SearchIndexSetter, 'slimmer/processors/search_index_setter'
-    autoload :SearchPathSetter, 'slimmer/processors/search_path_setter'
     autoload :SectionInserter, 'slimmer/processors/section_inserter'
     autoload :TagMover, 'slimmer/processors/tag_mover'
     autoload :TitleInserter, 'slimmer/processors/title_inserter'

data/lib/slimmer/app.rb

@@ -23,7 +23,7 @@ module Slimmer
       end
 
       unless options[:asset_host]
-        options[:asset_host] = Plek.current.find("assets")
+        options[:asset_host] = Plek.current.find("static")
       end
 
       @skin = Skin.new options.merge(logger: self.logger)
@@ -83,11 +83,7 @@ module Slimmer
 
       rewritten_body = case response.status
       when 200
-        if response.headers[Headers::TEMPLATE_HEADER] == 'admin' || request.path =~ /^\/admin(\/|$)/
-          @skin.admin s(response.body)
-        else
-          @skin.success request, response, s(response.body)
-        end
+        @skin.success request, response, s(response.body)
       when 404
         @skin.error '404', s(response.body)
       else

data/lib/slimmer/headers.rb

@@ -24,7 +24,6 @@ module Slimmer
     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

@@ -112,18 +112,6 @@ module Slimmer
       dest.to_html.sub(/<noscript rel=("|')placeholder("|')>/, "")
     end
 
-    def admin(body)
-      processors = [
-        Processors::TitleInserter.new(),
-        Processors::TagMover.new(),
-        Processors::AdminTitleInserter.new,
-        Processors::FooterRemover.new,
-        Processors::BodyInserter.new(),
-        Processors::BodyClassCopier.new,
-      ]
-      process(processors, body, template('admin'))
-    end
-
     def success(source_request, response, body)
       artefact = artefact_from_header(response)
       processors = [
@@ -135,7 +123,6 @@ module Slimmer
         Processors::HeaderContextInserter.new(),
         Processors::SectionInserter.new(artefact),
         Processors::GoogleAnalyticsConfigurator.new(response, artefact),
-        Processors::SearchPathSetter.new(response),
         Processors::RelatedItemsInserter.new(self, artefact),
         Processors::LogoClassInserter.new(artefact),
         Processors::ReportAProblemInserter.new(self, source_request.url),

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.9.4'
+  VERSION = '3.9.5'
 end

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.9.4
+  version: 3.9.5
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-14 00:00:00 Z
+date: 2012-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -128,9 +128,9 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: *id011
@@ -180,58 +180,55 @@ 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/meta_viewport_remover.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/admin_title_inserter.rb
-- lib/slimmer/processors/search_path_setter.rb
+- lib/slimmer/processors/body_class_copier.rb
+- lib/slimmer/processors/tag_mover.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/report_a_problem_inserter.rb
+- lib/slimmer/processors/meta_viewport_remover.rb
+- lib/slimmer/processors/campaign_notification_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/processors/search_index_setter_test.rb
-- test/processors/meta_viewport_remover_test.rb
-- test/processors/report_a_problem_inserter_test.rb
-- test/processors/section_inserter_test.rb
-- test/processors/campaign_notification_inserter_test.rb
-- test/processors/search_path_setter_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/artefact_test.rb
-- test/skin_test.rb
+- test/fixtures/related.raw.html.erb
 - test/fixtures/campaign.html.erb
-- test/fixtures/404.html.erb
 - test/fixtures/500.html.erb
+- test/fixtures/404.html.erb
 - test/fixtures/wrapper.html.erb
-- test/fixtures/related.raw.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/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/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
 licenses: []
@@ -246,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4061718624435070501
+      hash: 273902023069852675
       segments: 
       - 0
       version: "0"
@@ -255,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4061718624435070501
+      hash: 273902023069852675
       segments: 
       - 0
       version: "0"
@@ -267,26 +264,25 @@ 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/report_a_problem_inserter_test.rb
-- test/processors/section_inserter_test.rb
-- test/processors/campaign_notification_inserter_test.rb
-- test/processors/search_path_setter_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/artefact_test.rb
-- test/skin_test.rb
+- test/fixtures/related.raw.html.erb
 - test/fixtures/campaign.html.erb
-- test/fixtures/404.html.erb
 - test/fixtures/500.html.erb
+- test/fixtures/404.html.erb
 - test/fixtures/wrapper.html.erb
-- test/fixtures/related.raw.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/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/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

data/lib/slimmer/processors/admin_title_inserter.rb

@@ -1,12 +0,0 @@
-module Slimmer::Processors
-  class AdminTitleInserter
-    def filter(src,dest)
-      title = src.at_css('#site-title')
-      head  = dest.at_css('.gds-header h2')
-      if head && title
-        head.content = title.content
-        title.remove
-      end
-    end
-  end
-end

data/lib/slimmer/processors/search_path_setter.rb

@@ -1,17 +0,0 @@
-module Slimmer::Processors
-  class SearchPathSetter
-    def initialize(response)
-      @response = response
-    end
-
-    def filter(content_document, page_template)
-      if search_scope && page_template.at_css('form#search')
-        page_template.at_css('form#search').attributes["action"].value = search_scope
-      end
-    end
-
-    def search_scope
-      @response.headers[Slimmer::Headers::SEARCH_PATH_HEADER]
-    end
-  end
-end

data/test/processors/search_path_setter_test.rb

@@ -1,39 +0,0 @@
-require "test_helper"
-
-module SearchPathSetterTest
-
-  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-Path" => "/specialist/search",
-    }
-
-    given_response 200, DOCUMENT_WITH_SEARCH, headers
-
-    def test_should_rewrite_search_action
-      search_action = Nokogiri::HTML.parse(last_response.body).at_css('#search')["action"]
-      assert_equal "/specialist/search", search_action
-    end
-  end
-
-  class WithoutHeaderTest < SlimmerIntegrationTest
-    given_response 200, DOCUMENT_WITH_SEARCH, {}
-
-    def test_should_leave_original_search_action
-      search_action = Nokogiri::HTML.parse(last_response.body).at_css('#search')["action"]
-      assert_equal "/path/to/search", search_action
-    end
-  end
-end