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

Add ruby 2.5 support, drop 2.2. #1813

Merged
merged 4 commits into from
Nov 3, 2018
+29 −28
Merged

Add ruby 2.5 support, drop 2.2. #1813

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
173985f
Update ruby version in travis
darren987469 Nov 2, 2018
ab07066
Update rails version
darren987469 Nov 2, 2018
9c942f4
Add ruby 2.5 support, drop 2.2.
darren987469 Nov 3, 2018
022a642
Update rack from 1.5.2 to 1.5.5
darren987469 Nov 3, 2018
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
44 changes: 22 additions & 22 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,51 @@ sudo: false

matrix:
include:
- rvm: 2.4.2
- rvm: 2.5.3
script:
- bundle exec danger
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: Gemfile
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: gemfiles/rack_edge.gemfile
- rvm: 2.4.2
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: gemfiles/rack_1.5.5.gemfile
- rvm: 2.5.3
gemfile: gemfiles/rails_edge.gemfile
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: gemfiles/multi_json.gemfile
script:
- bundle exec rake
- bundle exec rspec spec/integration/multi_json
- rvm: 2.4.2
- rvm: 2.5.3
gemfile: gemfiles/multi_xml.gemfile
script:
- bundle exec rake
- bundle exec rspec spec/integration/multi_xml
- rvm: 2.3.5
- rvm: 2.4.5
gemfile: Gemfile
- rvm: 2.3.5
- rvm: 2.4.5
gemfile: gemfiles/rack_edge.gemfile
- rvm: 2.3.5
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.3.5
- rvm: 2.4.5
gemfile: gemfiles/rack_1.5.5.gemfile
- rvm: 2.4.5
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.2.8
- rvm: 2.3.8
gemfile: Gemfile
- rvm: 2.2.8
gemfile: gemfiles/rack_1.5.2.gemfile
- rvm: 2.2.8
- rvm: 2.3.8
gemfile: gemfiles/rack_edge.gemfile
- rvm: 2.3.8
gemfile: gemfiles/rack_1.5.5.gemfile
- rvm: 2.3.8
gemfile: gemfiles/rails_5.gemfile
- rvm: 2.2.8
gemfile: gemfiles/rails_4.gemfile
- rvm: 2.2.8
gemfile: gemfiles/rails_3.gemfile
- rvm: 2.2.10
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-3
allow_failures:
- rvm: 2.2.10
- rvm: ruby-head
- rvm: jruby-head
- rvm: rbx-3
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#### Features

* Your contribution here.
* [#1795](/~https://github.com/ruby-grape/grape/pull/1803): Adds the ability to re-mount all endpoints in any location - [@myxoh](/~https://github.com/bschmeck).
* [#1813](/~https://github.com/ruby-grape/grape/pull/1813): Add ruby 2.5 support, drop 2.2. Update rails version in travis - [@darren987469](/~https://github.com/darren987469).
* [#1803](/~https://github.com/ruby-grape/grape/pull/1803): Adds the ability to re-mount all endpoints in any location - [@myxoh](/~https://github.com/bschmeck).
* [#1795](/~https://github.com/ruby-grape/grape/pull/1795): Fix vendor/subtype parsing of an invalid Accept header - [@bschmeck](/~https://github.com/bschmeck).
* [#1791](/~https://github.com/ruby-grape/grape/pull/1791): Support `summary`, `hidden`, `deprecated`, `is_array`, `nickname`, `produces`, `consumes`, `tags` options in `desc` block - [@darren987469](/~https://github.com/darren987469).

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rack_1.5.2.gemfile → gemfiles/rack_1.5.5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rack', '1.5.2'
gem 'rack', '1.5.5'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to remove this "appraisal", as it was added specifically for fixing #1066(missing patch version in rack 1.5.2).
any objections?

moreover, now I think it does not worth it :)


group :development, :test do
gem 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_3.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '3.2.19'
gem 'rails', '3.2.22.5'
gem 'rack-cache', '<= 1.2'

group :development, :test do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_4.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '4.1.6'
gem 'rails', '4.2.10'

group :development, :test do
gem 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

gem 'rails', '5.0.0'
gem 'rails', '5.2.1'

group :development, :test do
gem 'bundler'
Expand Down
2 changes: 1 addition & 1 deletion spec/grape/integration/rack_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
unless RUBY_PLATFORM == 'java'
major, minor, patch = Rack.release.split('.').map(&:to_i)
patch ||= 0 # rack <= 1.5.2 does not specify patch version
pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6)))
pending 'Rack 1.5.5 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 5) || (minor >= 6)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be changed, see #1066

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dm1try You are right. Thanks for catching that.

Is it a proper way to remove conditional pending test and update the gem dependency?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@darren987469 no worries, I addressed this in 87b6243

end

expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')
Expand Down