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

Use rack-contrib JSONP instead of rack-jsonp #2427

Merged
merged 4 commits into from
Apr 10, 2024
Merged

Use rack-contrib JSONP instead of rack-jsonp #2427

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
9316e56
Use `rack-contrib` JSONP instead of rack-jsonp
ericproulx Apr 9, 2024
887ebb0
require 'jsonp' in spec
ericproulx Apr 9, 2024
a94d1a0
Add CHANGELOG
ericproulx Apr 9, 2024
e295175
Remove eval_gemfile
ericproulx Apr 9, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* [#2410](https://github.com/ruby-grape/grape/pull/2410): Gem deprecations will raise a DeprecationWarning in specs - [@ericproulx](https://github.com/ericproulx).
* [#2389](https://github.com/ruby-grape/grape/pull/2389): Remove rack-accept dependency - [@ericproulx](https://github.com/ericproulx).
* [#2426](https://github.com/ruby-grape/grape/pull/2426): Drop support for rack 1.x series - [@ericproulx](https://github.com/ericproulx).
* [#2427](https://github.com/ruby-grape/grape/pull/2427): Use `rack-contrib` jsonp instead of rack-jsonp - [@ericproulx](https://github.com/ericproulx).
* Your contribution here.

#### Fixes
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/multi_json.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/multi_xml.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/no_dry_validation.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rack_2_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rack_3_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rack_edge.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7_0.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7_1.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_edge.gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

group :test do
gem 'grape-entity', '~> 0.6', require: false
gem 'rack-jsonp', require: 'rack/jsonp'
gem 'rack-contrib', require: false
gem 'rack-test', '< 2.1'
gem 'rspec', '< 4'
gem 'ruby-grape-danger', '~> 0.2.0', require: false
Expand Down
1 change: 1 addition & 0 deletions spec/grape/entity_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# frozen_string_literal: true

require 'grape_entity'
require 'rack/contrib/jsonp'

describe Grape::Entity do
subject { Class.new(Grape::API) }
Expand Down
Loading