slimmer 15.2.0 → 15.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adfdc8dd1fa7b69450bbbae9daf9cbd352704a621947aad067fc5aabad239132
-  data.tar.gz: ef11b30a4f27806579d0a7e690f9e71b08210d10625722de29b6a320d5cf1840
+  metadata.gz: 5423f67907cfbc074dcc3ec3be3763ee1b4de7194746d3465e2bd8962f131589
+  data.tar.gz: 9378a917a3a686ac18dda3d401596ff3c749f2c45897409cf9ca79af02d19005
 SHA512:
-  metadata.gz: 75bba48992276cc1d656c72271dd6ecb192af0467205cfc12411a8b53b26d65d534f25801b5e70b4a0304fbf08fa6202440891956bd36547f03dc488ec1aee64
-  data.tar.gz: '038f855917b3f9fe4d66c0e15737efadd8b4724e23b47dab25573f18962e0b525449780566421f8b07759d17bda1947bdbc1e75ef032752645126fda9a3378d3'
+  metadata.gz: 0e5d62fedf19a951a60d82df37a9b3ca5258b2f46bc8e521e44050e00ff4755681f07ef6b5a540ea72702d5a5ae86fdd4792b86b9feeff07c1dd47dd075ea085
+  data.tar.gz: 79a18ae53ba25f1d3c3dacb186b1b7d239457b4a3201aad806aefad5547e55368021acdc94c46d35ad479686777c07ee88bf3a7a145237e7f64413b0bd13dd49

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 15.3.0
+
+* Introduce separate, internal exception class for intermittent
+template retrieval errors.
+
 # 15.2.0
 
 * Add X-Slimmer-Show-Accounts header to choose between accounts

data/lib/slimmer.rb

@@ -45,6 +45,7 @@ module Slimmer
     autoload :TitleInserter, "slimmer/processors/title_inserter"
   end
 
-  class TemplateNotFoundException < StandardError; end
   class CouldNotRetrieveTemplate < StandardError; end
+  class TemplateNotFoundException < CouldNotRetrieveTemplate; end
+  class IntermittentRetrievalError < CouldNotRetrieveTemplate; end
 end

data/lib/slimmer/skin.rb

@@ -22,10 +22,18 @@ module Slimmer
     def load_template(template_name)
       url = template_url(template_name)
       HTTPClient.get(url)
-    rescue RestClient::Exception => e
-      raise TemplateNotFoundException, "Unable to fetch: '#{template_name}' from '#{url}' because #{e}", caller
-    rescue Errno::ECONNREFUSED, SocketError, OpenSSL::SSL::SSLError => e
-      raise CouldNotRetrieveTemplate, "Unable to fetch: '#{template_name}' from '#{url}' because #{e}", caller
+    rescue Errno::ECONNREFUSED, SocketError, OpenSSL::SSL::SSLError, RestClient::Exception => e
+      message = "Unable to fetch: '#{template_name}' from '#{url}' because #{e}"
+
+      if e.is_a?(RestClient::Exception) && e.http_code == 404
+        raise TemplateNotFoundException, message, caller
+      end
+
+      if e.is_a?(RestClient::Exception) && [502, 503, 504].include?(e.http_code)
+        raise IntermittentRetrievalError, message, caller
+      end
+
+      raise CouldNotRetrieveTemplate, message, caller
     end
 
     def template_url(template_name)

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "15.2.0".freeze
+  VERSION = "15.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 15.2.0
+  version: 15.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport