Skip to content

Commit c6a69e2

Browse files
committed
Migrate from ActiveSupport::Configurable to Dry::Configurable
- Add dry-configurable dependency to gemspec - Replace ActiveSupport::Configurable with Dry::Configurable - Move configuration settings to use Dry::Configurable syntax - Remove active_support/configurable require - Add dry-configurable require
1 parent c80b016 commit c6a69e2

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

grape.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
2323

2424
s.add_dependency 'activesupport', '>= 7.0'
2525
s.add_dependency 'dry-types', '>= 1.1'
26+
s.add_dependency 'dry-configurable'
2627
s.add_dependency 'mustermann-grape', '~> 1.1.0'
2728
s.add_dependency 'rack', '>= 2'
2829
s.add_dependency 'zeitwerk'

lib/grape.rb

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
require 'logger'
44
require 'active_support'
55
require 'active_support/concern'
6-
require 'active_support/configurable'
76
require 'active_support/version'
87
require 'active_support/isolated_execution_state'
98
require 'active_support/core_ext/array/conversions'
@@ -28,6 +27,7 @@
2827
require 'active_support/inflector'
2928
require 'active_support/ordered_options'
3029
require 'active_support/notifications'
30+
require 'dry-configurable'
3131

3232
require 'English'
3333
require 'bigdecimal'
@@ -57,7 +57,10 @@
5757
I18n.load_path << File.expand_path('grape/locale/en.yml', __dir__)
5858

5959
module Grape
60-
include ActiveSupport::Configurable
60+
extend Dry::Configurable
61+
62+
setting :param_builder, default: :hash_with_indifferent_access
63+
setting :lint, default: false
6164

6265
HTTP_SUPPORTED_METHODS = [
6366
Rack::GET,
@@ -72,12 +75,6 @@ module Grape
7275
def self.deprecator
7376
@deprecator ||= ActiveSupport::Deprecation.new('2.0', 'Grape')
7477
end
75-
76-
configure do |config|
77-
config.param_builder = :hash_with_indifferent_access
78-
config.lint = false
79-
config.compile_methods!
80-
end
8178
end
8279

8380
# https://api.rubyonrails.org/classes/ActiveSupport/Deprecation.html

0 commit comments

Comments
 (0)