slimmer 10.1.2 → 10.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf1be878da47f0dac30e1d4da176bcf05377d3f1
-  data.tar.gz: f2097a93fe3ec0695f44930d4f1ea17d545c81a3
+  metadata.gz: c68306884f599c1b2c0ec09ab343531783a40465
+  data.tar.gz: 3c6e6dfed7ca6d702b47f36a93f933d4a842fbc0
 SHA512:
-  metadata.gz: 9efdaad3a7bfc7f8a505c3b57b8c1bea7348171dd063591b6973940fc2f552e70f825e1ea76141000256cde9a8dbd9ea444080855be3ef953b2bd965614f30ca
-  data.tar.gz: fae17cd6cd6aa4b095f3e9e58833872ac6ab4166be469a164bd20aecf1853335a516c011c660c8c202ed3603e436dae5465da12e263c43da90ddec6fc86c1865
+  metadata.gz: 25903ce0805883946d9485de6db6526f583f3e93673dfae7b36c30808ae054d9a2248658f3971a7d75480457995810fe78cb1cf36c4a1461c3e230d16ba29579
+  data.tar.gz: f2de6e5c472d76b9f5ce879591efe8479e8ae53711182c076805a18ad7c2b83d227942c8f0a2acfc0cf38479d153eca24e77ee432eb5e22fc0b8d1be9bcd2625

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 10.1.3
+
+* Fix memory leak in components
+
 # 10.1.2
 
 * Bugfix for request URI's encoded as ASCII

data/lib/slimmer/component_resolver.rb

@@ -5,12 +5,6 @@ module Slimmer
   class ComponentResolver < ::ActionView::Resolver
     TEST_TAG_NAME = 'test-govuk-component'
 
-    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, outside_app_allowed = false)
       return [] unless prefix == 'govuk_component'
 

data/lib/slimmer/govuk_components.rb

@@ -17,17 +17,41 @@ module Slimmer
 
     # @private
     def add_govuk_components
-      append_view_path Slimmer::ComponentResolver.new
+      append_view_path GovukComponents.expiring_resolver_cache.resolver
 
       return if slimmer_backend_included?
       I18n.backend = I18n::Backend::Chain.new(I18n.backend, Slimmer::I18nBackend.new)
     end
 
+    # @private
+    def self.expiring_resolver_cache
+      @expiring_resolver_cache ||= TimedExpirationResolverCache.new
+    end
+
   private
 
     def slimmer_backend_included?
       I18n.backend.is_a?(I18n::Backend::Chain) &&
         I18n.backend.backends.any? { |b| b.is_a? Slimmer::I18nBackend }
     end
+
+    # Slimmer::ComponentResolver instantiates a lot of large objects and leaks
+    # memory. This class will cache the resolver so that it doesn't have to
+    # create new ActionView::Template objects for each request. The cache is
+    # timed to allow frontends to pick up changes made to components in `static`.
+    class TimedExpirationResolverCache
+      def initialize
+        @cache_last_reset = Time.now
+      end
+
+      def resolver
+        if (@cache_last_reset + Slimmer::CACHE_TTL) < Time.now
+          @resolver = nil
+          @cache_last_reset = Time.now
+        end
+
+        @resolver ||= Slimmer::ComponentResolver.new
+      end
+    end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '10.1.2'
+  VERSION = '10.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 10.1.2
+  version: 10.1.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri