Merge pull request #1254 from bf4/remove_useless_access_modifier

Remove unnecessarily silenced warnings

.rubocop_todo.yml

@@ -26,11 +26,6 @@ Lint/UnusedMethodArgument:
     - 'test/fixtures/poro.rb'
     - 'test/lint_test.rb'
 
-# Offense count: 1
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/active_model/serializable_resource.rb'
-
 # Offense count: 2
 Lint/UselessAssignment:
   Exclude:

lib/active_model/serializable_resource.rb

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

lib/active_model/serializer.rb

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

lib/active_model/serializer/adapter/fragment_cache.rb

@@ -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
-          attr_reader :instance_options, :adapter
+
-        end
+        private
 
         def cached_attributes(klass, serializers)
           attributes            = serializer.class._attributes

lib/active_model/serializer/adapter/json_api.rb

@@ -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
-          attr_reader :fieldset
+
-        end
+        private
 
         def serializable_hash_for_collection(options)
           hash = { data: [] }

lib/active_model/serializer/array_serializer.rb

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

lib/active_model/serializer/fieldset.rb

@@ -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
-        attr_reader :raw_fields
+
-      end
+      private
 
       def parsed_fields
         if raw_fields.is_a?(Hash)

lib/active_model_serializers.rb

@@ -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

test/action_controller/serialization_scope_name_test.rb

@@ -3,12 +3,10 @@ require 'pathname'
 
 class DefaultScopeNameTest < ActionController::TestCase
   class UserSerializer < ActiveModel::Serializer
-    attributes :admin?
+    def admin?
-    ActiveModelSerializers.silence_warnings do
+      current_user.admin
-      def admin?
-        current_user.admin
-      end
     end
+    attributes :admin?
   end
 
   class UserTestController < ActionController::Base
@@ -35,12 +33,10 @@ end
 
 class SerializationScopeNameTest < ActionController::TestCase
   class AdminUserSerializer < ActiveModel::Serializer
-    attributes :admin?
+    def admin?
-    ActiveModelSerializers.silence_warnings do
+      current_admin.admin
-      def admin?
-        current_admin.admin
-      end
     end
+    attributes :admin?
   end
 
   class AdminUserTestController < ActionController::Base