rack-logstasher 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 539692170e2083634c7acbd4e5230264dd8d3292ca1bc6f1da857ce076b57b6a
-  data.tar.gz: 5ee4f57bceaf8c9376f7fb9e14a4ee9a10c46b39cb6b9781cf7f619bd0579d50
+  metadata.gz: 5632b7b41fc2ec5644275afc34031f6c18f85ae8a08354c13eb776f0b12783c7
+  data.tar.gz: 3951d485a52eedd7985146a47d348fa4b7719822a3dc87497807560f95977c6c
 SHA512:
-  metadata.gz: 1cdb8df3283ca4bb814e6d834f236690ff7d75df81b66ec62fbd266843e70b7bf99cb4309dbc10c200d1cb20c2520d91811c3015c2179c7b4ff220504dc212ce
-  data.tar.gz: 07acce7172451096035b875431dfd095a5e6df8d7a6dc25ad19f96904bd3e774f3a9cdab07f3d0f86f1a48f408a24388ba0c0638b42960e61db5df5a09f66d8d
+  metadata.gz: b7a8c126c778db3e1e2af2df96183c8d21e38a8689eef242aa2e7783e9d7b115f0728b110bb8bf953a0fb05c481e78418aef00f614be3e973e8fe96c90f68c3b
+  data.tar.gz: 3795dea47cc47c429ea70a1991f4984ba2467f6a104ed194c5103f081acda4dd4cf84c0faf3890e732706ff2c9eee7e44f5943a6775fdb1c3e0a06cdd139a7c8

data/.github/pull_request_template.md

@@ -0,0 +1,3 @@
+⚠️ Make sure you [release a new version of this gem](https://github.com/alphagov/rack-logstasher/pull/43/files) after merging your changes. ⚠️
+
+Refer to the [existing docs](https://docs.publishing.service.gov.uk/manual/publishing-a-ruby-gem.html#ruby-version-compatibility) if you are making changes to the supported Ruby versions.

data/.github/workflows/autorelease.yml

@@ -0,0 +1,10 @@
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '30 10 * * 1-5' # 10:30am UTC, Mon-Fri.
+
+jobs:
+  autorelease:
+    uses: alphagov/govuk-infrastructure/.github/workflows/autorelease-rubygem.yml@main
+    secrets:
+      GH_TOKEN: ${{ secrets.GOVUK_CI_GITHUB_API_TOKEN }}

data/.github/workflows/ci.yml

@@ -1,15 +1,24 @@
 on: [push, pull_request]
 
 jobs:
+  codeql-sast:
+    name: CodeQL SAST scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
+    permissions:
+      security-events: write
+
+  dependency-review:
+    name: Dependency Review scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main
+  
   test_matrix:
     strategy:
       fail-fast: false
       matrix:
-        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: [3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+# simplecov
+coverage/

data/.govuk_dependabot_merger.yml

@@ -0,0 +1,4 @@
+api_version: 2
+defaults:
+  auto_merge: true
+  update_external_dependencies: true

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.1.5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.2.0
+
+* Drop support for Ruby 3.0
+
+# 2.1.0
+
+* Drop support for Ruby 2.7.
+
 # 2.0.0
 
 - Add support for Rack 3

data/lib/rack/logstasher/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Logstasher
-    VERSION = "2.0.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/rack-logstasher.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/alphagov/rack-logstasher"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.1"
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test", "~> 2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3"
-  spec.add_development_dependency "rubocop-govuk", "4.9.0"
+  spec.add_development_dependency "rubocop-govuk", "4.17.1"
+  spec.add_development_dependency "simplecov"
 end

data/spec/rack/logstasher/logger_spec.rb

@@ -61,7 +61,7 @@ describe Rack::Logstasher::Logger do
         Rack::Logstasher::Logger.new(
           proc { |_env| [200, {}, ["Inner app response"]] },
           Logger.new(tmp_logfile_path),
-          extra_request_headers: extra_request_headers,
+          extra_request_headers:,
         )
       end
 
@@ -104,7 +104,7 @@ describe Rack::Logstasher::Logger do
             [200, headers, ["Inner app response"]]
           end,
           Logger.new(tmp_logfile_path),
-          extra_response_headers: extra_response_headers,
+          extra_response_headers:,
         )
       end
 

data/spec/spec_helper.rb

@@ -1,10 +1,6 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
+require "simplecov"
+SimpleCov.start
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
 Dir[File.expand_path("support/**/*.rb", __dir__)].sort.each { |f| require f }
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstasher
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -92,14 +92,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.17.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rack middleware to log requests in logstash json event format.  Like
   the logstasher gem, but for rack apps.
 email:
@@ -109,8 +123,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/pull_request_template.md"
+- ".github/workflows/autorelease.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".govuk_dependabot_merger.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -138,14 +155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Rack middleware to log requests in logstash json event format