Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test against ActiveRecord 8.0 #685

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Test against ActiveRecord 8.0 #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b877adb
Bump ruby from 3.3.5 to 3.3.6
haines Nov 12, 2024
e6105a2
Bump bundler from 2.5.22 to 2.5.23
haines Nov 12, 2024
44cf717
Test against ActiveRecord 8.0
haines Nov 12, 2024
d09dd26
Use `URI::RFC2396_PARSER.regexp[:ABS_URI_REF]` directly to resolve de…
haines Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.3.5
ruby-3.3.6
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

No notable changes.
### Changed
* Test against Active Record 8.0 ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
* Use `URI::RFC2396_PARSER.regexp[:ABS_URI_REF]` directly to resolve deprecation warning introduced in [ruby/uri#113](https://github.com/ruby/uri/pull/113) ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))

## [0.6.0] - 2024-10-30

Expand Down
41 changes: 21 additions & 20 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,29 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
actionpack (8.0.0)
actionview (= 8.0.0)
activesupport (= 8.0.0)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actionview (7.2.2)
activesupport (= 7.2.2)
actionview (8.0.0)
activesupport (= 8.0.0)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
activemodel (8.0.0)
activesupport (= 8.0.0)
activerecord (8.0.0)
activemodel (= 8.0.0)
activesupport (= 8.0.0)
timeout (>= 0.4.0)
activesupport (7.2.2)
activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -43,6 +42,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
uri (>= 0.13.1)
ansi (1.5.0)
ast (2.4.2)
aws-eventstream (1.3.0)
Expand All @@ -61,7 +61,7 @@ GEM
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
benchmark (0.3.0)
benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
coderay (1.1.3)
Expand Down Expand Up @@ -120,9 +120,9 @@ GEM
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
railties (8.0.0)
actionpack (= 8.0.0)
activesupport (= 8.0.0)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -154,14 +154,15 @@ GEM
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-progressbar (1.13.0)
securerandom (0.3.1)
securerandom (0.3.2)
stringio (3.1.1)
thor (1.3.2)
timecop (0.9.10)
timeout (0.4.1)
timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
uri (1.0.1)
useragent (0.16.10)
yard (0.9.37)
zeitwerk (2.6.18)
Expand Down Expand Up @@ -189,4 +190,4 @@ DEPENDENCIES
yard

BUNDLED WITH
2.5.22
2.5.23
5 changes: 3 additions & 2 deletions bin/version-matrix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def minor_versions(name, requirement)
end

ruby_activerecord_requirements = {
"3.1" => ">= 6.1",
"3.1" => [">= 6.1", "< 8"],
"3.2" => ">= 6.1",
"3.3" => ">= 6.1"
}
Expand All @@ -24,7 +24,8 @@ activerecord_pg_requirements = {
"6.1" => "~> 1.1",
"7.0" => "~> 1.1",
"7.1" => "~> 1.1",
"7.2" => "~> 1.1"
"7.2" => "~> 1.1",
"8.0" => "~> 1.1"
}

versions = ruby_activerecord_requirements.flat_map do |ruby_version, activerecord_requirement|
Expand Down
9 changes: 8 additions & 1 deletion lib/pg/aws_rds_iam/connection_info/uri.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ module AWS_RDS_IAM
module ConnectionInfo
class URI
def self.match?(connection_string)
/\A#{::URI::ABS_URI_REF}\z/.match?(connection_string)
regexp =
if defined?(::URI::RFC2396_PARSER)
::URI::RFC2396_PARSER.regexp[:ABS_URI_REF]
else
::URI::ABS_URI_REF
end

/\A#{regexp}\z/.match?(connection_string)
end

attr_reader :auth_token_generator_name
Expand Down