Merge de5c824 into 4753f67

ruby-grape · Oct 29, 2023 · 6faf1b2 · 6faf1b2
2 parents 4753f67 + de5c824
commit 6faf1b2
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 #### Fixes
 
+* [#2364](https://github.com/ruby-grape/grape/pull/2364): Add missing requires - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 ### 1.8.0 (2023/08/30)

diff --git a/Gemfile b/Gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rack_1_0.gemfile b/gemfiles/rack_1_0.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rack_2_0.gemfile b/gemfiles/rack_2_0.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rack_3_0.gemfile b/gemfiles/rack_3_0.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_7_0.gemfile b/gemfiles/rails_7_0.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -27,7 +27,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -26,7 +26,7 @@ end
 
 group :test do
   gem 'cookiejar'
-  gem 'grape-entity', '~> 0.6'
+  gem 'grape-entity', '~> 0.6', require: false
   gem 'mime-types'
   gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '< 2.1'

diff --git a/lib/grape.rb b/lib/grape.rb
@@ -16,6 +16,7 @@
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/hash/conversions'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/except'
@@ -24,7 +25,9 @@
 require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/deep_dup'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/string/exclude'
 require 'active_support/dependencies/autoload'
 require 'active_support/deprecation'
 require 'active_support/inflector'

diff --git a/spec/grape/endpoint_spec.rb b/spec/grape/endpoint_spec.rb
@@ -201,8 +201,8 @@ def app
       get('/username', {}, 'HTTP_COOKIE' => 'username=user; sandbox=false')
       expect(last_response.body).to eq('user_test')
       cookies = Array(last_response.headers['Set-Cookie']).flat_map { |h| h.split("\n") }
-      expect(cookies.first).to match(/username=user_test/)
-      expect(cookies.second).to match(/sandbox=true/)
+      expect(cookies[0]).to match(/username=user_test/)
+      expect(cookies[1]).to match(/sandbox=true/)
     end
 
     it 'deletes cookie' do