slimmer 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ed5125f21b8ffde308600b2d649d12e45a5166
-  data.tar.gz: 8a689fb2a310302d865d56dc9b666613360967e8
+  metadata.gz: 198037ca5d17fc3fc1467bde87d433ff877907e2
+  data.tar.gz: c1c0aaf2f5b4339c30eea89e888b8eea65bfe9af
 SHA512:
-  metadata.gz: da744e5afa6a84e8944a05cc20ee2e5da214c1a7af671f4190e1db67e1a34d7a9e5f550c68edd3f912fecb8cc038acd515b7282ec337cde60786eda2128a9a91
-  data.tar.gz: 24170d05c56821d21052a40aa17899ba27fbefb1e34248cb4b1193d43a10567a689bcad2ad76f60ee869c0cb6cecc5bf5885c13c76344c7aebcfe4cba08467ad
+  metadata.gz: bcca6785e9a96d4cf4053ee4d2c2d549390c6b23a9a85f91d6e3259a1916d3a29979ad2014c9c3ca787c70c3ee8db8a532903b418c6c17b187acb600ec691110
+  data.tar.gz: bfa3b5cc6ea1831bf2b040bc5a3e3be0699e060e47430e2d96931fb816db0e99df8844467a0f30851ef38bde54d59542624e9cdb7d418bcd5338da31474c8284

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 9.2.0
+
+* Raise a custom `CouldNotRetrieveTemplate` exception when a connection to the assets server can't be made because of an SSL problem (PR #143).
+
 # 9.1.0
 
 * Allow applications to request components using full or partial component

data/README.md

@@ -1,3 +1,5 @@
+# Slimmer
+
 Slimmer provides Rack middleware for applying a standard header and footer around pages
 returned by a Ruby (Rack) application.
 
@@ -13,9 +15,11 @@ Plek gem to look for the 'static' (previously 'assets') host for the current env
 If you want to use your own set of templates you will need to specify the appropriate host
 eg.
 
-    YourApp::Application.configure do
-      config.slimmer.asset_host = 'http://your.server.somewhere'
-    end
+```rb
+YourApp::Application.configure do
+  config.slimmer.asset_host = 'http://your.server.somewhere'
+end
+```
 
 it expects to find templates in a folder called 'templates' on that host.
 
@@ -23,17 +27,23 @@ it expects to find templates in a folder called 'templates' on that host.
 
 Slimmer will work as standard rack middleware:
 
-    use Slimmer::App
+```rb
+use Slimmer::App
+```
 
 or
 
-    use Slimmer::App, :asset_host => "http://my.alternative.host"
+```rb
+use Slimmer::App, :asset_host => "http://my.alternative.host"
+```
 
 ## Asset tag helpers
 
 To get asset tag helpers to point to your external asset server, add
 
-    config.action_controller.asset_host = "http://my.alternative.host"
+```rb
+config.action_controller.asset_host = "http://my.alternative.host"
+```
     
 to `application.rb`.
 
@@ -43,23 +53,29 @@ A specific template can be requested by giving its name in the `X-Slimmer-Templa
 
 In a controller action, you can do this by calling `slimmer_template`.
 
-    class MyController < ApplicationController
-      def index
-        slimmer_template 'homepage'
-      end
-    end
+```rb
+class MyController < ApplicationController
+  def index
+    slimmer_template 'homepage'
+  end
+end
+```
 
 There's also a macro style method which will affect all actions:
 
-    class YourController < ApplicationController
-      slimmer_template :admin
-    end
+```rb
+class YourController < ApplicationController
+  slimmer_template :admin
+end
+```
 
 To get this, include Slimmer::Template in your ApplicationController:
 
-    class ApplicationController < ActionController::Base
-      include Slimmer::Template
-    end
+```rb
+class ApplicationController < ActionController::Base
+  include Slimmer::Template
+end
+```
 
 ## Logging
 
@@ -67,9 +83,11 @@ Slimmer can be configured with a logger by passing in a logger instance
 (anything that quacks like an instance of `Logger`). For example, to log
 to the Rails log, put the following in an initializer:
 
-    YourApp::Application.configure do
-      config.slimmer.logger = Rails.logger
-    end
+```rb
+YourApp::Application.configure do
+  config.slimmer.logger = Rails.logger
+end
+```
 
 **Note:** This can't be in `application.rb` because the Rails logger hasn't been initialized by then.
 
@@ -77,21 +95,27 @@ to the Rails log, put the following in an initializer:
 
 By default if you pass in a logger with its log level set to `debug`, slimmer will dup this logger and reduce the level to `info`. (Slimmer's debug logging is very noisy).  To prevent this, set the `enable_debugging` option to true.  e.g. for Rails:
 
-    YourApp::Application.configure do
-      config.slimmer.enable_debugging = true
-    end
+```rb
+YourApp::Application.configure do
+  config.slimmer.enable_debugging = true
+end
+```
 
 ## Shared components
 
 To use shared template components you need to include the shared template resolver
 
-    class ApplicationController < ActionController::Base
-      include Slimmer::SharedTemplates
-    end
+```rb
+class ApplicationController < ActionController::Base
+  include Slimmer::SharedTemplates
+end
+```
 
 This will make calls out to static when you try and render a partial prefixed with `govuk-component`:
 
-    <%= render partial: 'govuk-component/example_component' %>
+```erb
+<%= render partial: 'govuk-component/example_component' %>
+```
 
 You will need a copy of static running for the templates to be loaded from.
 
@@ -105,19 +129,25 @@ A test helper is included which returns a CSS selector for finding a given
 component to assert that it was used. You can make it available in your tests
 with:
 
-    require 'slimmer/test_helpers/shared_templates'
-    include Slimmer::TestHelpers::SharedTemplates
+```rb
+require 'slimmer/test_helpers/shared_templates'
+include Slimmer::TestHelpers::SharedTemplates
+```
 
 And then assert that the component has been used:
 
-    page.should have_css(shared_component_selector('metadata'))
+```rb
+page.should have_css(shared_component_selector('metadata'))
+```
 
 Or look for one of the arguments to the component which will have been
 `JSON.dump`ed inside the tag:
 
-    within(shared_component_selector('title')) do
-      expect(page).to have_content(expected_title_text)
-    end
+```rb
+within(shared_component_selector('title')) do
+  expect(page).to have_content(expected_title_text)
+end
+```
 
 ## The name
 

data/lib/slimmer/skin.rb

@@ -28,9 +28,7 @@ module Slimmer
       response.body
     rescue RestClient::Exception => e
       raise TemplateNotFoundException, "Unable to fetch: '#{template_name}' from '#{url}' because #{e}", caller
-    rescue Errno::ECONNREFUSED => e
-      raise CouldNotRetrieveTemplate, "Unable to fetch: '#{template_name}' from '#{url}' because #{e}", caller
-    rescue SocketError => e
+    rescue Errno::ECONNREFUSED, SocketError, OpenSSL::SSL::SSLError => e
       raise CouldNotRetrieveTemplate, "Unable to fetch: '#{template_name}' from '#{url}' because #{e}", caller
     end
 

data/lib/slimmer/test_templates/header_footer_only.html

@@ -16,8 +16,8 @@
 
     <footer id="footer"></footer>
 
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/govuk-template.js" type="text/javascript"></script>
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/libs/jquery/jquery-1.7.2.js" type="text/javascript"></script>
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/header-footer-only.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/govuk-template.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/libs/jquery/jquery-1.7.2.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/header-footer-only.js" type="text/javascript"></script>
   </body>
 </html>

data/lib/slimmer/test_templates/wrapper.html

@@ -16,8 +16,8 @@
 
     <footer id="footer"></footer>
 
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/govuk-template.js" type="text/javascript"></script>
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/libs/jquery/jquery-1.7.2.js" type="text/javascript"></script>
-    <script src="https://assets.digital.cabinet-office.gov.uk/static/application.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/govuk-template.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/libs/jquery/jquery-1.7.2.js" type="text/javascript"></script>
+    <script src="https://assets.publishing.service.gov.uk/static/application.js" type="text/javascript"></script>
   </body>
 </html>

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '9.1.0'
+  VERSION = '9.2.0'
 end

data/test/skin_test.rb

@@ -84,6 +84,17 @@ describe Slimmer::Skin do
         skin.template 'example'
       end
     end
+
+    it "should raise appropriate exception when encountering an SSL error" do
+      skin = Slimmer::Skin.new asset_host: "https://bad-ssl.domain/", cache: Slimmer::Cache.instance
+
+      expected_url = "https://bad-ssl.domain/templates/example.html.erb"
+      stub_request(:get, expected_url).to_raise(OpenSSL::SSL::SSLError)
+
+      assert_raises(Slimmer::CouldNotRetrieveTemplate) do
+        skin.template 'example'
+      end
+    end
   end
 
   describe "parsing artefact from header" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -336,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slimmer
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Thinner than the skinner