slimmer 9.3.1 → 9.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6039bc564c32247a980528bfd6ed8117fdf350a
-  data.tar.gz: 8521f622319f6f03d771460a10679c4dbd8d2c01
+  metadata.gz: 2d5c3207c4bf5ea390a1ea416f0c784c52b7747b
+  data.tar.gz: 3515b2b3a43ac282609b0dd57d461b40ef1001ef
 SHA512:
-  metadata.gz: c05b8d066db7a939c44bf946b9b10c66790e199331ee7aa01645e1cb46cc6f44976c4ba8e80bc0dbd0c90b420ed4a588cd78d625bf88fe6cc123ed955874638a
-  data.tar.gz: d08a0d9843664cff85ea436a12a080b863c93f3bac71f65700f0333c235c77d128831cafd1143f1e5c1a1325657027e044ada04d55d9df4517fed5eb4e918140
+  metadata.gz: 46785c3a9f016774622517c990e6e2f968525e59c5dd387ffb6959e973606d26e960a0a84a1d894b0075175cf687189a683206456492c6626395a081d644c424
+  data.tar.gz: c866f1183b302ce713287450a00e5a7950e840577531d2f3034bb46c6a35a1b1a48817da79faf7b9b437de6167770b70085b50676e79c5a8b9bd0d7695a9bb72

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 9.3.2
+
+* Bugfix: Over time, the I18n backend would be chained in each request,
+  causing the stack to grow too large and use too much memory
+
+  (PR #157 https://github.com/alphagov/slimmer/pull/157)
+
 # 9.3.1
 
 * Allows frontend apps to stub component locales for example

data/lib/slimmer/shared_templates.rb

@@ -5,9 +5,17 @@ module Slimmer
     end
 
     def add_shared_templates
+      append_view_path Slimmer::ComponentResolver.new
+
+      return if slimmer_backend_included?
       I18n.backend = I18n::Backend::Chain.new(I18n.backend, Slimmer::I18nBackend.new)
+    end
 
-      append_view_path Slimmer::ComponentResolver.new
+  private
+
+    def slimmer_backend_included?
+      I18n.backend.is_a?(I18n::Backend::Chain) &&
+        I18n.backend.backends.any? { |b| b.is_a? Slimmer::I18nBackend }
     end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '9.3.1'
+  VERSION = '9.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 9.3.1
+  version: 9.3.2
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri