RubyGems - slimmer - Versions diffs - 9.6.0 → 10.0.0 - Mend

slimmer 9.6.0 → 10.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +10 -1
data/README.md +9 -9
data/lib/slimmer.rb +1 -4
data/lib/slimmer/cucumber.rb +2 -2
data/lib/slimmer/{shared_templates.rb → govuk_components.rb} +3 -3
data/lib/slimmer/headers.rb +0 -42
data/lib/slimmer/processors/metadata_inserter.rb +1 -7
data/lib/slimmer/rspec.rb +2 -2
data/lib/slimmer/skin.rb +1 -15
data/lib/slimmer/test_helpers/{shared_templates.rb → govuk_components.rb} +1 -1
data/lib/slimmer/version.rb +1 -1
data/test/headers_test.rb +0 -133
data/test/processors/metadata_inserter_test.rb +0 -63
data/test/skin_test.rb +0 -24
data/test/test_helper.rb +0 -3
data/test/test_helpers/{shared_templates_test.rb → govuk_components_test.rb} +7 -7
data/test/typical_usage_test.rb +1 -53
metadata +24 -49
data/lib/slimmer/artefact.rb +0 -47
data/lib/slimmer/processors/related_items_inserter.rb +0 -22
data/lib/slimmer/processors/section_inserter.rb +0 -49
data/test/artefact_test.rb +0 -119
data/test/fixtures/related.raw.html.erb +0 -33
data/test/processors/related_items_inserter_test.rb +0 -59
data/test/processors/section_inserter_test.rb +0 -193

data/test/skin_test.rb CHANGED Viewed

@@ -96,28 +96,4 @@ describe Slimmer::Skin do
       end
     end
   end
-  describe "parsing artefact from header" do
-    before do
-      @skin = Slimmer::Skin.new cache: Slimmer::Cache.instance
-      @headers = {}
-      @response = stub("Response", :headers => @headers)
-    end
-    it "should construct and return an artefact with the parsed json" do
-      data = {"foo" => "bar", "baz" => 1}
-      @headers[Slimmer::Headers::ARTEFACT_HEADER] = data.to_json
-      Slimmer::Artefact.expects(:new).with(data).returns(:an_artefact)
-      assert_equal :an_artefact, @skin.artefact_from_header(@response)
-    end
-    it "should return nil if there is no artefact header" do
-      assert_equal nil, @skin.artefact_from_header(@response)
-    end
-    it "should return nil if there is invalid JSON in the artefact header" do
-      @headers[Slimmer::Headers::ARTEFACT_HEADER] = "fooey"
-      assert_equal nil, @skin.artefact_from_header(@response)
-    end
-  end
 end

data/test/test_helper.rb CHANGED Viewed

@@ -5,7 +5,6 @@ require 'json'
 require 'logger'
 require 'mocha/setup'
 require 'timecop'
-require 'gds_api/test_helpers/content_api'
 MiniTest::Test.class_eval do
   def as_nokogiri(html_string)
@@ -60,7 +59,6 @@ end
 class SlimmerIntegrationTest < MiniTest::Test
   include Rack::Test::Methods
-  include GdsApi::TestHelpers::ContentApi
   # given_response can either be called from a setup method, or in the class scope.
   # The setup method variant is necessary if you want to pass variables into the call that
@@ -90,7 +88,6 @@ class SlimmerIntegrationTest < MiniTest::Test
                     end
     use_template(template_name)
-    use_template('related.raw')
     use_template('report_a_problem.raw')
     fetch_page

data/test/test_helpers/{shared_templates_test.rb → govuk_components_test.rb} RENAMED Viewed

@@ -1,17 +1,17 @@
 require_relative "../test_helper"
-require_relative "../../lib/slimmer/test_helpers/shared_templates"
-describe Slimmer::TestHelpers::SharedTemplates do
+require_relative "../../lib/slimmer/test_helpers/govuk_components"
+describe Slimmer::TestHelpers::GovukComponents do
   let(:subject) {
     class Dummy
-      include Slimmer::TestHelpers::SharedTemplates
+      include Slimmer::TestHelpers::GovukComponents
     end
-    }
+  }
-  describe 'shared_component_selector' do
-    it 'should generate a selector for components' do
+  describe '#shared_component_selector' do
+    it 'generates a selector for components' do
       outcome = subject.new.shared_component_selector('flux_capacitor')
       expected = "test-govuk-component[data-template='govuk_component-flux_capacitor']"
       assert_equal expected, outcome
     end

data/test/typical_usage_test.rb CHANGED Viewed

@@ -89,7 +89,6 @@ module TypicalUsage
   class NormalResponseTest < SlimmerIntegrationTest
     def setup
       super
-      @artefact = artefact_for_slug_in_a_section("some-article", 'this-section')
       given_response 200, %{
         <html>
         <head><title>The title of the page</title>
@@ -101,7 +100,7 @@ module TypicalUsage
         <div id="wrapper">The body of the page</div>
         </body>
         </html>
-      }, {Slimmer::Headers::ARTEFACT_HEADER => @artefact.to_json}
+      }, {}
     end
     def test_should_replace_the_wrapper_using_the_app_response
@@ -127,10 +126,6 @@ module TypicalUsage
     def test_should_copy_the_class_of_the_body_element
       assert_rendered_in_template "body.body_class"
     end
-    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
   end
   class ConditionalCommentTest < SlimmerIntegrationTest
@@ -164,49 +159,6 @@ module TypicalUsage
     end
   end
-  class ResponseWithRelatedItemsTest < SlimmerIntegrationTest
-    def setup
-      super
-      @artefact = artefact_for_slug_with_related_artefacts("some-slug", ["how-to-test-computer-software-automatically"])
-    end
-  end
-  class MainstreamRelatedItemsTest < ResponseWithRelatedItemsTest
-    def setup
-      super
-      given_response 200, %{
-        <html>
-        <body class="mainstream">
-        <div id="wrapper">The body of the page<div id="related-items"></div></div>
-        </body>
-        </html>
-      }, {Slimmer::Headers::ARTEFACT_HEADER => @artefact.to_json}
-    end
-    def test_should_insert_related_items_block
-      assert_rendered_in_template "div.related nav li a[href='https://www.test.gov.uk/how-to-test-computer-software-automatically']",
-        "How to test computer software automatically"
-    end
-  end
-  class NonMainstreamRelatedItemsTest < ResponseWithRelatedItemsTest
-    def setup
-      super
-      given_response 200, %{
-        <html>
-        <body class="nonmainstream">
-        <div id="wrapper">The body of the page<div id="related-items"></div></div>
-        </body>
-        </html>
-      }, {Slimmer::Headers::ARTEFACT_HEADER => @artefact.to_json}
-    end
-    def test_should_not_insert_related_items_block
-      assert_rendered_in_template "div#related-items", ""
-    end
-  end
   class HeaderContextResponseTest < SlimmerIntegrationTest
     given_response 200, %{
       <html>
@@ -379,11 +331,9 @@ module TypicalUsage
         </html>
       }, {
         "#{Slimmer::Headers::HEADER_PREFIX}-Foo" => "Something",
-        Slimmer::Headers::ARTEFACT_HEADER => "{}",
         "X-Custom-Header" => "Something else"
       }
-      refute last_response.headers.has_key?(Slimmer::Headers::ARTEFACT_HEADER)
       refute last_response.headers.has_key?("#{Slimmer::Headers::HEADER_PREFIX}-Foo")
       assert_equal "Something else", last_response.headers["X-Custom-Header"]
     end
@@ -397,12 +347,10 @@ module TypicalUsage
         </html>
       }, {
         "#{Slimmer::Headers::HEADER_PREFIX}-Foo" => "Something",
-        Slimmer::Headers::ARTEFACT_HEADER => "{}",
         "X-Custom-Header" => "Something else",
         Slimmer::Headers::SKIP_HEADER => "1"
       }
-      refute last_response.headers.has_key?(Slimmer::Headers::ARTEFACT_HEADER)
       refute last_response.headers.has_key?("#{Slimmer::Headers::HEADER_PREFIX}-Foo")
       assert_equal "Something else", last_response.headers["X-Custom-Header"]
     end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -199,20 +199,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: gds-api-adapters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -256,10 +242,10 @@ files:
 - bin/render_slimmer_error
 - lib/slimmer.rb
 - lib/slimmer/app.rb
-- lib/slimmer/artefact.rb
 - lib/slimmer/cache.rb
 - lib/slimmer/component_resolver.rb
 - lib/slimmer/cucumber.rb
+- lib/slimmer/govuk_components.rb
 - lib/slimmer/govuk_request_id.rb
 - lib/slimmer/headers.rb
 - lib/slimmer/i18n_backend.rb
@@ -271,27 +257,23 @@ files:
 - lib/slimmer/processors/inside_header_inserter.rb
 - lib/slimmer/processors/metadata_inserter.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/search_remover.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/rspec.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_helpers/govuk_components.rb
 - lib/slimmer/test_templates/header_footer_only.html
 - lib/slimmer/test_templates/wrapper.html
 - lib/slimmer/version.rb
 - lib/tasks/lint.rake
 - lib/tasks/slimmer.rake
-- test/artefact_test.rb
 - test/cache_test.rb
 - test/changelog_test.rb
 - test/component_resolver_test.rb
@@ -300,7 +282,6 @@ files:
 - test/fixtures/500.html.erb
 - test/fixtures/core_layout.html.erb
 - test/fixtures/proposition_menu.html.erb
-- test/fixtures/related.raw.html.erb
 - test/fixtures/report_a_problem.raw.html.erb
 - test/headers_test.rb
 - test/processors/body_inserter_test.rb
@@ -308,16 +289,14 @@ files:
 - test/processors/inside_header_inserter_test.rb
 - test/processors/metadata_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/search_remover_test.rb
-- test/processors/section_inserter_test.rb
 - test/processors/tag_mover_test.rb
 - test/skin_test.rb
 - test/test_helper.rb
-- test/test_helpers/shared_templates_test.rb
+- test/test_helpers/govuk_components_test.rb
 - test/test_template_dependency_on_static_test.rb
 - test/typical_usage_test.rb
 homepage: http://github.com/alphagov/slimmer
@@ -345,32 +324,28 @@ signing_key:
 specification_version: 4
 summary: Thinner than the skinner
 test_files:
+- test/headers_test.rb
+- test/processors/body_inserter_test.rb
+- test/processors/search_path_setter_test.rb
+- test/processors/navigation_mover_test.rb
+- test/processors/report_a_problem_inserter_test.rb
+- test/processors/inside_header_inserter_test.rb
+- test/processors/tag_mover_test.rb
+- test/processors/search_parameter_inserter_test.rb
+- test/processors/search_remover_test.rb
+- test/processors/metadata_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/test_template_dependency_on_static_test.rb
 - test/test_helper.rb
 - test/typical_usage_test.rb
-- test/cache_test.rb
-- test/test_helpers/shared_templates_test.rb
 - test/skin_test.rb
-- test/fixtures/500.html.erb
-- test/fixtures/related.raw.html.erb
-- test/fixtures/404.html.erb
-- test/fixtures/410.html.erb
+- test/component_resolver_test.rb
 - test/fixtures/core_layout.html.erb
-- test/fixtures/proposition_menu.html.erb
 - test/fixtures/report_a_problem.raw.html.erb
+- test/fixtures/410.html.erb
+- test/fixtures/404.html.erb
+- test/fixtures/500.html.erb
+- test/fixtures/proposition_menu.html.erb
+- test/test_helpers/govuk_components_test.rb
+- test/cache_test.rb
 - test/changelog_test.rb
-- test/component_resolver_test.rb
-- test/headers_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/artefact_test.rb
-- test/processors/search_parameter_inserter_test.rb
-- test/processors/metadata_inserter_test.rb
-- test/processors/header_context_inserter_test.rb
-- test/processors/related_items_inserter_test.rb
-- test/processors/section_inserter_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/report_a_problem_inserter_test.rb
-- test/processors/search_remover_test.rb
-- test/processors/inside_header_inserter_test.rb
-- test/processors/navigation_mover_test.rb
-- test/processors/search_path_setter_test.rb
-- test/processors/tag_mover_test.rb

data/lib/slimmer/artefact.rb DELETED Viewed

@@ -1,47 +0,0 @@
-class Slimmer::Artefact
-  def initialize(artefact_data)
-    @data = artefact_data
-  end
-  def slug
-    id_to_slug(@data["id"])
-  end
-  def tags_of_type(type)
-    return [] unless self.tags
-    self.tags.select do |t|
-      t["details"]["type"] == type
-    end
-  end
-  def primary_section
-    tags_of_type("section").first
-  end
-  def primary_root_section
-    section = primary_section
-    while section and section["parent"]
-      section = section["parent"]
-    end
-    section
-  end
-  def related_artefacts
-    return [] unless self.related
-    self.related.map do |r|
-      self.class.new(r)
-    end
-  end
-  def method_missing(name, *args)
-    value = @data[name.to_s]
-    value ||= @data["details"][name.to_s] if @data["details"]
-    value
-  end
-  private
-  def id_to_slug(id)
-    id.split('/').last.chomp('.json')
-  end
-end

data/lib/slimmer/processors/related_items_inserter.rb DELETED Viewed

@@ -1,22 +0,0 @@
-class Slimmer::Processors::RelatedItemsInserter
-  include ERB::Util
-  def initialize(skin, artefact)
-    @skin = skin
-    @artefact = artefact
-  end
-  def filter(content_document, page_template)
-    if content_document.at_css('body.mainstream div#related-items')
-      page_template.at_css('body.mainstream div#related-items').replace(related_item_block)
-    end
-  end
-  private
-  def related_item_block
-    artefact = @artefact
-    html = ERB.new(@skin.template('related.raw')).result(binding)
-    Nokogiri::HTML.fragment(html)
-  end
-end

data/lib/slimmer/processors/section_inserter.rb DELETED Viewed

@@ -1,49 +0,0 @@
-module Slimmer::Processors
-  class SectionInserter
-    def initialize(artefact)
-      @artefact = artefact
-    end
-    def filter(src, dest)
-      if @artefact and (list = dest.at_css('#global-breadcrumb ol'))
-        if (section = @artefact.primary_section)
-          sections = recurse_sections(section)
-          current = sections.pop
-          sections.each do |section|
-            append_tag(list, section)
-          end
-          append_tag(list, current, :strong => true)
-        end
-      end
-    end
-    private
-    def recurse_sections(section, current = nil)
-      current = [section] unless current
-      if section['parent']
-        current.unshift(section['parent'])
-        current = recurse_sections(section['parent'], current)
-      end
-      current
-    end
-    def append_tag(list, tag, opts = {})
-      link_node = Nokogiri::XML::Node.new('a', list)
-      link_node['href'] = tag["content_with_tag"]["web_url"]
-      link_node.content = tag["title"]
-      list_item = Nokogiri::XML::Node.new('li', list)
-      if opts[:strong]
-        strong = Nokogiri::XML::Node.new('strong', list)
-        strong.add_child(link_node)
-        list_item.add_child(strong)
-      else
-        list_item.add_child(link_node)
-      end
-      list.add_child(list_item)
-    end
-  end
-end