slimmer 4.2.0 → 4.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.2.1
+
+* Use a shared cache between shared templates and skin templates so that they
+  all update together
+
 # 4.2.0
 
 * Add ability to load shared erb templates over the network

data/lib/slimmer.rb

@@ -17,6 +17,8 @@ module Slimmer
   autoload :Railtie, 'slimmer/railtie'
   autoload :Skin, 'slimmer/skin'
 
+  autoload :Cache, 'slimmer/cache'
+
   autoload :Template, 'slimmer/template'
   autoload :App, 'slimmer/app'
   autoload :Headers, 'slimmer/headers'

data/lib/slimmer/app.rb

@@ -28,7 +28,10 @@ module Slimmer
         options[:asset_host] = Plek.current.find("static")
       end
 
-      @skin = Skin.new options.merge(logger: self.logger)
+      cache = Cache.instance
+      cache.use_cache = options[:use_cache] if options[:use_cache]
+
+      @skin = Skin.new options.merge(logger: self.logger, cache: cache)
     end
 
     def call(env)

data/lib/slimmer/cache.rb

@@ -0,0 +1,46 @@
+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/lib/slimmer/component_resolver.rb

@@ -3,14 +3,23 @@ require 'active_support/core_ext/string/inflections'
 
 module Slimmer
   class ComponentResolver < ::ActionView::Resolver
+    def self.caching
+      # this turns off the default ActionView::Resolver caching which caches
+      # all templates for the duration of the current process in production
+      false
+    end
+
     def find_templates(name, prefix, partial, details)
       return [] unless prefix == 'govuk_component'
+      cache = Cache.instance
 
       template_path = [prefix, name].join('/')
       if test?
         template_body = test_body(template_path)
       else
-        template_body = fetch(template_url(template_path))
+        template_body = cache.fetch(template_path) do
+          fetch(template_url(template_path))
+        end
       end
 
       details = {

data/lib/slimmer/skin.rb

@@ -3,28 +3,19 @@ require 'slimmer/govuk_request_id'
 
 module Slimmer
   class Skin
-    attr_accessor :use_cache, :template_cache, :asset_host, :logger, :strict, :options
+    attr_accessor :template_cache, :asset_host, :logger, :strict, :options
 
-    # TODO: Extract the cache to something we can pass in instead of using
-    # true/false and an in-memory cache.
     def initialize options = {}
       @options = options
       @asset_host = options[:asset_host]
-
-      @use_cache = options[:use_cache] || false
-      @cache_ttl = options[:cache_ttl] || (15 * 60) # 15 mins
-      @template_cache = LRUCache.new(:ttl => @cache_ttl) if @use_cache
+      @template_cache = options[:cache]
 
       @logger = options[:logger] || NullLogger.instance
       @strict = options[:strict] || (%w{development test}.include?(ENV['RACK_ENV']))
     end
 
     def template(template_name)
-      if use_cache
-        template_cache.fetch(template_name) do
-          load_template(template_name)
-        end
-      else
+      template_cache.fetch(template_name) do
         load_template(template_name)
       end
     end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

data/test/cache_test.rb

@@ -0,0 +1,53 @@
+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/headers_test.rb

@@ -1,7 +1,7 @@
 require_relative "test_helper"
 require "slimmer/headers"
 
-class HeadersTest < MiniTest::Unit::TestCase
+class HeadersTest < MiniTest::Test
   include Slimmer::Headers
   attr_accessor :headers
 

data/test/processors/alpha_label_inserter_test.rb

@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class AlphaLabelInserterTest < MiniTest::Unit::TestCase
+class AlphaLabelInserterTest < MiniTest::Test
 
   def setup
     super

data/test/processors/beta_label_inserter_test.rb

@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class BetaLabelInserterTest < MiniTest::Unit::TestCase
+class BetaLabelInserterTest < MiniTest::Test
 
   def setup
     super

data/test/processors/body_inserter_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class BodyInserterTest < MiniTest::Unit::TestCase
+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>

data/test/processors/header_context_inserter_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class HeaderContextInserterTest < MiniTest::Unit::TestCase
+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>

data/test/processors/navigation_mover_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class NavigationMoverTest < MiniTest::Unit::TestCase
+class NavigationMoverTest < MiniTest::Test
   def setup
     super
     @proposition_header_block = File.read( File.dirname(__FILE__) + "/../fixtures/proposition_menu.html.erb" )

data/test/processors/related_items_inserter_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'gds_api/test_helpers/content_api'
 
-class RelatedItemsInserterTest < MiniTest::Unit::TestCase
+class RelatedItemsInserterTest < MiniTest::Test
   include GdsApi::TestHelpers::ContentApi
 
   def setup

data/test/processors/report_a_problem_inserter_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class ReportAProblemInserterTest < MiniTest::Unit::TestCase
+class ReportAProblemInserterTest < MiniTest::Test
 
   def setup
     super

data/test/processors/section_inserter_test.rb

@@ -1,7 +1,7 @@
 require_relative "../test_helper"
 require 'gds_api/test_helpers/content_api'
 
-class SectionInserterTest < MiniTest::Unit::TestCase
+class SectionInserterTest < MiniTest::Test
   include GdsApi::TestHelpers::ContentApi
 
   def create_artefact(slug, attributes = {})

data/test/processors/tag_mover_test.rb

@@ -1,6 +1,6 @@
 require_relative "../test_helper"
 
-class TagMoverTest < MiniTest::Unit::TestCase
+class TagMoverTest < MiniTest::Test
   def setup
     super
     @source = as_nokogiri %{

data/test/skin_test.rb

@@ -4,7 +4,8 @@ describe Slimmer::Skin do
 
   describe "loading templates" do
     it "should be able to load the template" do
-      skin = Slimmer::Skin.new asset_host: "http://example.local/"
+      skin = Slimmer::Skin.new asset_host: "http://example.local/", cache: Slimmer::Cache.instance
+
       expected_url = "http://example.local/templates/example.html.erb"
       stub_request(:get, expected_url).to_return :body => "<foo />"
 
@@ -16,7 +17,8 @@ describe Slimmer::Skin do
 
     describe "should pass the GOVUK-Request-Id header when requesting the template" do
       before do
-        @skin = Slimmer::Skin.new asset_host: "http://example.local/"
+        @skin = Slimmer::Skin.new asset_host: "http://example.local/", cache: Slimmer::Cache.instance
+
         @expected_url = "http://example.local/templates/example.html.erb"
         stub_request(:get, @expected_url).to_return :body => "<foo />"
       end
@@ -42,81 +44,17 @@ describe Slimmer::Skin do
       end
     end
 
-    describe "template caching" do
-      it "should not cache the template by default" do
-        skin = Slimmer::Skin.new asset_host: "http://example.local/"
-        expected_url = "http://example.local/templates/example.html.erb"
-        stub_request(:get, expected_url).to_return :body => "<foo />"
-
-        first_access = skin.template 'example'
-        second_access = skin.template 'example'
-
-        assert_requested :get, "http://example.local/templates/example.html.erb", times: 2
-      end
-
-      it "should cache the template when requested" do
-        skin = Slimmer::Skin.new asset_host: "http://example.local/", use_cache: true
-        expected_url = "http://example.local/templates/example.html.erb"
-        stub_request(:get, expected_url).to_return :body => "<foo />"
-
-        first_access = skin.template 'example'
-        second_access = skin.template 'example'
-
-        assert_requested :get, "http://example.local/templates/example.html.erb", times: 1
-        assert_same first_access, second_access
-      end
-
-      it "should only cache the template for 15 mins by default" do
-        skin = Slimmer::Skin.new asset_host: "http://example.local/", use_cache: true
-        expected_url = "http://example.local/templates/example.html.erb"
-        stub_request(:get, expected_url).to_return :body => "<foo />"
-
-        first_access = skin.template 'example'
-        second_access = skin.template 'example'
-
-        assert_requested :get, "http://example.local/templates/example.html.erb", times: 1
-        assert_same first_access, second_access
-
-        Timecop.travel( 15 * 60 - 30) do # now + 14 mins 30 secs
-          third_access = skin.template 'example'
-          assert_requested :get, "http://example.local/templates/example.html.erb", times: 1
-          assert_same first_access, third_access
-        end
+    it "should try and load templates from the cache" do
+      skin = Slimmer::Skin.new asset_host: "http://example.local/", cache: Slimmer::Cache.instance
 
-        Timecop.travel( 15 * 60 + 30) do # now + 15 mins 30 secs
-          fourth_access = skin.template 'example'
-          assert_requested :get, "http://example.local/templates/example.html.erb", times: 2
-          assert_equal first_access, fourth_access
-        end
-      end
-
-      it "should allow overriding the cache ttl" do
-        skin = Slimmer::Skin.new asset_host: "http://example.local/", use_cache: true, cache_ttl: 5 * 60
-        expected_url = "http://example.local/templates/example.html.erb"
-        stub_request(:get, expected_url).to_return :body => "<foo />"
-
-        first_access = skin.template 'example'
-        second_access = skin.template 'example'
-
-        assert_requested :get, "http://example.local/templates/example.html.erb", times: 1
-        assert_same first_access, second_access
-
-        Timecop.travel( 5 * 60 - 30) do # now + 4 mins 30 secs
-          third_access = skin.template 'example'
-          assert_requested :get, "http://example.local/templates/example.html.erb", times: 1
-          assert_same first_access, third_access
-        end
-
-        Timecop.travel( 5 * 60 + 30) do # now + 5 mins 30 secs
-          fourth_access = skin.template 'example'
-          assert_requested :get, "http://example.local/templates/example.html.erb", times: 2
-          assert_equal first_access, fourth_access
-        end
-      end
+      Slimmer::Cache.instance.expects(:fetch).with('example-template').returns('cache data')
+      template = skin.template 'example-template'
+      assert_equal 'cache data', template
     end
 
     it "should raise appropriate exception when template not found" do
-      skin = Slimmer::Skin.new asset_host: "http://example.local/"
+      skin = Slimmer::Skin.new asset_host: "http://example.local/", cache: Slimmer::Cache.instance
+
       expected_url = "http://example.local/templates/example.html.erb"
       stub_request(:get, expected_url).to_return(:status => '404')
 
@@ -126,7 +64,8 @@ describe Slimmer::Skin do
     end
 
     it "should raise appropriate exception when cant reach template host" do
-      skin = Slimmer::Skin.new asset_host: "http://example.local/"
+      skin = Slimmer::Skin.new asset_host: "http://example.local/", cache: Slimmer::Cache.instance
+
       expected_url = "http://example.local/templates/example.html.erb"
       stub_request(:get, expected_url).to_raise(Errno::ECONNREFUSED)
 
@@ -136,7 +75,8 @@ describe Slimmer::Skin do
     end
 
     it "should raise appropriate exception when hostname cannot be resolved" do
-      skin = Slimmer::Skin.new asset_host: "http://non-existent.domain/"
+      skin = Slimmer::Skin.new asset_host: "http://non-existent.domain/", cache: Slimmer::Cache.instance
+
       expected_url = "http://non-existent.domain/templates/example.html.erb"
       stub_request(:get, expected_url).to_raise(SocketError)
 
@@ -148,7 +88,7 @@ describe Slimmer::Skin do
 
   describe "parsing artefact from header" do
     before do
-      @skin = Slimmer::Skin.new
+      @skin = Slimmer::Skin.new cache: Slimmer::Cache.instance
       @headers = {}
       @response = stub("Response", :headers => @headers)
     end

data/test/test_helper.rb

@@ -1,14 +1,13 @@
 require_relative '../lib/slimmer'
 require 'minitest/autorun'
-require 'minitest/unit'
 require 'rack/test'
 require 'json'
 require 'logger'
-require 'mocha'
+require 'mocha/setup'
 require 'timecop'
 require 'gds_api/test_helpers/content_api'
 
-class MiniTest::Unit::TestCase
+MiniTest::Test.class_eval do
   def as_nokogiri(html_string)
     Nokogiri::HTML.parse(html_string.strip)
   end
@@ -59,7 +58,7 @@ module ActionView
   end
 end
 
-class SlimmerIntegrationTest < MiniTest::Unit::TestCase
+class SlimmerIntegrationTest < MiniTest::Test
   include Rack::Test::Methods
   include GdsApi::TestHelpers::ContentApi
 

data/test/test_template_dependency_on_static_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class TestTemplateDependencyOnStaticTest < MiniTest::Unit::TestCase
+class TestTemplateDependencyOnStaticTest < MiniTest::Test
   def test_scripts_on_static_referenced_in_test_templates_exist
     template_path = File.dirname(__FILE__).gsub('/test', '/lib/slimmer/test_templates')
     Dir.foreach(template_path) do | template_file_name |

data/test/typical_usage_test.rb

@@ -153,7 +153,7 @@ module TypicalUsage
     }
     def test_should_find_conditional_comments_copied_into_the_head
       element = Nokogiri::HTML.parse(last_response.body).at_xpath('//comment()')
-      assert_match element.to_s, /app-ie\.css/, 'Not found conditional comment in output'
+      assert_match /app-ie\.css/, element.to_s, 'Not found conditional comment in output'
     end
   end
 
@@ -168,7 +168,7 @@ module TypicalUsage
     def test_should_find_stylesheet_wrapped_with_conditional_comments
       assert_rendered_in_template "head link[href='app.css']"
       element = Nokogiri::HTML.parse(last_response.body).at_xpath('/html/head')
-      assert_match element.to_s, /<!--\[if gt IE 8\]><!-->.*app\.css.*<!--<!\[endif\]-->/m, 'Not found conditional comment in output'
+      assert_match /<!--\[if gt IE 8\]><!-->.*app\.css.*<!--<!\[endif\]-->/m, element.to_s, 'Not found conditional comment in output'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7368960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,15 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+  version_requirements: *7368960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7367000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.5
+  version_requirements: *7367000
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7326660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.8
+  version_requirements: *7326660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7325300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7325300
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7711280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,31 +66,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *7711280
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &7708660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: lrucache
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.3
+  version_requirements: *7708660
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &7794880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,31 +88,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7794880
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &7876860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '5.4'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *7876860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &7876240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *7876240
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7875600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -150,47 +121,32 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.1
+  version_requirements: *7875600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7874720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.4
+  version_requirements: *7874720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7871200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.18.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.11.0
+  version_requirements: *7871200
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7939300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,15 +154,10 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.2
+  version_requirements: *7939300
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7991860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -214,31 +165,21 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
+  version_requirements: *7991860
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7990140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.7.1
+  version_requirements: *7990140
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7989560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -246,28 +187,7 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
+  version_requirements: *7989560
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -296,6 +216,7 @@ files:
 - 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
@@ -334,6 +255,7 @@ files:
 - test/fixtures/beta_notice.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
@@ -363,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3545050969228992216
+      hash: -2123745403723788320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -372,10 +294,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3545050969228992216
+      hash: -2123745403723788320
 requirements: []
 rubyforge_project: slimmer
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Thinner than the skinner
@@ -397,6 +319,7 @@ test_files:
 - test/fixtures/beta_notice.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