Skip to content

Loosen rack requirement to allow for rack 3 #34

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.

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

Merged
merged 4 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,25 @@ jobs:
strategy:
fail-fast: false
matrix:
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]
ruby: [2.5, 2.6, 2.7, '3.0', 3.1, 3.2, 3.3, jruby-9.2, jruby-9.3, jruby-9.4]
env: [RACK2, RACK3]

steps:
- name: Setup
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Install
run: bundle install --without docs
- name: Setup environment
run: |
echo "${{ matrix.env }}=1" >> $GITHUB_ENV

- name: Test
- name: Install gems
run: |
bundle config set --local without 'docs'
bundle install

- name: Tests
run: bundle exec rake spec
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Unreleased Changes
------------------

* Feature - Drop support for Ruby 2.3 and 2.4.

* Issue - Relax `rack` dependency to allow version 3. Adds `rack-session` to the gemspec.

2.1.0 (2023-06-02)
------------------

Expand Down
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
source 'https://rubygems.org'

if ENV['RACK2']
gem 'rack', '~> 2'
end

gemspec

gem 'rake', require: false
Expand All @@ -11,8 +15,8 @@ end

group :test do
gem 'rspec'
gem 'simplecov', require: false
gem 'rack-test'
gem 'simplecov'

if RUBY_VERSION >= '3.0'
gem 'rexml'
Expand Down
7 changes: 5 additions & 2 deletions aws-sessionstore-dynamodb.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
spec.name = "aws-sessionstore-dynamodb"
spec.version = version
spec.authors = ["Amazon Web Services"]
spec.email = ["[email protected]", "alexwoo@amazon.com"]
spec.email = ["aws-dr-rubygems@amazon.com"]

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

# Require 1.85.0 for user_agent_frameworks config
spec.add_dependency 'aws-sdk-dynamodb', '~> 1', '>= 1.85.0'
spec.add_dependency 'rack', '~> 2'
spec.add_dependency 'rack', '>= 2', '< 4'
spec.add_dependency 'rack-session', '>= 1', '< 3'

spec.required_ruby_version = '>= 2.5'
end
9 changes: 2 additions & 7 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,8 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.

begin
if ENV['COVERAGE']
require 'simplecov'
SimpleCov.start { add_filter 'spec' }
end
rescue LoadError
end
require 'simplecov'
SimpleCov.start { add_filter 'spec' }

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

Expand Down