Rails 7 - uninitialized constant ActiveSupport::XmlMini::IsolatedExecutionState (#2208)

ericproulx · web-flow · commit 8c809fa45a72 · 2021-12-27T11:51:15.000-05:00
* Add require 'active_support/isolated_execution_state' when ActiveSupport::VERSION::MAJOR &gt; 6
Add rails-7

* Add require 'active_support/isolated_execution_state' when ActiveSupport::VERSION::MAJOR &gt; 6
Add rails-7 appraisals
Fix rubocop Performance/StringIdentifierArgument

* Add test Rails 7
Add CHANGELOG
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -46,12 +46,18 @@ jobs:
           - ruby: "3.0"
             gemfile: 'gemfiles/multi_xml.gemfile'
             experimental: false
+          - ruby: "3.0"
+            gemfile: 'gemfiles/rails_7.gemfile'
+            experimental: false
           - ruby: 2.7
             gemfile: 'gemfiles/multi_json.gemfile'
             experimental: false
           - ruby: 2.7
             gemfile: 'gemfiles/multi_xml.gemfile'
             experimental: false
+          - ruby: 2.7
+            gemfile: 'gemfiles/rails_7.gemfile'
+            experimental: false
           - ruby: 2.7
             gemfile: 'gemfiles/rails_edge.gemfile'
             experimental: false
diff --git a/Appraisals b/Appraisals
@@ -12,6 +12,10 @@ appraise 'rails-6-1' do
   gem 'rails', '~> 6.1'
 end
 
+appraise 'rails-7' do
+  gem 'rails', '~> 7.0'
+end
+
 appraise 'rails-edge' do
   gem 'rails', github: 'rails/rails'
 end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 #### Features
 
 * [#2196](https://github.com/ruby-grape/grape/pull/2196): Add support for `passwords_hashed` param for `digest_auth` - [@lHydra](https://github.com/lhydra).
+* [#2208](https://github.com/ruby-grape/grape/pull/2208): Added Rails 7 support - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes
diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '~> 1.23.0'
+  gem 'rubocop-ast', '~> 1.14.0'
+  gem 'rubocop-performance', require: false
+  gem 'rubocop-rspec', require: false
+end
+
+group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'benchmark-memory'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end
+
+group :test do
+  gem 'cookiejar'
+  gem 'coveralls_reborn'
+  gem 'grape-entity', '~> 0.6'
+  gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'rack-test', '~> 1.1.0'
+  gem 'rspec', '~> 3.0'
+  gem 'ruby-grape-danger', '~> 0.2.0', require: false
+  gem 'test-prof', require: false
+end
+
+platforms :jruby do
+  gem 'racc'
+end
+
+gemspec path: '../'
diff --git a/lib/grape.rb b/lib/grape.rb
@@ -9,6 +9,7 @@
 require 'set'
 require 'active_support'
 require 'active_support/version'
+require 'active_support/isolated_execution_state' if ActiveSupport::VERSION::MAJOR > 6
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array/conversions'
