slimmer 13.2.0 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 966481420a36ac4cbaf811706d2ae142b9ce1556c6b8be10ca682766cbe8e2e6
-  data.tar.gz: 79cb54e5f8d0db751cbc40ff3acd6c573395fec2e13e4bb9e43021b93c69a3a4
+  metadata.gz: 5e29edb1500e56cda58cd5b43463f19beb2b8e1e53a2a0c0c7bf4f88b1542c3d
+  data.tar.gz: 90a425692e649c7f941f9f45a8966babff2f31dc888ada70d47ea86b7b365002
 SHA512:
-  metadata.gz: cd9b2d065c5cc805cc92f84728fb4990352030ac25ad5f8ad024b5794e90bc52b82c04f08eb1a7adfbd45abef17849e2ae977d95f579f3d184d290af5a9a4d3b
-  data.tar.gz: d846dd0e2ce3edcb9503708e0c162e5899530e988abf6513a785bef995cc2193df948718892e3200d4408e3ee79b34aead7a9ccec4af042b6214a98f480444b7
+  metadata.gz: 2132180bb938d0db3a8dfe094a45b173254b52ec6847977480ae14a9ceec8a2c44da0dd54bfc7c4f062a2e050710ac5cdf3137b46a238993c40b148df631032f
+  data.tar.gz: cb45e29c4f0d6d3874352a89f29146cc154279430a58535fe3e9ff6d46e53900171534a29209e5432f203073fe1708f578181d800f595d07844be52eda8d15f4

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+# 14.0.0
+
+* Remove handling of non-200 responses (#245)
+
+# 13.4.0
+
+* Revert X-Slimmer-Ignore-Error header (#246)
+
+# 13.3.0
+
+* Add X-Slimmer-Ignore-Error header flag to prevent overriding non-200 status responses
+
+# 13.2.2
+
+* Fix bug where parent_name was called without app
+
+# 13.2.1
+
+* Fix deprecation warning: `Module#parent_name` has been renamed to
+  `module_parent_name`. `parent_name` is deprecated and will be removed in
+  Rails 6.1. (#237)
+* Migrate from govuk-lint to rubocop-govuk (#237)
+* Remove lint rake task (#237)
+* Fix linting issues (#237)
+* Fix deprecation warning: Mocha deprecation warning at
+  /my/local/path/to/test/test_helper.rb:6:in 'require': Require
+  'mocha/test_unit', 'mocha/minitest' or 'mocha/api' instead of 'mocha/setup'.
+  (#237)
+
 # 13.2.0
 
 * Upgrade Ruby version to 2.6.5. (#234)

data/Rakefile

@@ -2,9 +2,9 @@
 
 require "bundler/gem_tasks"
 require "rdoc/task"
-require 'rake/testtask'
+require "rake/testtask"
 
-Dir.glob('lib/tasks/*.rake').each { |r| import r }
+Dir.glob("lib/tasks/*.rake").each { |r| import r }
 
 RDoc::Task.new do |rd|
   rd.rdoc_files.include("lib/**/*.rb")
@@ -18,4 +18,4 @@ Rake::TestTask.new("test") do |t|
   t.verbose = true
 end
 
-task :default => [:test, :lint]
+task default: %i[test]

data/bin/render_slimmer_error

@@ -1,26 +1,25 @@
 #! /usr/bin/env ruby
 
-require 'optparse'
-require 'slimmer'
-require 'logger'
+require "optparse"
+require "slimmer"
+require "logger"
 
 options = {}
-OptionParser.new do |opts|
-  opts.on '-t', '--template=TEMPLATE',
-    'Template to render' do |v|
+option_parser = OptionParser.new do |opts|
+  opts.on "-t", "--template=TEMPLATE", "Template to render" do |v|
     options[:template] = v
   end
 
-  opts.on '-h', '--asset-host=HOST',
-    'Host that serves assets used in the template' do |v|
+  opts.on "-h", "--asset-host=HOST", "Host that serves assets used in the template" do |v|
     options[:asset_host] = v
   end
 
-  opts.on '-o', '--output-file=FILE',
-    'File to write static error page to' do |v|
+  opts.on "-o", "--output-file=FILE", "File to write static error page to" do |v|
     options[:file] = v
   end
-end.parse!
+end
+
+option_parser.parse!
 
 raise "Please specify a template" unless options[:template]
 raise "Please specify an asset host" unless options[:asset_host]
@@ -28,13 +27,13 @@ raise "Please specify an output file" unless options[:file]
 
 logger = Logger.new STDOUT
 logger.level = Logger::DEBUG
-skin = Slimmer::Skin.new options[:asset_host], false, :logger => logger
+skin = Slimmer::Skin.new options[:asset_host], false, logger: logger
 static_error = skin.error nil, options[:template], Nokogiri::HTML("").to_html
 
-if options[:file] == '-'
+if options[:file] == "-"
   STDOUT.print static_error
 else
-  File.open options[:file], 'w' do |f|
+  File.open options[:file], "w" do |f|
     f.print static_error
   end
 end

data/lib/slimmer.rb

@@ -1,10 +1,10 @@
-require 'nokogiri'
-require 'erb'
-require 'plek'
-require 'null_logger'
+require "nokogiri"
+require "erb"
+require "plek"
+require "null_logger"
 
-require 'slimmer/version'
-require 'slimmer/railtie' if defined? Rails
+require "slimmer/version"
+require "slimmer/railtie" if defined? Rails
 
 module Slimmer
   CACHE_TTL = 60
@@ -19,29 +19,29 @@ module Slimmer
     end
   end
 
-  autoload :Railtie, 'slimmer/railtie'
-  autoload :Skin, 'slimmer/skin'
+  autoload :Railtie, "slimmer/railtie"
+  autoload :Skin, "slimmer/skin"
 
-  autoload :Template, 'slimmer/template'
-  autoload :App, 'slimmer/app'
-  autoload :Headers, 'slimmer/headers'
-  autoload :HTTPClient, 'slimmer/http_client'
+  autoload :Template, "slimmer/template"
+  autoload :App, "slimmer/app"
+  autoload :Headers, "slimmer/headers"
+  autoload :HTTPClient, "slimmer/http_client"
 
   module Processors
-    autoload :BodyClassCopier, 'slimmer/processors/body_class_copier'
-    autoload :BodyInserter, 'slimmer/processors/body_inserter'
-    autoload :ConditionalCommentMover, 'slimmer/processors/conditional_comment_mover'
-    autoload :FooterRemover, 'slimmer/processors/footer_remover'
-    autoload :MetadataInserter, 'slimmer/processors/metadata_inserter'
-    autoload :HeaderContextInserter, 'slimmer/processors/header_context_inserter'
-    autoload :InsideHeaderInserter, 'slimmer/processors/inside_header_inserter'
-    autoload :NavigationMover, 'slimmer/processors/navigation_mover'
-    autoload :SearchIndexSetter, 'slimmer/processors/search_index_setter'
-    autoload :SearchPathSetter, 'slimmer/processors/search_path_setter'
-    autoload :SearchParameterInserter, 'slimmer/processors/search_parameter_inserter'
-    autoload :SearchRemover, 'slimmer/processors/search_remover'
-    autoload :TagMover, 'slimmer/processors/tag_mover'
-    autoload :TitleInserter, 'slimmer/processors/title_inserter'
+    autoload :BodyClassCopier, "slimmer/processors/body_class_copier"
+    autoload :BodyInserter, "slimmer/processors/body_inserter"
+    autoload :ConditionalCommentMover, "slimmer/processors/conditional_comment_mover"
+    autoload :FooterRemover, "slimmer/processors/footer_remover"
+    autoload :MetadataInserter, "slimmer/processors/metadata_inserter"
+    autoload :HeaderContextInserter, "slimmer/processors/header_context_inserter"
+    autoload :InsideHeaderInserter, "slimmer/processors/inside_header_inserter"
+    autoload :NavigationMover, "slimmer/processors/navigation_mover"
+    autoload :SearchIndexSetter, "slimmer/processors/search_index_setter"
+    autoload :SearchPathSetter, "slimmer/processors/search_path_setter"
+    autoload :SearchParameterInserter, "slimmer/processors/search_parameter_inserter"
+    autoload :SearchRemover, "slimmer/processors/search_remover"
+    autoload :TagMover, "slimmer/processors/tag_mover"
+    autoload :TitleInserter, "slimmer/processors/title_inserter"
   end
 
   class TemplateNotFoundException < StandardError; end

data/lib/slimmer/app.rb

@@ -1,4 +1,4 @@
-require 'slimmer/govuk_request_id'
+require "slimmer/govuk_request_id"
 
 module Slimmer
   class App
@@ -10,15 +10,11 @@ module Slimmer
 
       logger = options[:logger] || NullLogger.instance
       self.logger = logger
-      begin
-        if logger.level.zero? # Log set to debug level
-          unless options[:enable_debugging]
-            self.logger = logger.dup
-            self.logger.level = 1 # info
-          end
+      if logger&.level&.zero? # Log set to debug level
+        unless options[:enable_debugging]
+          self.logger = logger.dup
+          self.logger.level = 1 # info
         end
-      rescue NoMethodError # rubocop:disable Lint/HandleExceptions
-        # In case logger doesn't respond_to? :level
       end
 
       if options.key? :template_path
@@ -56,11 +52,11 @@ module Slimmer
     end
 
     def in_development?
-      ENV['RAILS_ENV'] == 'development'
+      ENV["RAILS_ENV"] == "development"
     end
 
     def skip_slimmer_param?(env)
-      skip = Rack::Request.new(env).params['skip_slimmer']
+      skip = Rack::Request.new(env).params["skip_slimmer"]
       skip && skip.to_i.positive?
     end
 
@@ -84,26 +80,16 @@ module Slimmer
 
     def rewrite_response(env, response)
       request = Rack::Request.new(env)
+      return response.finish unless response.status == 200
 
       # Store the request id so it can be passed on with any template requests
-      GovukRequestId.value = env['HTTP_GOVUK_REQUEST_ID']
-
-      rewritten_body = case response.status
-                       when 200
-                         @skin.success request, response, s(response.body)
-                       when 403
-                         @skin.error '403', s(response.body), request.env
-                       when 404
-                         @skin.error '404', s(response.body), request.env
-                       when 410
-                         @skin.error '410', s(response.body), request.env
-                       else
-                         @skin.error '500', s(response.body), request.env
-                       end
+      GovukRequestId.value = env["HTTP_GOVUK_REQUEST_ID"]
 
+      rewritten_body = @skin.success request, response, s(response.body)
       rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
+
       response.body = rewritten_body
-      response.headers['Content-Length'] = content_length(response.body)
+      response.headers["Content-Length"] = content_length(response.body)
 
       response.finish
     end

data/lib/slimmer/cucumber.rb

@@ -1,3 +1,3 @@
-require 'cucumber'
+require "cucumber"
 
-require 'slimmer/test'
+require "slimmer/test"

data/lib/slimmer/processors/body_class_copier.rb

@@ -2,11 +2,11 @@ module Slimmer::Processors
   class BodyClassCopier
     def filter(src, dest)
       src_body_tag = src.at_css("body")
-      dest_body_tag = dest.at_css('body')
+      dest_body_tag = dest.at_css("body")
       if src_body_tag.has_attribute?("class")
-        combinded_classes = dest_body_tag.attr('class').to_s.split(/ +/)
-        combinded_classes << src_body_tag.attr('class').to_s.split(/ +/)
-        dest_body_tag.set_attribute("class", combinded_classes.join(' '))
+        combinded_classes = dest_body_tag.attr("class").to_s.split(/ +/)
+        combinded_classes << src_body_tag.attr("class").to_s.split(/ +/)
+        dest_body_tag.set_attribute("class", combinded_classes.join(" "))
       end
     end
   end

data/lib/slimmer/processors/body_inserter.rb

@@ -1,8 +1,8 @@
 module Slimmer::Processors
   class BodyInserter
-    def initialize(source_id = 'wrapper', destination_id = 'wrapper')
-      @source_selector = '#' + source_id
-      @destination_selector = '#' + destination_id
+    def initialize(source_id = "wrapper", destination_id = "wrapper")
+      @source_selector = "#" + source_id
+      @destination_selector = "#" + destination_id
     end
 
     def filter(src, dest)

data/lib/slimmer/processors/conditional_comment_mover.rb

@@ -1,9 +1,9 @@
 module Slimmer::Processors
   class ConditionalCommentMover
     def filter(src, dest)
-      src.xpath('//comment()').each do |comment|
+      src.xpath("//comment()").each do |comment|
         if match_conditional_comments(comment)
-          dest.at_xpath('/html/head') << comment
+          dest.at_xpath("/html/head") << comment
         end
       end
     end

data/lib/slimmer/processors/header_context_inserter.rb

@@ -1,6 +1,6 @@
 module Slimmer::Processors
   class HeaderContextInserter
-    def initialize(path = '.header-context')
+    def initialize(path = ".header-context")
       @path = path
     end
 

data/lib/slimmer/processors/inside_header_inserter.rb

@@ -1,10 +1,10 @@
 module Slimmer::Processors
   class InsideHeaderInserter
     def filter(src, dest)
-      insertion = src.at_css('.slimmer-inside-header')
+      insertion = src.at_css(".slimmer-inside-header")
 
       if insertion
-        logo = dest.at_css('.header-logo')
+        logo = dest.at_css(".header-logo")
         logo.add_next_sibling(insertion.inner_html) unless logo.nil?
       end
     end

data/lib/slimmer/processors/metadata_inserter.rb

@@ -6,22 +6,22 @@ module Slimmer::Processors
     end
 
     def filter(_src, dest)
-      head = dest.at_css('head')
+      head = dest.at_css("head")
 
-      add_meta_tag('analytics:organisations', @headers[Slimmer::Headers::ORGANISATIONS_HEADER], head)
-      add_meta_tag('analytics:world-locations', @headers[Slimmer::Headers::WORLD_LOCATIONS_HEADER], head)
-      add_meta_tag('format', @headers[Slimmer::Headers::FORMAT_HEADER], head)
-      add_meta_tag('search-result-count', @headers[Slimmer::Headers::RESULT_COUNT_HEADER], head)
-      add_meta_tag('rendering-application', @app_name, head)
+      add_meta_tag("analytics:organisations", @headers[Slimmer::Headers::ORGANISATIONS_HEADER], head)
+      add_meta_tag("analytics:world-locations", @headers[Slimmer::Headers::WORLD_LOCATIONS_HEADER], head)
+      add_meta_tag("format", @headers[Slimmer::Headers::FORMAT_HEADER], head)
+      add_meta_tag("search-result-count", @headers[Slimmer::Headers::RESULT_COUNT_HEADER], head)
+      add_meta_tag("rendering-application", @app_name, head)
     end
 
   private
 
     def add_meta_tag(name, content, head)
       if content
-        meta_node = Nokogiri::XML::Node.new('meta', head)
-        meta_node['name'] = "govuk:#{name}"
-        meta_node['content'] = content
+        meta_node = Nokogiri::XML::Node.new("meta", head)
+        meta_node["name"] = "govuk:#{name}"
+        meta_node["content"] = content
 
         head.add_child(meta_node)
       end

data/lib/slimmer/processors/navigation_mover.rb

@@ -9,16 +9,16 @@ class Slimmer::Processors::NavigationMover
     if proposition_header && global_header
       proposition_header.remove
 
-      global_header['class'] = [global_header['class'], 'with-proposition'].compact.join(' ')
+      global_header["class"] = [global_header["class"], "with-proposition"].compact.join(" ")
 
       header_block = Nokogiri::HTML.fragment(proposition_header_block)
-      header_block.at_css('.content') << proposition_header
+      header_block.at_css(".content") << proposition_header
 
-      global_header.at_css('.header-wrapper') << header_block
+      global_header.at_css(".header-wrapper") << header_block
     end
   end
 
   def proposition_header_block
-    @proposition_header_block ||= @skin.template('proposition_menu')
+    @proposition_header_block ||= @skin.template("proposition_menu")
   end
 end

data/lib/slimmer/processors/search_parameter_inserter.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 module Slimmer::Processors
   class SearchParameterInserter
@@ -7,7 +7,7 @@ module Slimmer::Processors
     end
 
     def filter(_content_document, page_template)
-      search_form = page_template.at_css('form#search')
+      search_form = page_template.at_css("form#search")
       if search_parameters && search_form
         search_parameters.each_pair do |name, value|
           # Value can either be a string or an array of values
@@ -24,10 +24,10 @@ module Slimmer::Processors
     end
 
     def add_hidden_input(search_form, name, value)
-      element = Nokogiri::XML::Node.new('input', search_form)
-      element['type'] = 'hidden'
-      element['name'] = name
-      element['value'] = value.to_s
+      element = Nokogiri::XML::Node.new("input", search_form)
+      element["type"] = "hidden"
+      element["name"] = name
+      element["value"] = value.to_s
       search_form.add_child(element)
     end
 

data/lib/slimmer/processors/search_path_setter.rb

@@ -5,8 +5,8 @@ module Slimmer::Processors
     end
 
     def filter(_content_document, page_template)
-      if search_scope && page_template.at_css('form#search')
-        page_template.at_css('form#search').attributes["action"].value = search_scope
+      if search_scope && page_template.at_css("form#search")
+        page_template.at_css("form#search").attributes["action"].value = search_scope
       end
     end
 

data/lib/slimmer/processors/tag_mover.rb

@@ -1,10 +1,10 @@
 module Slimmer::Processors
   class TagMover
     def filter(src, dest)
-      move_tags(src, dest, 'script', dest_node: 'body', keys: %w(src inner_html))
-      move_tags(src, dest, 'link',   must_have: %w[href])
-      move_tags(src, dest, 'meta',   must_have: %w(name content), keys: %w[name content http-equiv], insertion_location: :top)
-      move_tags(src, dest, 'meta',   must_have: %w(property content), keys: %w(property content), insertion_location: :top)
+      move_tags(src, dest, "script", dest_node: "body", keys: %w(src inner_html))
+      move_tags(src, dest, "link",   must_have: %w[href])
+      move_tags(src, dest, "meta",   must_have: %w(name content), keys: %w[name content http-equiv], insertion_location: :top)
+      move_tags(src, dest, "meta",   must_have: %w(property content), keys: %w(property content), insertion_location: :top)
     end
 
     def include_tag?(node, min_attrs)
@@ -13,7 +13,7 @@ module Slimmer::Processors
 
     def tag_fingerprint(node, attrs)
       collected_attrs = attrs.collect do |attr_name|
-        if attr_name == 'inner_html'
+        if attr_name == "inner_html"
           node.content
         else
           node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
@@ -24,7 +24,7 @@ module Slimmer::Processors
     end
 
     def wrap_node(src, node)
-      if node.previous_sibling.to_s =~ /<!--\[if[^\]]+\]><!-->/ && node.next_sibling.to_s == '<!--<![endif]-->'
+      if node.previous_sibling.to_s =~ /<!--\[if[^\]]+\]><!-->/ && node.next_sibling.to_s == "<!--<![endif]-->"
         node = Nokogiri::XML::NodeSet.new(src, [node.previous_sibling, node, node.next_sibling])
       end
       node
@@ -36,7 +36,7 @@ module Slimmer::Processors
       already_there = dest.css(type).map { |node|
         tag_fingerprint(node, comparison_attrs)
       }.compact
-      dest_node = opts[:dest_node] || 'head'
+      dest_node = opts[:dest_node] || "head"
 
       src.css(type).each do |node|
         if include_tag?(node, min_attrs) && !already_there.include?(tag_fingerprint(node, comparison_attrs))

data/lib/slimmer/processors/title_inserter.rb

@@ -1,18 +1,18 @@
 module Slimmer::Processors
   class TitleInserter
     def filter(src, dest)
-      title = src.at_css('head title')
-      head  = dest.at_xpath('/html/head')
+      title = src.at_css("head title")
+      head  = dest.at_xpath("/html/head")
       if head && title
         insert_title(title, head)
       end
     end
 
     def insert_title(title, head)
-      if head.at_css('title').nil?
+      if head.at_css("title").nil?
         head.first_element_child.nil? ? head << title : head.first_element_child.before(title)
       else
-        head.at_css('title').replace(title)
+        head.at_css("title").replace(title)
       end
     end
   end

data/lib/slimmer/railtie.rb

@@ -4,11 +4,20 @@ module Slimmer
 
     initializer "slimmer.configure" do |app|
       slimmer_config = app.config.slimmer.to_hash
-
-      app_name = ENV['GOVUK_APP_NAME'] || app.class.parent_name
+      app_name = ENV["GOVUK_APP_NAME"] || Slimmer::Railtie.parent_name(app)
       slimmer_config = slimmer_config.reverse_merge(app_name: app_name)
 
       app.middleware.use Slimmer::App, slimmer_config
     end
+
+    # TODO: remove this method when all our apps are in rails 6 and substitute
+    # it with: app_name = ENV['GOVUK_APP_NAME'] || app.class.module_parent_name
+    def self.parent_name(app)
+      if app.class.respond_to?(:module_parent_name)
+        app.class.module_parent_name
+      else
+        app.class.parent_name
+      end
+    end
   end
 end

data/lib/slimmer/rspec.rb

@@ -1,4 +1,4 @@
-require 'rspec/core'
+require "rspec/core"
 
-require 'slimmer'
-require 'slimmer/test'
+require "slimmer"
+require "slimmer/test"

data/lib/slimmer/skin.rb

@@ -1,5 +1,5 @@
-require 'rest_client'
-require 'slimmer/govuk_request_id'
+require "rest_client"
+require "slimmer/govuk_request_id"
 
 module Slimmer
   class Skin
@@ -10,7 +10,7 @@ module Slimmer
       @asset_host = options[:asset_host]
 
       @logger = options[:logger] || NullLogger.instance
-      @strict = options[:strict] || %w{development test}.include?(ENV['RACK_ENV'])
+      @strict = options[:strict] || %w{development test}.include?(ENV["RACK_ENV"])
     end
 
     def template(template_name)
@@ -30,7 +30,7 @@ module Slimmer
 
     def template_url(template_name)
       host = asset_host.dup
-      host += '/' unless host =~ /\/$/
+      host += "/" unless host =~ /\/$/
       "#{host}templates/#{template_name}.html.erb"
     end
 
@@ -59,7 +59,7 @@ module Slimmer
       lines = [""] + html.split("\n")
       from = [1, error.line - context_size].max
       to = [lines.size - 1, error.line + context_size].min
-      context = (from..to).zip(lines[from..to]).map { |lineno, line| "%4d: %s" % [lineno, line] } # rubocop:disable Style/FormatStringToken
+      context = (from..to).zip(lines[from..to]).map { |lineno, line| "%4d: %s" % [lineno, line] }
       marker = " " * (error.column - 1) + "-----v"
       context.insert(context_size, marker)
       context.join("\n")
@@ -92,7 +92,7 @@ module Slimmer
     end
 
     def success(source_request, response, body)
-      wrapper_id = options[:wrapper_id] || 'wrapper'
+      wrapper_id = options[:wrapper_id] || "wrapper"
 
       processors = [
         Processors::TitleInserter.new,
@@ -109,15 +109,8 @@ module Slimmer
         Processors::SearchRemover.new(response.headers),
       ]
 
-      template_name = response.headers[Headers::TEMPLATE_HEADER] || 'core_layout'
+      template_name = response.headers[Headers::TEMPLATE_HEADER] || "core_layout"
       process(processors, body, template(template_name), source_request.env)
     end
-
-    def error(template_name, body, rack_env)
-      processors = [
-        Processors::TitleInserter.new
-      ]
-      process(processors, body, template(template_name), rack_env)
-    end
   end
 end

data/lib/slimmer/test.rb

@@ -1,4 +1,4 @@
-require 'slimmer/skin'
+require "slimmer/skin"
 
 module Slimmer
   class Skin
@@ -6,10 +6,10 @@ module Slimmer
       logger.debug "Slimmer: TEST MODE - Loading fixture template from #{__FILE__}"
       if name =~ /\A(.*)\.raw\z/
         %{<div id="test-#{$1}"></div>}
-      elsif File.exist?(template_path = File.join(File.dirname(__FILE__), 'test_templates', "#{name}.html"))
+      elsif File.exist?(template_path = File.join(File.dirname(__FILE__), "test_templates", "#{name}.html"))
         File.read(template_path)
       else
-        File.read(File.join(File.dirname(__FILE__), 'test_templates', "wrapper.html"))
+        File.read(File.join(File.dirname(__FILE__), "test_templates", "wrapper.html"))
       end
     end
   end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '13.2.0'.freeze
+  VERSION = "14.0.0".freeze
 end

data/lib/tasks/slimmer.rake

@@ -1,4 +1,4 @@
-require 'rake'
+require "rake"
 
 namespace :slimmer do
   desc "Symlink from public directory to static directory"

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 13.2.0
+  version: 14.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: plek
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: null_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: null_logger
+  name: plek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,89 +109,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: '5.4'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -207,19 +207,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: govuk-lint
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.5
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.11.5
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7.6
 description: Rack middleware for skinning pages using a specific template
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -260,7 +274,6 @@ files:
 - lib/slimmer/test_templates/proposition_menu.html
 - lib/slimmer/test_templates/wrapper.html
 - lib/slimmer/version.rb
-- lib/tasks/lint.rake
 - lib/tasks/slimmer.rake
 homepage: http://github.com/alphagov/slimmer
 licenses:

data/lib/tasks/lint.rake

@@ -1,4 +0,0 @@
-desc "Run govuk-lint with similar params to CI"
-task :lint do
-  sh "bundle exec govuk-lint-ruby --diff --cached --format clang bin lib test"
-end