Merge pull request #1254 from bf4/remove_useless_access_modifier

Remove unnecessarily silenced warnings
This commit is contained in:
L. Preston Sego III
2015-10-07 07:22:15 -04:00
9 changed files with 26 additions and 39 deletions

View File

@@ -61,10 +61,8 @@ module ActiveModel
use_adapter? && !!(serializer)
end
private
protected
ActiveModelSerializers.silence_warnings do
attr_reader :resource, :adapter_opts, :serializer_opts
end
attr_reader :resource, :adapter_opts, :serializer_opts
end
end

View File

@@ -157,10 +157,8 @@ module ActiveModel
end
end
private # rubocop:disable Lint/UselessAccessModifier
protected
ActiveModelSerializers.silence_warnings do
attr_accessor :instance_options
end
attr_accessor :instance_options
end
end

View File

@@ -30,11 +30,11 @@ module ActiveModel
adapter.fragment_cache(cached_hash, non_cached_hash)
end
private
protected
ActiveModelSerializers.silence_warnings do
attr_reader :instance_options, :adapter
end
attr_reader :instance_options, :adapter
private
def cached_attributes(klass, serializers)
attributes = serializer.class._attributes

View File

@@ -73,11 +73,11 @@ module ActiveModel
ActiveModel::Serializer::Adapter::JsonApi::FragmentCache.new.fragment_cache(root, cached_hash, non_cached_hash)
end
private
protected
ActiveModel.silence_warnings do
attr_reader :fieldset
end
attr_reader :fieldset
private
def serializable_hash_for_collection(options)
hash = { data: [] }

View File

@@ -34,11 +34,9 @@ module ActiveModel
object.respond_to?(:size)
end
private # rubocop:disable Lint/UselessAccessModifier
protected
ActiveModelSerializers.silence_warnings do
attr_reader :serializers
end
attr_reader :serializers
end
end
end

View File

@@ -13,11 +13,11 @@ module ActiveModel
fields[type.singularize.to_sym] || fields[type.pluralize.to_sym]
end
private
protected
ActiveModelSerializers.silence_warnings do
attr_reader :raw_fields
end
attr_reader :raw_fields
private
def parsed_fields
if raw_fields.is_a?(Hash)

View File

@@ -30,6 +30,8 @@ module ActiveModelSerializers
# attr_reader :resource, :adapter_opts, :serializer_opts
# end
# ```
#
# or, as specific stopgap, define the attrs in the protected scope.
def silence_warnings
verbose = $VERBOSE
$VERBOSE = nil