From b16c65bb422cd135c66e8b9371559ac3fb1a8e83 Mon Sep 17 00:00:00 2001 From: Borna Kapusta Date: Mon, 30 Sep 2024 18:32:40 +0200 Subject: [PATCH 01/13] Make load time more precise move loading time to middleware and add time zone (#6) --- lib/treblle/generate_payload.rb | 11 ++++------- lib/treblle/middleware.rb | 15 +++++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/treblle/generate_payload.rb b/lib/treblle/generate_payload.rb index 64f5c1e..1abb354 100644 --- a/lib/treblle/generate_payload.rb +++ b/lib/treblle/generate_payload.rb @@ -8,10 +8,11 @@ class GeneratePayload SDK_LANG = 'ruby' TIME_FORMAT = '%Y-%m-%d %H:%M:%S' - def initialize(request:, response:, started_at:, configuration: Treblle.configuration) + def initialize(request:, response:, started_at:, load_time:, configuration: Treblle.configuration) @request = request @response = response @started_at = started_at + @load_time = load_time @configuration = configuration end @@ -21,18 +22,14 @@ def call private - attr_reader :request, :response, :started_at, :configuration + attr_reader :request, :response, :started_at, :load_time, :configuration def sanitize(body) Utils::HashSanitizer.sanitize(body, configuration.sensitive_attrs) end def timestamp - started_at.strftime(TIME_FORMAT) - end - - def load_time - Time.now - started_at + started_at.utc.strftime(TIME_FORMAT) end def payload diff --git a/lib/treblle/middleware.rb b/lib/treblle/middleware.rb index 28174ac..3cd6add 100644 --- a/lib/treblle/middleware.rb +++ b/lib/treblle/middleware.rb @@ -29,18 +29,25 @@ def call(env) attr_reader :configuration def call_with_treblle_monitoring(env) - started_at = Time.now + started_at = Time.now.utc response = @app.call(env) - handle_monitoring(env, response, started_at) + + load_time = Time.now.utc - started_at + handle_monitoring(env, response, started_at, load_time) response end - def handle_monitoring(env, rack_response, started_at) + def handle_monitoring(env, rack_response, started_at, load_time) request = RequestBuilder.new(env).build response = ResponseBuilder.new(rack_response).build - payload = GeneratePayload.new(request: request, response: response, started_at: started_at).call + payload = GeneratePayload.new( + request: request, + response: response, + started_at: started_at, + load_time: load_time + ).call Dispatcher.new(payload: payload).call rescue StandardError => e From 39bb2b8ed19c4931dfe2c899ae22e2de2b3a2f5b Mon Sep 17 00:00:00 2001 From: Borna Kapusta Date: Mon, 30 Sep 2024 18:33:32 +0200 Subject: [PATCH 02/13] Mask sanitized value length (#7) --- lib/treblle/utils/hash_sanitizer.rb | 2 +- spec/lib/utils/hash_sanitizer_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/treblle/utils/hash_sanitizer.rb b/lib/treblle/utils/hash_sanitizer.rb index 93c5f35..49a7206 100644 --- a/lib/treblle/utils/hash_sanitizer.rb +++ b/lib/treblle/utils/hash_sanitizer.rb @@ -32,7 +32,7 @@ def sanitize_array(array, sensitive_attrs) end def sanitize_value(key, value, sensitive_attrs) - sensitive_attrs.include?(key.to_s) ? '*' * value.to_s.length : value + sensitive_attrs.include?(key.to_s) ? "*****" : value end end end diff --git a/spec/lib/utils/hash_sanitizer_spec.rb b/spec/lib/utils/hash_sanitizer_spec.rb index bc100ab..7594cc7 100644 --- a/spec/lib/utils/hash_sanitizer_spec.rb +++ b/spec/lib/utils/hash_sanitizer_spec.rb @@ -33,7 +33,7 @@ context 'when given a hash with sensitive attributes' do let(:input_hash) { { name: 'John', password: 'secretpassword', credit_card: '1234567890123456' } } - let(:expected_subject) { { name: 'John', password: '**************', credit_card: '****************' } } + let(:expected_subject) { { name: 'John', password: '*****', credit_card: '*****' } } it 'replaces sensitive attribute values with asterisks' do expect(subject).to eq(expected_subject) @@ -42,7 +42,7 @@ context 'when given a hash with nested hashes' do let(:input_hash) { { user: { name: 'John', password: 'secretpassword' } } } - let(:expected_subject) { { user: { name: 'John', password: '**************' } } } + let(:expected_subject) { { user: { name: 'John', password: '*****' } } } it 'replaces sensitive attribute values with asterisks' do expect(subject).to eq(expected_subject) @@ -54,7 +54,7 @@ { users: [{ name: 'John', password: 'secretpassword' }, { name: 'Jane', password: 'anotherpassword' }] } end let(:expected_subject) do - { users: [{ name: 'John', password: '**************' }, { name: 'Jane', password: '***************' }] } + { users: [{ name: 'John', password: '*****' }, { name: 'Jane', password: '*****' }] } end it 'replaces sensitive attribute values with asterisks' do From a13c7c34fd21a3f31ed38dd38daeba88b617d8d8 Mon Sep 17 00:00:00 2001 From: Borna Kapusta Date: Mon, 30 Sep 2024 18:34:12 +0200 Subject: [PATCH 03/13] Update issue templates (#9) --- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..08ba582 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '[BUG] ' +labels: 'bug' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..bbcbbe7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From d8e18c8f7e0deecc801a85e5966325745be83620 Mon Sep 17 00:00:00 2001 From: Borna Kapusta <kapusta.borna.s@gmail.com> Date: Mon, 30 Sep 2024 18:34:42 +0200 Subject: [PATCH 04/13] Run rubocop on ci (#10) * disable documentation rule * fix calling super with arguments * run rubocop on CI * run on push to master/main * group rubocop gems and bundle only with them * exclude vendor files from rubocop --- .github/workflows/ci.yml | 26 +++++++++++++++------- .rubocop.yml | 4 ++++ Gemfile | 7 ++++-- lib/treblle/errors/configuration_errors.rb | 6 ++--- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4002682..dd53c31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,8 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake -# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby - -name: Tests +name: Build on: + push: + branches: ["master", "main"] pull_request: branches: ["**"] @@ -15,6 +10,21 @@ permissions: contents: read jobs: + rubocop: + name: RuboCop + runs-on: ubuntu-latest + env: + BUNDLE_ONLY: rubocop + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Setup Ruby and install gems + uses: ruby/setup-ruby@v1 + with: + ruby-version: 3.3.0 + bundler-cache: true + - name: Run Rubocop + run: bundle exec rubocop --parallel test: runs-on: ubuntu-latest strategy: diff --git a/.rubocop.yml b/.rubocop.yml index e4675a9..f590b6e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,6 +5,7 @@ AllCops: - "treblle-ruby.gemspec" - "Gemfile.lock" - "gemfiles/*" + - "vendor/**/*" require: - rubocop-performance @@ -126,3 +127,6 @@ Style/StringConcatenation: Style/DocumentDynamicEvalDefinition: Enabled: false + +Style/Documentation: + Enabled: false diff --git a/Gemfile b/Gemfile index 69d5636..6d30be0 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,9 @@ gem "appraisal" gem 'rails' gem 'rake' gem 'rspec' -gem 'rubocop', require: false -gem 'rubocop-performance', require: false gem 'webmock' + +group 'rubocop' do + gem 'rubocop', require: false + gem 'rubocop-performance', require: false +end diff --git a/lib/treblle/errors/configuration_errors.rb b/lib/treblle/errors/configuration_errors.rb index 73d3cec..9489a97 100644 --- a/lib/treblle/errors/configuration_errors.rb +++ b/lib/treblle/errors/configuration_errors.rb @@ -2,19 +2,19 @@ module Treblle module Errors class ConfigurationError < StandardError def initialize(msg = "Configuration error") - super(msg) + super end end class MissingApiKeyError < ConfigurationError def initialize(msg = "API key is missing") - super(msg) + super end end class MissingProjectIdError < ConfigurationError def initialize(msg = "Project ID is missing") - super(msg) + super end end end From f58fd801a5541f8cd4fb190ccaf0dc2472347651 Mon Sep 17 00:00:00 2001 From: Borna Kapusta <kapusta.borna.s@gmail.com> Date: Mon, 30 Sep 2024 18:35:54 +0200 Subject: [PATCH 05/13] Improve README file (#11) add build and version badges --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c9921d..40b0154 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ <div align="center"> # Treblle +[![Build Status](https://github.com/Treblle/treblle-ruby/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/treblle.svg)](https://badge.fury.io/rb/treblle) <a href="https://docs.treblle.com/en/integrations" target="_blank">Integrations</a> <span>  •  </span> From 85c9a29cabb9b07f4ead1d1a1a6fc6268a887b31 Mon Sep 17 00:00:00 2001 From: Borna Kapusta <kapusta.borna.s@gmail.com> Date: Mon, 30 Sep 2024 18:36:39 +0200 Subject: [PATCH 06/13] Add dependabot (#8) add dependabot config --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..fd4ace0 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: bundler + directory: "/" + schedule: + interval: monthly + open-pull-requests-limit: 10 From e813d2de8ce0a4ab75153aa2aacadf3df7bd039f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:41:15 +0200 Subject: [PATCH 07/13] Bump rake from 13.1.0 to 13.2.1 (#14) Bumps [rake](https://github.com/ruby/rake) from 13.1.0 to 13.2.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.1.0...v13.2.1) --- updated-dependencies: - dependency-name: rake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4bfd13e..273fd5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rdoc (6.6.2) psych (>= 4.0.0) regexp_parser (2.9.0) From 3be2b84a2f7d8eb12fe92f31cc2529530893a94f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:41:32 +0200 Subject: [PATCH 08/13] Bump webmock from 3.20.0 to 3.23.1 (#15) Bumps [webmock](https://github.com/bblimke/webmock) from 3.20.0 to 3.23.1. - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.20.0...v3.23.1) --- updated-dependencies: - dependency-name: webmock dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 273fd5a..b2ce7b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,15 +81,15 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) appraisal (2.5.0) bundler rake thor (>= 0.14.0) ast (2.4.2) base64 (0.2.0) - bigdecimal (3.1.6) + bigdecimal (3.1.8) builder (3.2.4) concurrent-ruby (1.2.3) connection_pool (2.4.1) @@ -104,7 +104,7 @@ GEM erubi (1.12.0) globalid (1.2.1) activesupport (>= 6.1) - hashdiff (1.1.0) + hashdiff (1.1.1) i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.7.2) @@ -153,7 +153,7 @@ GEM racc psych (5.1.2) stringio - public_suffix (5.0.4) + public_suffix (6.0.1) racc (1.7.3) rack (3.0.9) rack-session (2.0.0) @@ -199,7 +199,7 @@ GEM regexp_parser (2.9.0) reline (0.4.2) io-console (~> 0.5) - rexml (3.2.6) + rexml (3.3.8) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -237,7 +237,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - webmock (3.20.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) From 783968a4930322310e51311258bce27e99f0c036 Mon Sep 17 00:00:00 2001 From: Borna Kapusta <kapusta.borna.s@gmail.com> Date: Mon, 30 Sep 2024 18:42:11 +0200 Subject: [PATCH 09/13] Fix the link for the build status (#18) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 40b0154..132eb72 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ <div align="center"> # Treblle -[![Build Status](https://github.com/Treblle/treblle-ruby/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/treblle.svg)](https://badge.fury.io/rb/treblle) +[![Build Status](https://github.com/Treblle/treblle-ruby/workflows/Tests/badge.svg)](https://github.com/Treblle/treblle-ruby/actions) [![Gem Version](https://badge.fury.io/rb/treblle.svg)](https://badge.fury.io/rb/treblle) <a href="https://docs.treblle.com/en/integrations" target="_blank">Integrations</a> <span>  •  </span> From df0a2ca2eb8ef703d064204ada4cc7262c0cb8f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:44:21 +0200 Subject: [PATCH 10/13] Bump rubocop from 1.60.2 to 1.66.1 (#16) Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.2 to 1.66.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.60.2...v1.66.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b2ce7b3..70bd26f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,7 +111,7 @@ GEM irb (1.11.2) rdoc reline (>= 0.4.2) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) loofah (2.22.0) crass (~> 1.0.2) @@ -147,14 +147,14 @@ GEM racc (~> 1.4) nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) - parallel (1.24.0) - parser (3.3.0.5) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc psych (5.1.2) stringio public_suffix (6.0.1) - racc (1.7.3) + racc (1.8.1) rack (3.0.9) rack-session (2.0.0) rack (>= 3.0.0) @@ -196,7 +196,7 @@ GEM rake (13.2.1) rdoc (6.6.2) psych (>= 4.0.0) - regexp_parser (2.9.0) + regexp_parser (2.9.2) reline (0.4.2) io-console (~> 0.5) rexml (3.3.8) @@ -213,19 +213,18 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.0) - rubocop (1.60.2) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) @@ -236,7 +235,7 @@ GEM timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) From 9909d90c9aa33599bcb59269f912d09f4ce915cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 19:07:05 +0200 Subject: [PATCH 11/13] Bump rubocop-performance from 1.20.2 to 1.22.1 (#17) Bumps [rubocop-performance](https://github.com/rubocop/rubocop-performance) from 1.20.2 to 1.22.1. - [Release notes](https://github.com/rubocop/rubocop-performance/releases) - [Changelog](https://github.com/rubocop/rubocop-performance/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-performance/compare/v1.20.2...v1.22.1) --- updated-dependencies: - dependency-name: rubocop-performance dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 70bd26f..b6ca786 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,9 +225,9 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.32.3) parser (>= 3.3.1.0) - rubocop-performance (1.20.2) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) stringio (3.1.0) From f6215a8f70a3d29565d305a8ca14773601f6db53 Mon Sep 17 00:00:00 2001 From: Borna Kapusta <kapusta.borna.s@gmail.com> Date: Mon, 30 Sep 2024 19:55:33 +0200 Subject: [PATCH 12/13] Fix fetching body on request (Rails 7.2) (#20) --- lib/treblle/request_builder.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/treblle/request_builder.rb b/lib/treblle/request_builder.rb index 44a065a..62c91b4 100644 --- a/lib/treblle/request_builder.rb +++ b/lib/treblle/request_builder.rb @@ -59,6 +59,8 @@ def header_to_include?(header) end def get_body(request_metadata) + return if request_metadata.body.nil? + case request_metadata.media_type when 'application/x-www-form-urlencoded', 'multipart/form-data' request_metadata.POST.dup From c3dcf4d01afd72da54bad966515d113b428cdbd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 20:07:38 +0200 Subject: [PATCH 13/13] Bump rails from 7.1.3 to 7.2.1 (#13) Bumps [rails](https://github.com/rails/rails) from 7.1.3 to 7.2.1. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.1.3...v7.2.1) --- updated-dependencies: - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Borna Kapusta <kapusta.borna.s@gmail.com> --- Gemfile.lock | 184 +++++++++++++++++++++++++-------------------------- 1 file changed, 90 insertions(+), 94 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b6ca786..09f4f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,80 +7,76 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) + actioncable (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.3) - actionpack (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activesupport (= 7.1.3) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) + actionmailer (7.2.1) + actionpack (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activesupport (= 7.2.1) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.3) - actionview (= 7.1.3) - activesupport (= 7.1.3) + actionpack (7.2.1) + actionview (= 7.2.1) + activesupport (= 7.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3) - actionpack (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + useragent (~> 0.16) + actiontext (7.2.1) + actionpack (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3) - activesupport (= 7.1.3) + actionview (7.2.1) + activesupport (= 7.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3) - activesupport (= 7.1.3) + activejob (7.2.1) + activesupport (= 7.2.1) globalid (>= 0.3.6) - activemodel (7.1.3) - activesupport (= 7.1.3) - activerecord (7.1.3) - activemodel (= 7.1.3) - activesupport (= 7.1.3) + activemodel (7.2.1) + activesupport (= 7.2.1) + activerecord (7.2.1) + activemodel (= 7.2.1) + activesupport (= 7.2.1) timeout (>= 0.4.0) - activestorage (7.1.3) - actionpack (= 7.1.3) - activejob (= 7.1.3) - activerecord (= 7.1.3) - activesupport (= 7.1.3) + activestorage (7.2.1) + actionpack (= 7.2.1) + activejob (= 7.2.1) + activerecord (= 7.2.1) + activesupport (= 7.2.1) marcel (~> 1.0) - activesupport (7.1.3) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) appraisal (2.5.0) @@ -90,8 +86,8 @@ GEM ast (2.4.2) base64 (0.2.0) bigdecimal (3.1.8) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crack (1.0.0) bigdecimal @@ -99,20 +95,20 @@ GEM crass (1.0.6) date (3.3.4) diff-lcs (1.5.1) - drb (2.2.0) - ruby2_keywords - erubi (1.12.0) + drb (2.2.1) + erubi (1.13.0) globalid (1.2.1) activesupport (>= 6.1) hashdiff (1.1.1) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.11.2) - rdoc + irb (1.14.1) + rdoc (>= 4.0.0) reline (>= 0.4.2) json (2.7.2) language_server-protocol (3.17.0.3) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -121,31 +117,30 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) mini_mime (1.1.5) - minitest (5.22.2) - mutex_m (0.2.0) - net-imap (0.4.10) + minitest (5.25.1) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.0) - nokogiri (1.16.2-aarch64-linux) + nio4r (2.7.3) + nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-arm-linux) + nokogiri (1.16.7-arm-linux) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86-linux) + nokogiri (1.16.7-x86-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) parallel (1.26.3) parser (3.3.5.0) @@ -155,7 +150,7 @@ GEM stringio public_suffix (6.0.1) racc (1.8.1) - rack (3.0.9) + rack (3.1.7) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -163,20 +158,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3) - actioncable (= 7.1.3) - actionmailbox (= 7.1.3) - actionmailer (= 7.1.3) - actionpack (= 7.1.3) - actiontext (= 7.1.3) - actionview (= 7.1.3) - activejob (= 7.1.3) - activemodel (= 7.1.3) - activerecord (= 7.1.3) - activestorage (= 7.1.3) - activesupport (= 7.1.3) + rails (7.2.1) + actioncable (= 7.2.1) + actionmailbox (= 7.2.1) + actionmailer (= 7.2.1) + actionpack (= 7.2.1) + actiontext (= 7.2.1) + actionview (= 7.2.1) + activejob (= 7.2.1) + activemodel (= 7.2.1) + activerecord (= 7.2.1) + activestorage (= 7.2.1) + activesupport (= 7.2.1) bundler (>= 1.15.0) - railties (= 7.1.3) + railties (= 7.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -184,20 +179,20 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3) - actionpack (= 7.1.3) - activesupport (= 7.1.3) - irb + railties (7.2.1) + actionpack (= 7.2.1) + activesupport (= 7.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdoc (6.6.2) + rdoc (6.7.0) psych (>= 4.0.0) regexp_parser (2.9.2) - reline (0.4.2) + reline (0.5.10) io-console (~> 0.5) rexml (3.3.8) rspec (3.13.0) @@ -229,22 +224,23 @@ GEM rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) - stringio (3.1.0) - thor (1.3.0) + securerandom (0.3.1) + stringio (3.1.1) + thor (1.3.2) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.6.0) + useragent (0.16.10) webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.8.1) + webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.13) + zeitwerk (2.6.18) PLATFORMS aarch64-linux