mirror of
https://github.com/samsonjs/grape-active_model_serializers.git
synced 2026-03-25 08:45:55 +00:00
Fix compatibility with Grape 2.3
This commit is contained in:
parent
eb200812c8
commit
7e58753b76
4 changed files with 5 additions and 7 deletions
4
Gemfile
4
Gemfile
|
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
||||||
|
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
case version = ENV['GRAPE_VERSION'] || '~> 1.0.0'
|
case version = ENV['GRAPE_VERSION'] || '~> 2.3.0'
|
||||||
when 'HEAD'
|
when 'HEAD'
|
||||||
gem 'grape', github: 'intridea/grape'
|
gem 'grape', github: 'intridea/grape'
|
||||||
else
|
else
|
||||||
|
|
@ -12,7 +12,7 @@ end
|
||||||
group :test do
|
group :test do
|
||||||
gem 'rack-test'
|
gem 'rack-test'
|
||||||
gem 'ruby-grape-danger', '~> 0.1.0', require: false
|
gem 'ruby-grape-danger', '~> 0.1.0', require: false
|
||||||
gem 'sequel', '~> 4.37', require: false
|
gem 'sequel', '~> 5.91', require: false
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
|
||||||
gem.version = Grape::ActiveModelSerializers::VERSION
|
gem.version = Grape::ActiveModelSerializers::VERSION
|
||||||
gem.licenses = ['MIT']
|
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'
|
gem.add_dependency 'active_model_serializers', '>= 0.10.0'
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
module Grape
|
module Grape
|
||||||
module ErrorFormatter
|
module ErrorFormatter
|
||||||
module ActiveModelSerializers
|
class ActiveModelSerializers < Base
|
||||||
extend Base
|
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
def call(message, backtrace, options = {}, env = nil, original_exception = nil)
|
def call(message, backtrace, options = {}, env = nil, original_exception = nil)
|
||||||
message = present(message, env) if respond_to?(:present)
|
message = present(message, env) if respond_to?(:present)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
module Grape
|
module Grape
|
||||||
module Formatter
|
module Formatter
|
||||||
module ActiveModelSerializers
|
class ActiveModelSerializers
|
||||||
class << self
|
class << self
|
||||||
def call(resource, env)
|
def call(resource, env)
|
||||||
options = build_options(resource, env)
|
options = build_options(resource, env)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue