Skip to content

Commit 8de8127

Browse files
authored
Loosen rack requirement to allow for rack 3 (#34)
1 parent 5a270ea commit 8de8127

File tree

6 files changed

+29
-40
lines changed

6 files changed

+29
-40
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,25 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1, 3.2, jruby-9.1, jruby-9.2, jruby-9.3, jruby-9.4]
18+
ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.2, jruby-9.3, jruby-9.4]
19+
env: [RACK2, RACK3]
1920

2021
steps:
21-
- name: Setup
22+
- name: Setup Ruby
2223
uses: ruby/setup-ruby@v1
2324
with:
2425
ruby-version: ${{ matrix.ruby }}
2526

26-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2728

28-
- name: Install
29-
run: bundle install --without docs
29+
- name: Setup environment
30+
run: |
31+
echo "${{ matrix.env }}=1" >> $GITHUB_ENV
3032
31-
- name: Test
33+
- name: Install gems
34+
run: |
35+
bundle config set --local without 'docs'
36+
bundle install
37+
38+
- name: Tests
3239
run: bundle exec rake spec

.travis.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Unreleased Changes
22
------------------
33

4+
* Feature - Drop support for Ruby 2.3 and 2.4.
5+
6+
* Issue - Relax `rack` dependency to allow version 3. Adds `rack-session` to the gemspec.
7+
48
2.1.0 (2023-06-02)
59
------------------
610

Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
source 'https://rubygems.org'
22

3+
if ENV['RACK2']
4+
gem 'rack', '~> 2'
5+
end
6+
37
gemspec
48

59
gem 'rake', require: false
@@ -11,8 +15,8 @@ end
1115

1216
group :test do
1317
gem 'rspec'
14-
gem 'simplecov', require: false
1518
gem 'rack-test'
19+
gem 'simplecov'
1620

1721
if RUBY_VERSION >= '3.0'
1822
gem 'rexml'

aws-sessionstore-dynamodb.gemspec

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
44
spec.name = "aws-sessionstore-dynamodb"
55
spec.version = version
66
spec.authors = ["Amazon Web Services"]
7-
spec.email = ["[email protected]", "alexwoo@amazon.com"]
7+
spec.email = ["aws-dr-rubygems@amazon.com"]
88

99
spec.summary = "The Amazon DynamoDB Session Store handles sessions " +
1010
"for Ruby web applications using a DynamoDB backend."
@@ -17,5 +17,8 @@ Gem::Specification.new do |spec|
1717

1818
# Require 1.85.0 for user_agent_frameworks config
1919
spec.add_dependency 'aws-sdk-dynamodb', '~> 1', '>= 1.85.0'
20-
spec.add_dependency 'rack', '~> 2'
20+
spec.add_dependency 'rack', '>= 2', '< 4'
21+
spec.add_dependency 'rack-session', '>= 1', '< 3'
22+
23+
spec.required_ruby_version = '>= 2.5'
2124
end

spec/spec_helper.rb

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@
1313
# ANY KIND, either express or implied. See the License for the specific
1414
# language governing permissions and limitations under the License.
1515

16-
begin
17-
if ENV['COVERAGE']
18-
require 'simplecov'
19-
SimpleCov.start { add_filter 'spec' }
20-
end
21-
rescue LoadError
22-
end
16+
require 'simplecov'
17+
SimpleCov.start { add_filter 'spec' }
2318

2419
$LOAD_PATH << File.join(File.dirname(File.dirname(__FILE__)), 'lib')
2520

0 commit comments

Comments
 (0)