Skip to content

Commit dc44b13

Browse files
committed
Remove unnecessarily silenced warnings
1 parent d02cd30 commit dc44b13

File tree

9 files changed

+26
-39
lines changed

9 files changed

+26
-39
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ Lint/UnusedMethodArgument:
2626
- 'test/fixtures/poro.rb'
2727
- 'test/lint_test.rb'
2828

29-
# Offense count: 1
30-
Lint/UselessAccessModifier:
31-
Exclude:
32-
- 'lib/active_model/serializable_resource.rb'
33-
3429
# Offense count: 2
3530
Lint/UselessAssignment:
3631
Exclude:

lib/active_model/serializable_resource.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ def serializer?
6161
use_adapter? && !!(serializer)
6262
end
6363

64-
private
64+
protected
6565

66-
ActiveModelSerializers.silence_warnings do
67-
attr_reader :resource, :adapter_opts, :serializer_opts
68-
end
66+
attr_reader :resource, :adapter_opts, :serializer_opts
6967
end
7068
end

lib/active_model/serializer.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,8 @@ def attributes
154154
end
155155
end
156156

157-
private # rubocop:disable Lint/UselessAccessModifier
157+
protected
158158

159-
ActiveModelSerializers.silence_warnings do
160-
attr_accessor :instance_options
161-
end
159+
attr_accessor :instance_options
162160
end
163161
end

lib/active_model/serializer/adapter/fragment_cache.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ def fetch
3030
adapter.fragment_cache(cached_hash, non_cached_hash)
3131
end
3232

33-
private
33+
protected
3434

35-
ActiveModelSerializers.silence_warnings do
36-
attr_reader :instance_options, :adapter
37-
end
35+
attr_reader :instance_options, :adapter
36+
37+
private
3838

3939
def cached_attributes(klass, serializers)
4040
attributes = serializer.class._attributes

lib/active_model/serializer/adapter/json_api.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ def fragment_cache(cached_hash, non_cached_hash)
7373
ActiveModel::Serializer::Adapter::JsonApi::FragmentCache.new.fragment_cache(root, cached_hash, non_cached_hash)
7474
end
7575

76-
private
76+
protected
7777

78-
ActiveModel.silence_warnings do
79-
attr_reader :fieldset
80-
end
78+
attr_reader :fieldset
79+
80+
private
8181

8282
def serializable_hash_for_collection(options)
8383
hash = { data: [] }

lib/active_model/serializer/array_serializer.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,9 @@ def paginated?
3434
object.respond_to?(:size)
3535
end
3636

37-
private # rubocop:disable Lint/UselessAccessModifier
37+
protected
3838

39-
ActiveModelSerializers.silence_warnings do
40-
attr_reader :serializers
41-
end
39+
attr_reader :serializers
4240
end
4341
end
4442
end

lib/active_model/serializer/fieldset.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ def fields_for(type)
1313
fields[type.singularize.to_sym] || fields[type.pluralize.to_sym]
1414
end
1515

16-
private
16+
protected
1717

18-
ActiveModelSerializers.silence_warnings do
19-
attr_reader :raw_fields
20-
end
18+
attr_reader :raw_fields
19+
20+
private
2121

2222
def parsed_fields
2323
if raw_fields.is_a?(Hash)

lib/active_model_serializers.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ module ActiveModelSerializers
3030
# attr_reader :resource, :adapter_opts, :serializer_opts
3131
# end
3232
# ```
33+
#
34+
# or, as specific stopgap, define the attrs in the protected scope.
3335
def silence_warnings
3436
verbose = $VERBOSE
3537
$VERBOSE = nil

test/action_controller/serialization_scope_name_test.rb

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33

44
class DefaultScopeNameTest < ActionController::TestCase
55
class UserSerializer < ActiveModel::Serializer
6-
attributes :admin?
7-
ActiveModelSerializers.silence_warnings do
8-
def admin?
9-
current_user.admin
10-
end
6+
def admin?
7+
current_user.admin
118
end
9+
attributes :admin?
1210
end
1311

1412
class UserTestController < ActionController::Base
@@ -35,12 +33,10 @@ def test_default_scope_name
3533

3634
class SerializationScopeNameTest < ActionController::TestCase
3735
class AdminUserSerializer < ActiveModel::Serializer
38-
attributes :admin?
39-
ActiveModelSerializers.silence_warnings do
40-
def admin?
41-
current_admin.admin
42-
end
36+
def admin?
37+
current_admin.admin
4338
end
39+
attributes :admin?
4440
end
4541

4642
class AdminUserTestController < ActionController::Base

0 commit comments

Comments
 (0)