slimmer 6.0.0 → 7.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9764cb7281a906d7133016e1d48fc732a2d5ad50
+  data.tar.gz: 7020a355e1246293785e8a0be2f92d03a31e02b3
+SHA512:
+  metadata.gz: bb99ec91c22a9e76db811c330b8466ba2f5217915f770045c14a48028d7533bc8d365cf8b23b85e27dbbceea55a1a2b310369a670579aa9becdadd5960afcd0a
+  data.tar.gz: 88920a6e6fe1d6ebda6f43870e1e09dd7b9e06ac979843c6d6247fc1e3261e03e1aa467fefc2d5d3f7724c2c93e8e62d2c85ed277203834153f4a8c95132af75

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 7.0.0
+
+* Remove AlphaLabelInserter, BetaNoticeInserter, BetaLabelInserter. These are
+  now better handled by govuk_components
+* Remove LogoClassInserter. BusinessLink and DirectGov branding is being
+  removed so we don't need to insert their logos
+* Loosen Nokogiri dependency. Rails 4.2 needs Nokogiri 1.6.0 and above.
+
 # 6.0.0
 
 * Change ComponentResolver to use a bespoke tag - `test-govuk-component` - when
@@ -15,7 +23,7 @@
 # 5.0.1
 
 * Fix MetaViewportRemover to not raise an exception if there is no meta
-  viewport tag. Issue became apparent in 4.3.1. 
+  viewport tag. Issue became apparent in 4.3.1.
 
 # 5.0.0
 

data/lib/slimmer.rb

@@ -22,16 +22,12 @@ module Slimmer
   autoload :ComponentResolver, 'slimmer/component_resolver'
 
   module Processors
-    autoload :AlphaLabelInserter, 'slimmer/processors/alpha_label_inserter'
-    autoload :BetaNoticeInserter, 'slimmer/processors/beta_notice_inserter'
-    autoload :BetaLabelInserter, 'slimmer/processors/beta_label_inserter'
     autoload :BodyClassCopier, 'slimmer/processors/body_class_copier'
     autoload :BodyInserter, 'slimmer/processors/body_inserter'
     autoload :ConditionalCommentMover, 'slimmer/processors/conditional_comment_mover'
     autoload :FooterRemover, 'slimmer/processors/footer_remover'
     autoload :GoogleAnalyticsConfigurator, 'slimmer/processors/google_analytics_configurator'
     autoload :HeaderContextInserter, 'slimmer/processors/header_context_inserter'
-    autoload :LogoClassInserter, 'slimmer/processors/logo_class_inserter'
     autoload :NavigationMover, 'slimmer/processors/navigation_mover'
     autoload :MetaViewportRemover, 'slimmer/processors/meta_viewport_remover'
     autoload :RelatedItemsInserter, 'slimmer/processors/related_items_inserter'

data/lib/slimmer/artefact.rb

@@ -26,12 +26,6 @@ class Slimmer::Artefact
     section
   end
 
-  def legacy_sources
-    tags_of_type('legacy_source').map do |t|
-      id_to_slug(t["id"])
-    end
-  end
-
   def related_artefacts
     return [] unless self.related
     self.related.map do |r|

data/lib/slimmer/headers.rb

@@ -5,10 +5,7 @@ module Slimmer
     HEADER_PREFIX = "X-Slimmer"
 
     SLIMMER_HEADER_MAPPING = {
-      alpha_label:          "Alpha-Label",
       application_name:     "Application-Name",
-      beta:                 "Beta",
-      beta_label:           "Beta-Label",
       format:               "Format",
       page_owner:           "Page-Owner",
       proposition:          "Proposition",
@@ -23,11 +20,8 @@ module Slimmer
       template:             "Template",
     }
 
-    ALPHA_LABEL = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:alpha_label]}"
     APPLICATION_NAME_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:application_name]}"
     ARTEFACT_HEADER = "#{HEADER_PREFIX}-Artefact"
-    BETA_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:beta]}"
-    BETA_LABEL = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:beta_label]}"
     FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}"
     ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
     REPORT_A_PROBLEM_FORM = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:report_a_problem]}"

data/lib/slimmer/skin.rb

@@ -121,15 +121,11 @@ module Slimmer
         Processors::SearchParameterInserter.new(response),
         Processors::SearchPathSetter.new(response),
         Processors::RelatedItemsInserter.new(self, artefact),
-        Processors::LogoClassInserter.new(artefact),
         Processors::ReportAProblemInserter.new(self,
                                                source_request.url,
                                                response.headers,
                                                wrapper_id),
         Processors::MetaViewportRemover.new(self, response.headers),
-        Processors::BetaNoticeInserter.new(self, response.headers),
-        Processors::BetaLabelInserter.new(self, response.headers),
-        Processors::AlphaLabelInserter.new(self, response.headers),
       ]
 
       template_name = response.headers[Headers::TEMPLATE_HEADER] || 'wrapper'

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '6.0.0'
+  VERSION = '7.0.0'
 end

data/test/artefact_test.rb

@@ -22,12 +22,12 @@ describe Slimmer::Artefact do
     end
 
     it "should ignore other tag types" do
-      @data["tags"].unshift(tag_for_slug("businesslink", "legacy_source"))
+      @data["tags"].unshift(tag_for_slug("other_tag", "another_tag"))
       assert_equal @tag1, Slimmer::Artefact.new(@data).primary_section
     end
 
     it "should return nil if there are no sections" do
-      @data["tags"] = [tag_for_slug("businesslink", "legacy_source")]
+      @data["tags"] = [tag_for_slug("other_tag", "another_tag")]
       assert_equal nil, Slimmer::Artefact.new(@data).primary_section
     end
 
@@ -89,30 +89,6 @@ describe Slimmer::Artefact do
     end
   end
 
-  describe "Legacy sources" do
-    before do
-      @data = artefact_for_slug('something')
-    end
-
-    it "should return the slugs of all legacy_source tags" do
-      @data["tags"] << tag_for_slug('businesslink', 'legacy_source')
-      @data["tags"] << tag_for_slug('directgov', 'legacy_source')
-      assert_equal ['businesslink', 'directgov'], Slimmer::Artefact.new(@data).legacy_sources.sort
-    end
-
-    it "should not include other tags" do
-      @data["tags"] << tag_for_slug('businesslink', 'legacy_source')
-      @data["tags"] << tag_for_slug('business', 'proposition')
-      @data["tags"] << tag_for_slug('directgov', 'legacy_source')
-      assert_equal ['businesslink', 'directgov'], Slimmer::Artefact.new(@data).legacy_sources.sort
-    end
-
-    it "should return empty array if the data hs no tags element" do
-      @data.delete("tags")
-      assert_equal [], Slimmer::Artefact.new(@data).legacy_sources
-    end
-  end
-
   describe "method_missing accessing artefact fields" do
     before do
       @data = artefact_for_slug('something')

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

@@ -25,13 +25,6 @@
           <a href="#content">Return to top &uarr;</a>
         </nav>
      </div>
-     <div id="legacy-sources">
-       <p>This replaces</p>
-       <ul>
-         <li class="directgov">Directgov</li>
-         <li class="businesslink">Business Link</li>
-       </ul>
-     </div>
    </div>
 
   </div>

data/test/test_helper.rb

@@ -92,9 +92,6 @@ class SlimmerIntegrationTest < MiniTest::Test
     use_template(template_name)
     use_template('related.raw')
     use_template('report_a_problem.raw')
-    use_template('alpha_label')
-    use_template('beta_notice')
-    use_template('beta_label')
 
     fetch_page
   end

data/test/typical_usage_test.rb

@@ -90,7 +90,6 @@ module TypicalUsage
     def setup
       super
       @artefact = artefact_for_slug_in_a_section("some-article", 'this-section')
-      @artefact["tags"] << tag_for_slug("directgov", "legacy_source")
       given_response 200, %{
         <html>
         <head><title>The title of the page</title>
@@ -132,15 +131,6 @@ module TypicalUsage
     def test_should_insert_section_links_into_the_navigation
       assert_rendered_in_template "#global-breadcrumb ol li a[href='https://www.test.gov.uk/browse/this-section']", "This section"
     end
-
-    def test_should_add_logo_classes_to_wrapper
-      assert_rendered_in_template "#wrapper.directgov"
-    end
-
-    def test_should_not_add_beta_notice_to_non_beta_pages
-      assert_no_selector "body.beta"
-      assert_no_selector ".beta-notice"
-    end
   end
 
   class ConditionalCommentTest < SlimmerIntegrationTest
@@ -255,34 +245,6 @@ module TypicalUsage
     end
   end
 
-  class BetaLabelInserterTest < SlimmerIntegrationTest
-    def test_should_add_beta_label
-      given_response 200, %{
-        <html>
-          <body class="wibble">
-            <div id="wrapper">The body of the page</div>
-          </body>
-        </html>
-      }, { Slimmer::Headers::BETA_LABEL => 'after:#wrapper' }
-
-      assert_rendered_in_template '.beta-label'
-    end
-  end
-
-  class AlphaLabelInserterTest < SlimmerIntegrationTest
-    def test_should_add_alpha_label
-      given_response 200, %{
-        <html>
-          <body class="wibble">
-            <div id="wrapper">The body of the page</div>
-          </body>
-        </html>
-      }, { Slimmer::Headers::ALPHA_LABEL => 'after:#wrapper' }
-
-      assert_rendered_in_template '.alpha-label'
-    end
-  end
-
   class Error500ResponseTest < SlimmerIntegrationTest
     given_response 500, %{
       <html>

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 6.0.0
-  prerelease: 
+  version: 7.0.0
 platform: ruby
 authors:
 - Ben Griffiths
@@ -10,184 +9,238 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &19898920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *19898920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &19914280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *19914280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &19912620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *19912620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19911480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19911480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &19910020 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19910020
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19908180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19908180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19907040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19907040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &19931140 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
-  version_requirements: *19931140
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19954060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *19954060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &19952100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *19952100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &19950820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *19950820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &19949700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.18.0
   type: :development
   prerelease: false
-  version_requirements: *19949700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &19972060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *19972060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &19970640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *19970640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
-  requirement: &19969780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *19969780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &19968420 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *19968420
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -197,114 +250,93 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - CHANGELOG.md
-- lib/slimmer/i18n_backend.rb
-- lib/slimmer/railtie.rb
-- lib/slimmer/headers.rb
-- lib/slimmer/skin.rb
+- README.md
+- Rakefile
+- bin/render_slimmer_error
+- lib/slimmer.rb
 - lib/slimmer/app.rb
-- lib/slimmer/test_templates/header_footer_only.html
-- lib/slimmer/test_templates/alpha_label.html
-- lib/slimmer/test_templates/wrapper.html
-- lib/slimmer/test_templates/beta_notice.html
-- lib/slimmer/test_templates/beta_label.html
-- lib/slimmer/test.rb
-- lib/slimmer/version.rb
-- lib/slimmer/test_helpers/shared_templates.rb
 - lib/slimmer/artefact.rb
-- lib/slimmer/shared_templates.rb
-- lib/slimmer/govuk_request_id.rb
-- lib/slimmer/template.rb
-- lib/slimmer/component_resolver.rb
 - lib/slimmer/cache.rb
-- lib/slimmer/processors/header_context_inserter.rb
-- lib/slimmer/processors/navigation_mover.rb
-- lib/slimmer/processors/google_analytics_configurator.rb
-- lib/slimmer/processors/logo_class_inserter.rb
-- lib/slimmer/processors/section_inserter.rb
-- lib/slimmer/processors/tag_mover.rb
-- lib/slimmer/processors/meta_viewport_remover.rb
+- lib/slimmer/component_resolver.rb
+- lib/slimmer/govuk_request_id.rb
+- lib/slimmer/headers.rb
+- lib/slimmer/i18n_backend.rb
 - lib/slimmer/processors/body_class_copier.rb
-- 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_parameter_inserter.rb
 - lib/slimmer/processors/body_inserter.rb
-- lib/slimmer/processors/alpha_label_inserter.rb
+- lib/slimmer/processors/conditional_comment_mover.rb
 - lib/slimmer/processors/footer_remover.rb
-- lib/slimmer/processors/beta_notice_inserter.rb
+- lib/slimmer/processors/google_analytics_configurator.rb
+- lib/slimmer/processors/header_context_inserter.rb
+- lib/slimmer/processors/meta_viewport_remover.rb
+- lib/slimmer/processors/navigation_mover.rb
 - lib/slimmer/processors/related_items_inserter.rb
+- lib/slimmer/processors/report_a_problem_inserter.rb
+- lib/slimmer/processors/search_parameter_inserter.rb
 - lib/slimmer/processors/search_path_setter.rb
-- lib/slimmer/processors/conditional_comment_mover.rb
+- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/tag_mover.rb
+- lib/slimmer/processors/title_inserter.rb
+- lib/slimmer/railtie.rb
+- lib/slimmer/shared_templates.rb
+- lib/slimmer/skin.rb
+- lib/slimmer/template.rb
+- lib/slimmer/test.rb
+- lib/slimmer/test_helpers/shared_templates.rb
+- lib/slimmer/test_templates/header_footer_only.html
+- lib/slimmer/test_templates/wrapper.html
+- lib/slimmer/version.rb
 - lib/tasks/slimmer.rake
-- lib/slimmer.rb
-- Rakefile
-- test/component_resolver_test.rb
-- test/changelog_test.rb
-- test/test_helpers/shared_templates_test.rb
-- test/typical_usage_test.rb
-- test/skin_test.rb
-- test/deprecated_usage_test.rb
 - test/artefact_test.rb
-- test/fixtures/wrapper.html.erb
+- test/cache_test.rb
+- test/changelog_test.rb
+- test/component_resolver_test.rb
+- test/fixtures/404.html.erb
+- test/fixtures/410.html.erb
 - test/fixtures/500.html.erb
 - test/fixtures/proposition_menu.html.erb
-- test/fixtures/410.html.erb
-- test/fixtures/alpha_label.html.erb
-- test/fixtures/404.html.erb
-- test/fixtures/report_a_problem.raw.html.erb
-- test/fixtures/beta_label.html.erb
 - test/fixtures/related.raw.html.erb
-- test/fixtures/beta_notice.html.erb
+- test/fixtures/report_a_problem.raw.html.erb
+- test/fixtures/wrapper.html.erb
 - test/headers_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/cache_test.rb
-- test/test_helper.rb
-- test/processors/header_context_inserter_test.rb
 - test/processors/body_inserter_test.rb
-- test/processors/navigation_mover_test.rb
-- test/processors/related_items_inserter_test.rb
-- test/processors/search_path_setter_test.rb
 - test/processors/google_analytics_test.rb
+- test/processors/header_context_inserter_test.rb
 - test/processors/meta_viewport_remover_test.rb
-- test/processors/alpha_label_inserter_test.rb
+- test/processors/navigation_mover_test.rb
+- test/processors/related_items_inserter_test.rb
+- test/processors/report_a_problem_inserter_test.rb
 - test/processors/search_parameter_inserter_test.rb
+- test/processors/search_path_setter_test.rb
 - test/processors/section_inserter_test.rb
-- test/processors/report_a_problem_inserter_test.rb
 - test/processors/tag_mover_test.rb
-- test/processors/logo_class_inserter_test.rb
-- test/processors/beta_label_inserter_test.rb
-- bin/render_slimmer_error
+- test/skin_test.rb
+- test/test_helper.rb
+- test/test_helpers/shared_templates_test.rb
+- test/test_template_dependency_on_static_test.rb
+- test/typical_usage_test.rb
 homepage: http://github.com/alphagov/slimmer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1405185890624183511
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1405185890624183511
 requirements: []
 rubyforge_project: slimmer
-rubygems_version: 1.8.11
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Thinner than the skinner
 test_files:
 - test/component_resolver_test.rb
@@ -312,18 +344,14 @@ test_files:
 - test/test_helpers/shared_templates_test.rb
 - test/typical_usage_test.rb
 - test/skin_test.rb
-- test/deprecated_usage_test.rb
 - test/artefact_test.rb
 - test/fixtures/wrapper.html.erb
 - test/fixtures/500.html.erb
 - test/fixtures/proposition_menu.html.erb
 - test/fixtures/410.html.erb
-- test/fixtures/alpha_label.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/report_a_problem.raw.html.erb
-- test/fixtures/beta_label.html.erb
 - test/fixtures/related.raw.html.erb
-- test/fixtures/beta_notice.html.erb
 - test/headers_test.rb
 - test/test_template_dependency_on_static_test.rb
 - test/cache_test.rb
@@ -335,10 +363,7 @@ test_files:
 - test/processors/search_path_setter_test.rb
 - test/processors/google_analytics_test.rb
 - test/processors/meta_viewport_remover_test.rb
-- test/processors/alpha_label_inserter_test.rb
 - test/processors/search_parameter_inserter_test.rb
 - test/processors/section_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
 - test/processors/tag_mover_test.rb
-- test/processors/logo_class_inserter_test.rb
-- test/processors/beta_label_inserter_test.rb

data/lib/slimmer/processors/alpha_label_inserter.rb

@@ -1,35 +0,0 @@
-module Slimmer::Processors
-  class AlphaLabelInserter
-    def initialize(skin, headers)
-      @skin = skin
-      @headers = headers
-    end
-
-    def filter(content_document, page_template)
-      if should_add_alpha_label?
-        if position == 'before'
-          page_template.at_css(selector).add_previous_sibling(alpha_label_block)
-        elsif position == 'after'
-          page_template.at_css(selector).add_next_sibling(alpha_label_block)
-        end
-      end
-    end
-
-    def should_add_alpha_label?
-      !! @headers[Slimmer::Headers::ALPHA_LABEL]
-    end
-
-    def alpha_label_block
-      @alpha_label_block ||= @skin.template('alpha_label').to_s
-    end
-
-  private
-    def selector
-      @headers[Slimmer::Headers::ALPHA_LABEL].gsub(/.*:/, '')
-    end
-
-    def position
-      @headers[Slimmer::Headers::ALPHA_LABEL].gsub(/:.*/, '')
-    end
-  end
-end

data/lib/slimmer/processors/beta_label_inserter.rb

@@ -1,35 +0,0 @@
-module Slimmer::Processors
-  class BetaLabelInserter
-    def initialize(skin, headers)
-      @skin = skin
-      @headers = headers
-    end
-
-    def filter(content_document, page_template)
-      if should_add_beta_label?
-        if position == 'before'
-          page_template.at_css(selector).add_previous_sibling(beta_label_block)
-        elsif position == 'after'
-          page_template.at_css(selector).add_next_sibling(beta_label_block)
-        end
-      end
-    end
-
-    def should_add_beta_label?
-      !! @headers[Slimmer::Headers::BETA_LABEL]
-    end
-
-    def beta_label_block
-      @beta_label_block ||= @skin.template('beta_label').to_s
-    end
-
-  private
-    def selector
-      @headers[Slimmer::Headers::BETA_LABEL].gsub(/.*:/, '')
-    end
-
-    def position
-      @headers[Slimmer::Headers::BETA_LABEL].gsub(/:.*/, '')
-    end
-  end
-end

data/lib/slimmer/processors/beta_notice_inserter.rb

@@ -1,35 +0,0 @@
-module Slimmer::Processors
-  class BetaNoticeInserter
-    def initialize(skin, headers)
-      @skin = skin
-      @headers = headers
-    end
-
-    def filter(content_document, page_template)
-      if should_add_beta_notice?
-        warn "[DEPRECATION WARNING] BETA_HEADER is deprecated. Use BETA_LABEL instead."
-        page_template.css('body').add_class('beta')
-        if header = page_template.at_css('#global-header')
-          header.add_next_sibling(beta_notice_block)
-        end
-        if footer = page_template.at_css('footer#footer')
-          footer.add_previous_sibling(add_footer_class(beta_notice_block))
-        end
-      end
-    end
-
-    def should_add_beta_notice?
-      !! @headers[Slimmer::Headers::BETA_HEADER]
-    end
-
-    def add_footer_class(block)
-      block = Nokogiri::HTML.fragment(block)
-      block.child['class'] = "#{block.child['class']} js-footer"
-      block
-    end
-
-    def beta_notice_block
-      @beta_notice_block ||= @skin.template('beta_notice')
-    end
-  end
-end

data/lib/slimmer/processors/logo_class_inserter.rb

@@ -1,20 +0,0 @@
-module Slimmer
-  module Processors
-    class LogoClassInserter
-      LOGO_CLASSES = %w(businesslink directgov)
-
-      def initialize(artefact)
-        @artefact = artefact
-      end
-
-      def filter(source, dest)
-        return unless @artefact
-        classes_to_use = LOGO_CLASSES & @artefact.legacy_sources
-        wrapper = dest.css('#wrapper')
-        classes_to_use.each do |klass|
-          wrapper.add_class(klass)
-        end
-      end
-    end
-  end
-end

data/lib/slimmer/test_templates/alpha_label.html

@@ -1 +0,0 @@
-<div class="alpha-label"><p>This page is ALPHA.</p></div>

data/lib/slimmer/test_templates/beta_label.html

@@ -1 +0,0 @@
-<div class="beta-label"><p>This page is BETA.</p></div>

data/lib/slimmer/test_templates/beta_notice.html

@@ -1 +0,0 @@
-<div class="beta-notice"><p>This page is BETA.</p></div>

data/test/deprecated_usage_test.rb

@@ -1,25 +0,0 @@
-require_relative "test_helper"
-
-module DeprecatedUsage
-  class BetaNoticeInserterTest < SlimmerIntegrationTest
-    def test_should_add_beta_warnings
-      Slimmer::Processors::BetaNoticeInserter.any_instance.
-                                              expects(:warn).
-                                              with(regexp_matches(/BETA_HEADER is deprecated. Use BETA_LABEL instead/))
-
-      given_response 200, %{
-        <html>
-          <body class="wibble">
-            <div id="wrapper">The body of the page</div>
-          </body>
-        </html>
-      }, {Slimmer::Headers::BETA_HEADER => '1'}
-
-      # beta notice after cookie bar
-      assert_rendered_in_template "body.beta.wibble #global-header + div.beta-notice"
-
-      # beta notice before footer
-      assert_rendered_in_template "body.beta.wibble div.beta-notice.js-footer + #footer"
-    end
-  end
-end

data/test/fixtures/alpha_label.html.erb

@@ -1 +0,0 @@
-<div class="alpha-label"><p>This page is ALPHA.</p></div>

data/test/fixtures/beta_label.html.erb

@@ -1 +0,0 @@
-<div class="beta-label"><p>This page is BETA.</p></div>

data/test/fixtures/beta_notice.html.erb

@@ -1,3 +0,0 @@
-<div class="beta-notice">
-  <p>This page is in beta</p>
-</div>

data/test/processors/alpha_label_inserter_test.rb

@@ -1,42 +0,0 @@
-require_relative "../test_helper"
-
-class AlphaLabelInserterTest < MiniTest::Test
-
-  def setup
-    super
-    alpha_label_block = '<div class="alpha-label"><p>This page is ALPHA.</p></div>'
-    @skin = stub("Skin", :template => alpha_label_block)
-    @template = as_nokogiri %{
-      <html><body><div><div id="wrapper"><header id="main">GOV.UK</header></div></div></body></html>
-    }
-  end
-
-  def test_should_add_alpha_label_after
-
-    headers = {
-      Slimmer::Headers::ALPHA_LABEL => "after:header#main"
-    }
-
-    Slimmer::Processors::AlphaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_in @template, '#main + .alpha-label'
-  end
-
-  def test_should_add_alpha_label_before
-    headers = {
-      Slimmer::Headers::ALPHA_LABEL => "before:header#main"
-    }
-
-    Slimmer::Processors::AlphaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_in @template, '.alpha-label + #main'
-  end
-
-  def test_should_not_add_alpha_label
-    headers = {}
-
-    Slimmer::Processors::AlphaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_not_in @template, '.alpha-label'
-  end
-end

data/test/processors/beta_label_inserter_test.rb

@@ -1,42 +0,0 @@
-require_relative "../test_helper"
-
-class BetaLabelInserterTest < MiniTest::Test
-
-  def setup
-    super
-    beta_label_block = '<div class="beta-label"><p>This page is BETA.</p></div>'
-    @skin = stub("Skin", :template => beta_label_block)
-    @template = as_nokogiri %{
-      <html><body><div><div id="wrapper"><header id="main">GOV.UK</header></div></div></body></html>
-    }
-  end
-
-  def test_should_add_beta_label_after    
-
-    headers = {
-      Slimmer::Headers::BETA_LABEL => "after:header#main"
-    }
-
-    Slimmer::Processors::BetaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_in @template, '#main + .beta-label'
-  end
-
-  def test_should_add_beta_label_before
-    headers = {
-      Slimmer::Headers::BETA_LABEL => "before:header#main"
-    }
-
-    Slimmer::Processors::BetaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_in @template, '.beta-label + #main'
-  end
-
-  def test_should_not_add_beta_label
-    headers = {}
-
-    Slimmer::Processors::BetaLabelInserter.new(@skin, headers).filter(nil, @template)
-
-    assert_not_in @template, '.beta-label'
-  end
-end

data/test/processors/logo_class_inserter_test.rb

@@ -1,81 +0,0 @@
-require_relative "../test_helper.rb"
-require 'gds_api/test_helpers/content_api'
-
-describe Slimmer::Processors::LogoClassInserter do
-  include GdsApi::TestHelpers::ContentApi
-
-  def artefact_with_legacy_source_tags(legacy_sources)
-    artefact = artefact_for_slug("vat")
-    legacy_sources.each do |legacy_source|
-      artefact["tags"] << tag_for_slug(legacy_source, "legacy_source")
-    end
-    Slimmer::Artefact.new(artefact)
-  end
-
-  def business_link_artefact
-    artefact_with_legacy_source_tags(["businesslink"])
-  end
-
-  def directgov_artefact
-    artefact_with_legacy_source_tags(["directgov"])
-  end
-
-  def business_link_and_directgov_artefact
-    artefact_with_legacy_source_tags(["directgov", "businesslink"])
-  end
-
-  def process(artefact, template)
-    Slimmer::Processors::LogoClassInserter.new(artefact).filter(:any_source, template)
-  end
-
-  def example_template
-    as_nokogiri %{
-      <html><body><div><div id="wrapper"></div></div></body></html>
-    }
-  end
-
-  it "should add businesslink class to the wrapper" do
-    template = example_template
-    process(business_link_artefact, template)
-    assert_in template, "div#wrapper.businesslink"
-  end
-
-  it "should add multiple classes to the wrapper" do
-    template = example_template
-    artefact = business_link_and_directgov_artefact
-    process(artefact, template)
-    assert_in template, "div#wrapper.businesslink.directgov"
-  end
-
-  it "should ignore non-known tags" do
-    template = example_template
-    artefact = artefact_with_legacy_source_tags(["businesslink", "business", "fooey"])
-    process(artefact, template)
-    assert_in template, "div#wrapper.businesslink"
-    assert_not_in template, "div#wrapper.business"
-    assert_not_in template, "div#wrapper.fooey"
-  end
-
-  it "should do nothing if the #wrapper element doesn't exist" do
-    artefact = directgov_artefact
-    template = as_nokogiri %{
-      <html><body><div><div id="not_wrapper"></div></div></body></html>
-    }
-    process(artefact, template)
-    assert_in template, "div#not_wrapper"
-    assert_not_in template, "div#wrapper"
-  end
-
-  it "should do nothing if the artefact has no tag_ids" do
-    template = example_template
-    artefact = Slimmer::Artefact.new(artefact_for_slug("vat"))
-    process(artefact, template)
-    assert_in template, "div#wrapper"
-  end
-
-  it "should not blow up without an artefact" do
-    template = example_template
-    processor = Slimmer::Processors::LogoClassInserter.new(nil)
-    processor.filter(:any_source, template)
-  end
-end