slimmer 10.0.0 → 10.1.0

data/lib/slimmer/cache.rb

@@ -1,46 +0,0 @@
-require 'singleton'
-
-module Slimmer
-  class Cache
-    include Singleton
-    attr_writer :use_cache, :cache_ttl
-
-    # TODO: use a real cache rather than an in memory hash
-    def initialize
-      @cache_last_reset= Time.now
-
-      @use_cache = false
-      @cache_ttl = (5 * 60) # 5 mins
-
-      @data_store = {}
-    end
-
-    def clear
-      @data_store.clear
-    end
-
-    def fetch(key)
-      clear_cache_if_stale
-      data = @data_store[key]
-
-      if data.nil?
-        data = yield
-      end
-
-      if @use_cache
-        @data_store[key] = data
-      end
-
-      data
-    end
-
-  private
-    def clear_cache_if_stale
-      time_to_clear_cache = @cache_last_reset + @cache_ttl
-      if time_to_clear_cache < Time.now
-        @data_store.clear
-        @cache_last_reset = Time.now
-      end
-    end
-  end
-end

data/test/cache_test.rb

@@ -1,53 +0,0 @@
-require_relative "test_helper"
-
-describe Slimmer::Cache do
-  describe "a cache" do
-    before do
-      @cache = Slimmer::Cache.send(:new)
-      @cache.use_cache = false
-    end
-
-    it "should not save item in cache by default" do
-      @cache.fetch('not-cached') { "value1" }
-      assert_equal 'new-value', @cache.fetch('not-cached') { "new-value" }
-    end
-
-    it "should return passed argument if cache is empty" do
-      @cache.use_cache = true
-
-      assert_equal 'new-value', @cache.fetch('uncached-key') { "new-value" }
-    end
-
-    it "should return cached argument if cache is enabled and warm" do
-      @cache.use_cache = true
-
-      @cache.fetch('cached-key') { "value1" }
-      assert_equal 'value1', @cache.fetch('cached-key') { "new-value" }
-    end
-
-    it "should only cache the template for 5 mins by default" do
-      @cache.use_cache = true
-
-      @cache.fetch('timed-cached-key') { "value1" }
-      Timecop.travel( 5 * 60 - 30) do # now + 4 mins 30 secs
-        assert_equal "value1", @cache.fetch('timed-cached-key') { "value2" }
-      end
-      Timecop.travel( 5 * 60 + 30) do # now + 5 mins 30 secs
-        assert_equal "value3", @cache.fetch('timed-cached-key') { "value3" }
-      end
-    end
-
-    it "should allow overriding the cache ttl" do
-      @cache.use_cache = true
-      @cache.cache_ttl = 10 * 60
-
-      @cache.fetch('ttl-timed-cached-key') { "value1" }
-      Timecop.travel( 10 * 60 - 30) do # now + 9 mins 30 secs
-        assert_equal "value1", @cache.fetch('ttl-timed-cached-key') { "value2" }
-      end
-      Timecop.travel( 10 * 60 + 30) do # now + 10 mins 30 secs
-        assert_equal "value3", @cache.fetch('ttl-timed-cached-key') { "value3" }
-      end
-    end
-  end
-end

data/test/changelog_test.rb

@@ -1,10 +0,0 @@
-require_relative 'test_helper'
-
-describe 'CHANGELOG' do
-
-  it "should have an entry for the current version" do
-    changelog_contents = File.read(File.expand_path("../../CHANGELOG.md", __FILE__))
-
-    assert_match /^#+\s*#{Regexp.escape(Slimmer::VERSION)}/, changelog_contents, "No entry for #{Slimmer::VERSION} found in CHANGELOG.md"
-  end
-end

data/test/component_resolver_test.rb

@@ -1,41 +0,0 @@
-require_relative "test_helper"
-
-describe Slimmer::ComponentResolver do
-  describe "find_templates" do
-    before do
-      @resolver = Slimmer::ComponentResolver.new
-    end
-
-    it "should return nothing if the prefix doesn't match 'govuk_component'" do
-      assert_equal [], @resolver.find_templates('name', 'prefix', false, {}, false)
-    end
-
-    it "should request a valid template from the server" do
-      assert_valid_template_requested('name', 'name.raw.html.erb')
-    end
-
-    it "should request a valid template from the server when a raw template is requested" do
-      assert_valid_template_requested('name.raw', 'name.raw.html.erb')
-    end
-
-    it "should request a valid template from the server when the full template filename is requested" do
-      assert_valid_template_requested('name.raw.html.erb', 'name.raw.html.erb')
-    end
-
-    it "should return a known template in test mode" do
-      @resolver.expects(:test?).returns(true)
-
-      templates = @resolver.find_templates('name', 'govuk_component', false, {}, false)
-      assert_match /<test-govuk-component data-template="govuk_component-name">/, templates.first.args[0]
-    end
-  end
-
-  def assert_valid_template_requested(requested, expected)
-    expected_url = "http://static.dev.gov.uk/templates/govuk_component/#{expected}"
-    stub_request(:get, expected_url).to_return body: "<foo />"
-
-    templates = @resolver.find_templates(requested, 'govuk_component', false, {}, false)
-    assert_requested :get, expected_url
-    assert_equal '<foo />', templates.first.args[0]
-  end
-end

data/test/fixtures/404.html.erb

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Slimmer, yay!</title>
-  </head>
-  <body>
-    <div class="content">
-      <header><h1>Oops! We can't find what you're looking for.</h1></header>
-      <div id="wrapper" class="group">
-      </div>
-    </div>
-  </body>
-</html>

data/test/fixtures/410.html.erb

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Slimmer, yay!</title>
-  </head>
-  <body>
-    <div class="content">
-      <header><h1>That's gone now, sorry.</h1></header>
-      <div id="wrapper" class="group">
-      </div>
-    </div>
-  </body>
-</html>

data/test/fixtures/500.html.erb

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Slimmer, yay!</title>
-  </head>
-  <body>
-    <div class="content">
-      <header><h1>We seem to be having a problem.</h1></header>
-      <div id="wrapper" class="group">
-      </div>
-    </div>
-  </body>
-</html>

data/test/fixtures/core_layout.html.erb

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Slimmer, yay!</title>
-  </head>
-  <body>
-    <header id="global-header"><h1>I AM A TITLE</h1></header>
-
-    <div id="global-breadcrumb" class="header-context">
-      <ol role="navigation"><li>MySite</li></ol>
-    </div>
-
-    <div id="wrapper" class="group">
-    </div>
-
-    <footer id="footer">
-    </footer>
-  </body>
-</html>

data/test/fixtures/proposition_menu.html.erb

@@ -1,7 +0,0 @@
-<div class="header-proposition">
-  <div class="content">
-    <nav id="proposition-menu">
-      <a href="#">Navigation item</a>
-    </nav>
-  </div>
-</div>

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

@@ -1,23 +0,0 @@
-<!-- report_a_problem -->
-<div class="report-a-problem-container">
-  <form accept-charset="UTF-8" action="/feedback" method="post">
-    <div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"></div>
-    <input id="url" name="url" type="hidden" value="<%= request_url %>">
-    <input id="url" name="source" type="hidden" value="<%= source %>">
-    <input id="url" name="page_owner" type="hidden" value="<%= page_owner %>">
-    <label for="what_doing">
-      What were you doing?
-      <input id="what_doing" name="what_doing" type="text">
-    </label>
-    <label for="what_happened">
-      What happened?
-      <input id="what_happened" name="what_happened" type="text">
-    </label>
-    <label for="what_expected">
-      What did you expect to happen?
-      <input id="what_expected" name="what_expected" type="text">
-    </label>
-    <input name="commit" type="submit" value="Submit">
-  </form>
-</div>
-<!-- end report_a_problem -->

data/test/headers_test.rb

@@ -1,57 +0,0 @@
-require_relative "test_helper"
-require "slimmer/headers"
-
-class HeadersTest < MiniTest::Test
-  include Slimmer::Headers
-  attr_accessor :headers
-
-  def setup
-    self.headers = {}
-  end
-
-  def test_should_set_section_header
-    set_slimmer_headers section: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Section"]
-  end
-
-  def test_should_set_format_header
-    set_slimmer_headers format: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Format"]
-  end
-
-  def test_should_set_application_name_header
-    set_slimmer_headers application_name: "whitehall"
-    assert_equal "whitehall", headers["X-Slimmer-Application-Name"]
-  end
-
-  def test_should_set_page_owner_header
-    set_slimmer_headers page_owner: "bobby"
-    assert_equal "bobby", headers["X-Slimmer-Page-Owner"]
-  end
-
-  def test_should_set_organisations_header
-    set_slimmer_headers organisations: "<D123><P1>"
-    assert_equal "<D123><P1>", headers["X-Slimmer-Organisations"]
-  end
-
-  def test_should_set_result_count_header
-    set_slimmer_headers result_count: 3
-    assert_equal "3", headers["X-Slimmer-Result-Count"]
-  end
-
-  def test_should_set_template_header
-    set_slimmer_headers template: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Template"]
-  end
-
-  def test_should_set_skip_header
-    set_slimmer_headers skip: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Skip"]
-  end
-
-  def test_should_raise_an_exception_if_a_header_has_a_typo
-    assert_raises Slimmer::Headers::InvalidHeader do
-      set_slimmer_headers seccion: "wrong"
-    end
-  end
-end

data/test/processors/body_inserter_test.rb

@@ -1,43 +0,0 @@
-require "test_helper"
-
-class BodyInserterTest < MiniTest::Test
-  def test_should_replace_contents_of_wrapper_in_template
-    template = as_nokogiri %{
-      <html><body><div><div id="wrapper"></div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><nav></nav><div id="wrapper"><p>this should be moved</p></div></body></html>
-    }
-
-    Slimmer::Processors::BodyInserter.new.filter(source, template)
-    assert_in template, "#wrapper", %{<p>this should be moved</p>}
-  end
-
-  def test_should_copy_across_unicode_characters_without_messing_with_their_encoding
-    unicode_endash = [0x2013].pack('U*')
-    template = as_nokogiri %{
-      <html><body><div><div id="wrapper"></div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><nav></nav><div id="wrapper"><p>#{unicode_endash}</p></div></body></html>
-    }
-
-    Slimmer::Processors::BodyInserter.new.filter(source, template)
-    assert_equal unicode_endash, template.at_css("#wrapper p").inner_text
-  end
-
-  def test_should_allow_replacement_of_arbitrary_segments_into_wrapper
-    template = as_nokogiri %{
-      <html><body><div>
-      <div id="wrapper">don't touch this</div>
-      </body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><div id="some_other_id"><p>this should be moved</p></div></body></html>
-    }
-
-    Slimmer::Processors::BodyInserter.new("some_other_id").filter(source, template)
-    assert_not_in template, "#wrapper"
-    assert_in template, "#some_other_id", %{<p>this should be moved</p>}
-  end
-end

data/test/processors/header_context_inserter_test.rb

@@ -1,51 +0,0 @@
-require "test_helper"
-
-class HeaderContextInserterTest < MiniTest::Test
-  def test_should_replace_contents_of_header_context_in_template
-    template = as_nokogiri %{
-      <html><body><div><div class="header-context"></div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><nav></nav><div class="header-context"><p>this should be moved</p></div></body></html>
-    }
-
-    Slimmer::Processors::HeaderContextInserter.new.filter(source, template)
-    assert_in template, ".header-context", %{<p>this should be moved</p>}
-  end
-
-  def test_should_replace_classes_of_header_context_in_template
-    template = as_nokogiri %{
-      <html><body><div><div class="header-context template-class"></div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><nav></nav><div class="header-context app-class"><p>this should be moved</p></div></body></html>
-    }
-
-    Slimmer::Processors::HeaderContextInserter.new.filter(source, template)
-    assert_in template, ".header-context.app-class", %{<p>this should be moved</p>}
-    assert_not_in template, ".header-context.template-class"
-  end
-
-  def test_should_do_nothing_if_no_header_context_was_provided
-    template = as_nokogiri %{
-      <html><body><div><div class="header-context">should not be removed</div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><nav></nav></body></html>
-    }
-
-    Slimmer::Processors::HeaderContextInserter.new.filter(source, template)
-    assert_in template, ".header-context", %{should not be removed}
-  end
-
-  def test_should_do_nothing_if_no_header_context_was_present_in_the_template
-    template = as_nokogiri %{
-      <html><body><div></div></body></html>
-    }
-    source = as_nokogiri %{
-      <html><body><div><div class="header-context">should be ignored</div></div></body></html>
-    }
-
-    Slimmer::Processors::HeaderContextInserter.new.filter(source, template) # should not raise
-  end
-end

data/test/processors/inside_header_inserter_test.rb

@@ -1,35 +0,0 @@
-require_relative '../test_helper'
-
-class InsideHeaderInserterTest < MiniTest::Test
-  def test_should_insert_into_header
-    source = as_nokogiri %{
-      <html>
-        <body>
-          <div class="slimmer-inside-header">
-            <h2>Inserted Page Title</h2>
-          </div>
-        </body>
-      </html>
-    }
-    template = as_nokogiri %{
-      <html>
-        <body>
-          <div class="header-global">
-            <div class="header-logo">
-              <a href="https://www.gov.uk/" title="Go to the GOV.UK homepage" id="logo" class="content">
-                <img src="/assets/gov.uk_logotype_crown_invert_trans.png" width="35" height="31" alt="">
-              </a>
-            </div>
-          </div>
-        </body>
-      </html>
-    }
-
-    Slimmer::Processors::InsideHeaderInserter.new.filter(source, template)
-
-    assert_in template,
-      "div.header-global .header-logo + h2",
-      "Inserted Page Title",
-      'Expecting the H2 to be inserted after .header-logo'
-  end
-end