slimmer 18.1.0 → 18.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed01a6ffcd005b8c3c535e3c470111fc7fbc8616fa8cb4de03c167ac76c91e9
-  data.tar.gz: 630246d90121b56ebe60511dd04a1f2fbf83ef7bf124bbd17be473d49976c599
+  metadata.gz: f7bdcc7a0be71182e3a34756bdb80e3059210c2c271dd10878340dea06ee2e5a
+  data.tar.gz: 6e6d89e671d08807192fff249760c6cf642531812004f34ed15efb1b85c4f806
 SHA512:
-  metadata.gz: 2a2e20be60419f1aecb3630bc1d26029ad2c216b30f3b1308a56a6779d8e7d420e9e1b68adb24ccf4a5b8fed8efbe86c75a4ab8b6e8572e310305a4ae3c09456
-  data.tar.gz: 2ae4731e6714cf0ebb47706b8a6723ae113e86fae9cafdd293e6b5c817a7df1faae9163a82f87539897a67c78b9f3c274e8491cd5bd5f7d1190e7cab15a14e4b
+  metadata.gz: 9de921463b46131fdb11016fcced43fc4f2e862ff42ea1f2e3ffe53849375be10f825f8d1a8bc879b0e12e9a2808c4592f209af90c713b0222f0bd31e1aa176f
+  data.tar.gz: c29228886d04b661cbb0275dd53897e29f4988bed88872c12330d424a0545ec6171e81f3d601c86f8250278550525018ff7d71f4b48084a57e7994f7308aaa70

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 18.3.0
+
+* Enforce requirement for Rack 3
+
+# 18.2.0
+
+* Drop support for Ruby 2.7.
+* Update reference to deprecated Rack::Utils::HeaderHash
+
 # 18.1.0
 
 * Decorate inline script elements with nonce attribute for appropriately configured Rails requests

data/lib/slimmer/app.rb

@@ -42,7 +42,7 @@ module Slimmer
     end
 
     def response_can_be_rewritten?(status, headers)
-      Rack::Utils::HeaderHash.new(headers)["Content-Type"] =~ /text\/html/ && ![301, 302, 304].include?(status)
+      Rack::Headers.new.merge(headers)["Content-Type"] =~ /text\/html/ && ![301, 302, 304].include?(status)
     end
 
     def skip_slimmer?(env, response)
@@ -93,9 +93,7 @@ module Slimmer
     end
 
     def strip_slimmer_headers(headers)
-      # Convert Rack::Util::HeaderHash to a simple hash to avoid a Ruby warning
-      # of extra states not copied. Can be removed once Ruby < 3.1 support is removed.
-      headers.to_h.reject { |k, _v| k =~ /\A#{Headers::HEADER_PREFIX}/ }
+      headers.reject { |k, _v| k =~ /\A#{Headers::HEADER_PREFIX}/i }
     end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = "18.1.0".freeze
+  VERSION = "18.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 18.1.0
+  version: 18.3.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.12.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -244,14 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Thinner than the skinner