From 4232a8922af16c1e59939534787f13b761060231 Mon Sep 17 00:00:00 2001 From: Juli Tera Date: Tue, 27 May 2025 08:57:22 -0700 Subject: [PATCH 1/3] Update CI to include 3.4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56110ec..6bd41a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: - main env: - ruby_version: 3.3 + ruby_version: 3.4 jobs: test: @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.4] + ruby: [2.7, '3.0', 3.1, 3.2, 3.3, 3.4, jruby-9.4] services: dynamodb: image: amazon/dynamodb-local:latest From 4de8a6493bbde96901b8f06b0377d2c475eb5e30 Mon Sep 17 00:00:00 2001 From: Juli Tera Date: Tue, 27 May 2025 09:02:26 -0700 Subject: [PATCH 2/3] Fix rubocop failures --- lib/aws/session_store/dynamo_db/locking/pessimistic.rb | 4 ++-- .../dynamo_db/rack_middleware_integration_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/aws/session_store/dynamo_db/locking/pessimistic.rb b/lib/aws/session_store/dynamo_db/locking/pessimistic.rb index 7f5c3d7..36d15bf 100644 --- a/lib/aws/session_store/dynamo_db/locking/pessimistic.rb +++ b/lib/aws/session_store/dynamo_db/locking/pessimistic.rb @@ -59,7 +59,7 @@ def get_lock_time_opts(sid) # @return [Time] Time stamp for which the session was locked. def lock_time(sid) result = @config.dynamo_db_client.get_item(get_lock_time_opts(sid)) - (result[:item]['locked_at']).to_f if result[:item]['locked_at'] + result[:item]['locked_at']&.to_f end # @return [String] Session data. @@ -138,7 +138,7 @@ def expect_lock_time(env) { expected: { 'locked_at' => { - value: (env['locked_at']).to_s, + value: env['locked_at'].to_s, exists: true } } diff --git a/spec/aws/session_store/dynamo_db/rack_middleware_integration_spec.rb b/spec/aws/session_store/dynamo_db/rack_middleware_integration_spec.rb index 6fbbced..a6ee843 100644 --- a/spec/aws/session_store/dynamo_db/rack_middleware_integration_spec.rb +++ b/spec/aws/session_store/dynamo_db/rack_middleware_integration_spec.rb @@ -24,7 +24,7 @@ def attr_opts def extract_time(sid) options = table_opts(sid).merge(attr_opts) - Time.at((config.dynamo_db_client.get_item(options)[:item]['created_at']).to_f) + Time.at(config.dynamo_db_client.get_item(options)[:item]['created_at'].to_f) end let(:options) do From fe47030387df79125eac9bc5d627ce1ae5aa736e Mon Sep 17 00:00:00 2001 From: Juli Tera Date: Wed, 28 May 2025 07:49:41 -0700 Subject: [PATCH 3/3] Add Jruby 10 to CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bd41a1..e16f0c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: [2.7, '3.0', 3.1, 3.2, 3.3, 3.4, jruby-9.4] + ruby: [2.7, '3.0', 3.1, 3.2, 3.3, 3.4, jruby-9.4, jruby-10.0] services: dynamodb: image: amazon/dynamodb-local:latest