Skip to content

Commit 8dfbc48

Browse files
author
Yohan Robert
committed
Simplify adapter deprecation and delegation
The Adapter module was refactored a bit to use Active Support delegation and remove duplicated code. The CHANGELOG was also added.
1 parent b50195f commit 8dfbc48

File tree

2 files changed

+11
-27
lines changed

2 files changed

+11
-27
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Fixes:
2929
- [#1488](https://github.com/rails-api/active_model_serializers/pull/1488) Require ActiveSupport's string inflections (@nate00)
3030

3131
Misc:
32+
- [#1559](https://github.com/rails-api/active_model_serializers/pull/1559) Add a deprecation DSL. (@bf4 @groyoh)
3233
- [#1543](https://github.com/rails-api/active_model_serializers/pull/1543) Add the changes missing from #1535. (@groyoh)
3334
- [#1535](https://github.com/rails-api/active_model_serializers/pull/1535) Move the adapter and adapter folder to
3435
active_model_serializers folder and changes the module namespace. (@domitian @bf4)

lib/active_model/serializer/adapter.rb

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,18 @@ module Adapter
55
class << self
66
extend ActiveModelSerializers::Deprecate
77

8-
def create(resource, options = {})
9-
ActiveModelSerializers::Adapter.create(resource, options)
8+
def self.delegate_and_deprecate(method)
9+
delegate method, to: ActiveModelSerializers::Adapter
10+
deprecate method, 'ActiveModelSerializers::Adapter.'
1011
end
11-
deprecate :create, 'ActiveModelSerializers::Adapter.'
12+
private_class_method :delegate_and_deprecate
1213

13-
def adapter_class(adapter)
14-
ActiveModelSerializers::Adapter.adapter_class(adapter)
15-
end
16-
deprecate :adapter_class, 'ActiveModelSerializers::Adapter.'
17-
18-
def adapter_map
19-
ActiveModelSerializers::Adapter.adapter_map
20-
end
21-
deprecate :adapter_map, 'ActiveModelSerializers::Adapter.'
22-
23-
def adapters
24-
ActiveModelSerializers::Adapter.adapters
25-
end
26-
deprecate :adapters, 'ActiveModelSerializers::Adapter.'
27-
28-
def register(name, klass = name)
29-
ActiveModelSerializers::Adapter.register(name, klass)
30-
end
31-
deprecate :register, 'ActiveModelSerializers::Adapter.'
32-
33-
def lookup(adapter)
34-
ActiveModelSerializers::Adapter.lookup(adapter)
35-
end
36-
deprecate :lookup, 'ActiveModelSerializers::Adapter.'
14+
delegate_and_deprecate :create
15+
delegate_and_deprecate :adapter_class
16+
delegate_and_deprecate :adapter_map
17+
delegate_and_deprecate :adapters
18+
delegate_and_deprecate :register
19+
delegate_and_deprecate :lookup
3720
end
3821

3922
require 'active_model/serializer/adapter/base'

0 commit comments

Comments
 (0)