From 7e58753b765e0abf6f44c9d9e4312cef30f43de1 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Wed, 23 Apr 2025 15:23:37 -0700 Subject: [PATCH] Fix compatibility with Grape 2.3 --- Gemfile | 4 ++-- grape-active_model_serializers.gemspec | 2 +- lib/grape-active_model_serializers/error_formatter.rb | 4 +--- lib/grape-active_model_serializers/formatter.rb | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 9d8509f..c9b3f8a 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gemspec -case version = ENV['GRAPE_VERSION'] || '~> 1.0.0' +case version = ENV['GRAPE_VERSION'] || '~> 2.3.0' when 'HEAD' gem 'grape', github: 'intridea/grape' else @@ -12,7 +12,7 @@ end group :test do gem 'rack-test' gem 'ruby-grape-danger', '~> 0.1.0', require: false - gem 'sequel', '~> 4.37', require: false + gem 'sequel', '~> 5.91', require: false gem 'sqlite3' end diff --git a/grape-active_model_serializers.gemspec b/grape-active_model_serializers.gemspec index 4c6cf0a..85fcc86 100644 --- a/grape-active_model_serializers.gemspec +++ b/grape-active_model_serializers.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |gem| gem.version = Grape::ActiveModelSerializers::VERSION gem.licenses = ['MIT'] - gem.add_dependency 'grape', '>= 0.8.0' + gem.add_dependency 'grape', '>= 2.3.0' gem.add_dependency 'active_model_serializers', '>= 0.10.0' end diff --git a/lib/grape-active_model_serializers/error_formatter.rb b/lib/grape-active_model_serializers/error_formatter.rb index a071f2a..fa34def 100644 --- a/lib/grape-active_model_serializers/error_formatter.rb +++ b/lib/grape-active_model_serializers/error_formatter.rb @@ -1,8 +1,6 @@ module Grape module ErrorFormatter - module ActiveModelSerializers - extend Base - + class ActiveModelSerializers < Base class << self def call(message, backtrace, options = {}, env = nil, original_exception = nil) message = present(message, env) if respond_to?(:present) diff --git a/lib/grape-active_model_serializers/formatter.rb b/lib/grape-active_model_serializers/formatter.rb index 19b0183..c9c3ed8 100644 --- a/lib/grape-active_model_serializers/formatter.rb +++ b/lib/grape-active_model_serializers/formatter.rb @@ -1,6 +1,6 @@ module Grape module Formatter - module ActiveModelSerializers + class ActiveModelSerializers class << self def call(resource, env) options = build_options(resource, env)