slimmer 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693441cb9f372f48dc2849316704699263af4fedafaaf8a777600a4b4632602f
-  data.tar.gz: ccd22f2d51dd5f8d3c4f3698ecbf98f08f0c4c43c9d8ba0260861dcccf327f72
+  metadata.gz: 966481420a36ac4cbaf811706d2ae142b9ce1556c6b8be10ca682766cbe8e2e6
+  data.tar.gz: 79cb54e5f8d0db751cbc40ff3acd6c573395fec2e13e4bb9e43021b93c69a3a4
 SHA512:
-  metadata.gz: f63463274d356cf8c63e5a752c0e57b085282a82b74d99fb7e41ce2e0bf8cad72a65c15696a89104af0485a9377060bf02050718a701d23b7a66da3d09606ca1
-  data.tar.gz: 785e5fdf647fbe5b811d1b1e14d5248f758d799189e8864816b2b8d4ef918e16fdcd1106f3569479087580c1bd526142522fc1a2c32cef76a2febb498e139953
+  metadata.gz: cd9b2d065c5cc805cc92f84728fb4990352030ac25ad5f8ad024b5794e90bc52b82c04f08eb1a7adfbd45abef17849e2ae977d95f579f3d184d290af5a9a4d3b
+  data.tar.gz: d846dd0e2ce3edcb9503708e0c162e5899530e988abf6513a785bef995cc2193df948718892e3200d4408e3ee79b34aead7a9ccec4af042b6214a98f480444b7

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-# Unreleased
+# 13.2.0
+
+* Upgrade Ruby version to 2.6.5. (#234)
+* Fix linting issues. (#234)
 
 # 13.1.0
 

data/lib/slimmer/app.rb

@@ -4,20 +4,21 @@ module Slimmer
   class App
     attr_accessor :logger
 
-    def initialize(app, *args, &block)
+    def initialize(app, *args)
       options = args.first || {}
       @app = app
 
       logger = options[:logger] || NullLogger.instance
       self.logger = logger
       begin
-        if logger.level == 0 # Log set to debug level
+        if logger.level.zero? # Log set to debug level
           unless options[:enable_debugging]
             self.logger = logger.dup
             self.logger.level = 1 # info
           end
         end
-      rescue NoMethodError # In case logger doesn't respond_to? :level
+      rescue NoMethodError # rubocop:disable Lint/HandleExceptions
+        # In case logger doesn't respond_to? :level
       end
 
       if options.key? :template_path
@@ -60,7 +61,7 @@ module Slimmer
 
     def skip_slimmer_param?(env)
       skip = Rack::Request.new(env).params['skip_slimmer']
-      skip and skip.to_i > 0
+      skip && skip.to_i.positive?
     end
 
     def skip_slimmer_header?(response)
@@ -69,8 +70,9 @@ module Slimmer
 
     def s(body)
       return body.to_s unless body.respond_to?(:each)
+
       b = ""
-      body.each {|a| b << a }
+      body.each { |a| b << a }
       b
     end
 
@@ -87,17 +89,17 @@ module Slimmer
       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
+                       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
 
       rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
       response.body = rewritten_body
@@ -107,7 +109,7 @@ module Slimmer
     end
 
     def strip_slimmer_headers(headers)
-      headers.reject {|k, v| k =~ /\A#{Headers::HEADER_PREFIX}/ }
+      headers.reject { |k, _v| k =~ /\A#{Headers::HEADER_PREFIX}/ }
     end
   end
 end

data/lib/slimmer/headers.rb

@@ -5,7 +5,7 @@ module Slimmer
     InvalidHeader = Class.new(RuntimeError)
 
     # @private
-    HEADER_PREFIX = "X-Slimmer"
+    HEADER_PREFIX = "X-Slimmer".freeze
 
     # @private
     SLIMMER_HEADER_MAPPING = {
@@ -20,40 +20,40 @@ module Slimmer
       skip:                 "Skip",
       template:             "Template",
       remove_search:        "Remove-Search",
-    }
+    }.freeze
 
     # @private
-    APPLICATION_NAME_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:application_name]}"
+    APPLICATION_NAME_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:application_name]}".freeze
 
     # @private
-    FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}"
+    FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}".freeze
 
     # @private
-    ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
+    ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}".freeze
 
     # @private
-    WORLD_LOCATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:world_locations]}"
+    WORLD_LOCATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:world_locations]}".freeze
 
     # @private
-    PAGE_OWNER_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:page_owner]}"
+    PAGE_OWNER_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:page_owner]}".freeze
 
     # @private
-    RESULT_COUNT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:result_count]}"
+    RESULT_COUNT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:result_count]}".freeze
 
     # @private
-    SEARCH_PATH_HEADER = "#{HEADER_PREFIX}-Search-Path"
+    SEARCH_PATH_HEADER = "#{HEADER_PREFIX}-Search-Path".freeze
 
     # @private
-    SEARCH_PARAMETERS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:search_parameters]}"
+    SEARCH_PARAMETERS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:search_parameters]}".freeze
 
     # @private
-    SKIP_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:skip]}"
+    SKIP_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:skip]}".freeze
 
     # @private
-    TEMPLATE_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:template]}"
+    TEMPLATE_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:template]}".freeze
 
     # @private
-    REMOVE_SEARCH_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_search]}"
+    REMOVE_SEARCH_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_search]}".freeze
 
     # Set the "slimmer headers" to configure the page
     #
@@ -71,6 +71,7 @@ module Slimmer
     # @option hash [String] world_locations
     def set_slimmer_headers(hash)
       raise InvalidHeader if (hash.keys - SLIMMER_HEADER_MAPPING.keys).any?
+
       SLIMMER_HEADER_MAPPING.each do |hash_key, header_suffix|
         value = hash[hash_key]
         headers["#{HEADER_PREFIX}-#{header_suffix}"] = value.to_s if value

data/lib/slimmer/processors/body_inserter.rb

@@ -1,11 +1,11 @@
 module Slimmer::Processors
   class BodyInserter
-    def initialize(source_id='wrapper', destination_id='wrapper')
+    def initialize(source_id = 'wrapper', destination_id = 'wrapper')
       @source_selector = '#' + source_id
       @destination_selector = '#' + destination_id
     end
 
-    def filter(src,dest)
+    def filter(src, dest)
       body = Nokogiri::HTML.fragment(src.at_css(@source_selector).to_html)
       dest.at_css(@destination_selector).replace(body)
     end

data/lib/slimmer/processors/conditional_comment_mover.rb

@@ -13,5 +13,3 @@ module Slimmer::Processors
     end
   end
 end
-
-

data/lib/slimmer/processors/footer_remover.rb

@@ -1,6 +1,6 @@
 module Slimmer::Processors
   class FooterRemover
-    def filter(src,dest)
+    def filter(src, _dest)
       footer = src.at_css("#footer")
       footer.remove if footer
     end

data/lib/slimmer/processors/header_context_inserter.rb

@@ -1,11 +1,11 @@
 module Slimmer::Processors
   class HeaderContextInserter
-    def initialize(path='.header-context')
+    def initialize(path = '.header-context')
       @path = path
     end
 
-    def filter(src,dest)
-      if dest.at_css(@path) && replacement = src.at_css(@path)
+    def filter(src, dest)
+      if dest.at_css(@path) && (replacement = src.at_css(@path))
         header_context = src.fragment(replacement)
         dest.at_css(@path).replace(header_context)
       end

data/lib/slimmer/processors/metadata_inserter.rb

@@ -5,7 +5,7 @@ module Slimmer::Processors
       @app_name = app_name
     end
 
-    def filter(src, dest)
+    def filter(_src, dest)
       head = dest.at_css('head')
 
       add_meta_tag('analytics:organisations', @headers[Slimmer::Headers::ORGANISATIONS_HEADER], head)

data/lib/slimmer/processors/navigation_mover.rb

@@ -1,5 +1,4 @@
 class Slimmer::Processors::NavigationMover
-
   def initialize(skin)
     @skin = skin
   end

data/lib/slimmer/processors/search_parameter_inserter.rb

@@ -6,7 +6,7 @@ module Slimmer::Processors
       @response = response
     end
 
-    def filter(content_document, page_template)
+    def filter(_content_document, page_template)
       search_form = page_template.at_css('form#search')
       if search_parameters && search_form
         search_parameters.each_pair do |name, value|

data/lib/slimmer/processors/search_path_setter.rb

@@ -4,7 +4,7 @@ module Slimmer::Processors
       @response = response
     end
 
-    def filter(content_document, page_template)
+    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
       end

data/lib/slimmer/processors/search_remover.rb

@@ -4,7 +4,7 @@ module Slimmer::Processors
       @headers = headers
     end
 
-    def filter(src,dest)
+    def filter(_src, dest)
       if @headers.include?(Slimmer::Headers::REMOVE_SEARCH_HEADER)
         search = dest.at_css("#global-header #search")
         search.remove if search

data/lib/slimmer/processors/tag_mover.rb

@@ -2,8 +2,8 @@ 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: ['href'])
-      move_tags(src, dest, 'meta',   must_have: %w(name content), keys: ['name', 'content', 'http-equiv'], insertion_location: :top)
+      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
 
@@ -12,13 +12,15 @@ module Slimmer::Processors
     end
 
     def tag_fingerprint(node, attrs)
-      attrs.collect do |attr_name|
+      collected_attrs = attrs.collect do |attr_name|
         if attr_name == 'inner_html'
           node.content
         else
           node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
         end
-      end.compact.sort
+      end
+
+      collected_attrs.compact.sort
     end
 
     def wrap_node(src, node)

data/lib/slimmer/processors/title_inserter.rb

@@ -1,10 +1,10 @@
 module Slimmer::Processors
   class TitleInserter
-    def filter(src,dest)
+    def filter(src, dest)
       title = src.at_css('head title')
       head  = dest.at_xpath('/html/head')
       if head && title
-        insert_title(title,head)
+        insert_title(title, head)
       end
     end
 

data/lib/slimmer/skin.rb

@@ -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)
@@ -34,15 +34,15 @@ module Slimmer
       "#{host}templates/#{template_name}.html.erb"
     end
 
-    def report_parse_errors_if_strict!(nokogiri_doc, description_for_error_message)
+    def report_parse_errors_if_strict!(nokogiri_doc, _description_for_error_message)
       nokogiri_doc
     end
 
     def parse_html(html, description_for_error_message)
       doc = Nokogiri::HTML.parse(html)
       if strict
-        errors = doc.errors.select {|e| e.error?}.reject {|e| ignorable?(e)}
-        if errors.size > 0
+        errors = doc.errors.select(&:error?).reject { |e| ignorable?(e) }
+        if !errors.empty?
           error = errors.first
           message = "In #{description_for_error_message}: '#{error.message}' at line #{error.line} col #{error.column} (code #{error.code}).\n"
           message << "Add ?skip_slimmer=1 to the url to show the raw backend request.\n\n"
@@ -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] }
+      context = (from..to).zip(lines[from..to]).map { |lineno, line| "%4d: %s" % [lineno, line] } # rubocop:disable Style/FormatStringToken
       marker = " " * (error.column - 1) + "-----v"
       context.insert(context_size, marker)
       context.join("\n")
@@ -70,7 +70,7 @@ module Slimmer
       ignorable_codes.include?(error.code) || error.message.match(/Element script embeds close tag/) || error.message.match(/Unexpected end tag : noscript/)
     end
 
-    def process(processors,body,template, rack_env)
+    def process(processors, body, template, _rack_env)
       logger.debug "Slimmer: starting skinning process"
       src = parse_html(body.to_s, "backend response")
       dest = parse_html(template, "template")
@@ -95,14 +95,14 @@ module Slimmer
       wrapper_id = options[:wrapper_id] || 'wrapper'
 
       processors = [
-        Processors::TitleInserter.new(),
-        Processors::TagMover.new(),
+        Processors::TitleInserter.new,
+        Processors::TagMover.new,
         Processors::NavigationMover.new(self),
-        Processors::ConditionalCommentMover.new(),
+        Processors::ConditionalCommentMover.new,
         Processors::BodyInserter.new(wrapper_id),
         Processors::BodyClassCopier.new,
         Processors::InsideHeaderInserter.new,
-        Processors::HeaderContextInserter.new(),
+        Processors::HeaderContextInserter.new,
         Processors::MetadataInserter.new(response, options[:app_name]),
         Processors::SearchParameterInserter.new(response),
         Processors::SearchPathSetter.new(response),
@@ -115,7 +115,7 @@ module Slimmer
 
     def error(template_name, body, rack_env)
       processors = [
-        Processors::TitleInserter.new()
+        Processors::TitleInserter.new
       ]
       process(processors, body, template(template_name), rack_env)
     end

data/lib/slimmer/version.rb

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

data/lib/tasks/slimmer.rake

@@ -6,7 +6,7 @@ namespace :slimmer do
     path_to_static = "../static/public"
     path_to_public = "public"
     commands = ["cd #{path_to_public}"]
-    dirs_to_link = Dir.glob("../static/public/*") {|f|
+    Dir.glob("../static/public/*") { |f|
       commands << "ln -s #{path_to_static}/#{f}"
     }
     commands << ["cd .."]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.11.5
 description: Rack middleware for skinning pages using a specific template
 email:
 - govuk-dev@digital.cabinet-office.gov.uk
@@ -281,8 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: slimmer
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Thinner than the skinner