Fix warnings

Author: bf4

lib/active_model/serializable_resource.rb

@@ -1,4 +1,4 @@
-require "set"
+require 'set'
 module ActiveModel
   class SerializableResource
 
@@ -76,7 +76,9 @@ def serializer?
 
     private
 
+    ActiveModelSerializers.silence_warnings do
     attr_reader :resource, :adapter_opts, :serializer_opts
+    end
 
   end
 end

lib/active_model/serializer.rb

@@ -9,6 +9,7 @@ class Serializer
     autoload :Adapter
     autoload :Lint
     autoload :Associations
+    autoload :Fieldset
     include Configuration
     include Associations
 
@@ -51,10 +52,10 @@ def self.attribute(attr, options = {})
       @_attributes_keys[attr] = { key: key } if key != attr
       @_attributes << key unless @_attributes.include?(key)
 
-      unless respond_to?(key, false) || _fragmented.respond_to?(attr)
+      ActiveModelSerializers.silence_warnings do
         define_method key do
           object.read_attribute_for_serialization(attr)
-        end
+        end unless respond_to?(key, false) || _fragmented.respond_to?(attr)
       end
     end
 

lib/active_model/serializer/adapter.rb

@@ -1,13 +1,25 @@
-require 'active_model/serializer/adapter/fragment_cache'
-
 module ActiveModel
   class Serializer
     class Adapter
       extend ActiveSupport::Autoload
-      autoload :Json
+      require 'active_model/serializer/adapter/json'
+      require 'active_model/serializer/adapter/json_api'
       autoload :FlattenJson
       autoload :Null
-      autoload :JsonApi
+      autoload :FragmentCache
+
+      def self.create(resource, options = {})
+        override = options.delete(:adapter)
+        klass = override ? adapter_class(override) : ActiveModel::Serializer.adapter
+        klass.new(resource, options)
+      end
+
+      def self.adapter_class(adapter)
+        adapter_name = adapter.to_s.classify.sub("API", "Api")
+        "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
+      end
+
+      ##### AbstractAdapter
 
       attr_reader :serializer
 
@@ -26,17 +38,6 @@ def as_json(options = nil)
         hash
       end
 
-      def self.create(resource, options = {})
-        override = options.delete(:adapter)
-        klass = override ? adapter_class(override) : ActiveModel::Serializer.adapter
-        klass.new(resource, options)
-      end
-
-      def self.adapter_class(adapter)
-        adapter_name = adapter.to_s.classify.sub("API", "Api")
-        "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize
-      end
-
       def fragment_cache(*args)
         raise NotImplementedError, 'This is an abstract method. Should be implemented at the concrete adapter.'
       end
@@ -94,6 +95,7 @@ def include_meta(json)
         json[meta_key] = meta if meta
         json
       end
+      ##### AbstractAdapter
     end
   end
 end

lib/active_model/serializer/adapter/json/fragment_cache.rb

@@ -1,3 +1,4 @@
+require 'active_model/serializer/adapter/fragment_cache'
 module ActiveModel
   class Serializer
     class Adapter
@@ -12,4 +13,4 @@ def fragment_cache(cached_hash, non_cached_hash)
       end
     end
   end
-end
+end

lib/active_model/serializer/adapter/json_api/fragment_cache.rb

@@ -1,3 +1,4 @@
+require 'active_model/serializer/adapter/fragment_cache'
 module ActiveModel
   class Serializer
     class Adapter
@@ -20,4 +21,4 @@ def fragment_cache(root, cached_hash, non_cached_hash)
       end
     end
   end
-end
+end

lib/active_model/serializer/associations.rb

@@ -73,11 +73,9 @@ def has_one(name, options = {})
         def associate(reflection)
           self._reflections = _reflections.dup
 
-          unless method_defined?(reflection.name)
-            define_method reflection.name do
-              object.send reflection.name
-            end
-          end
+          define_method reflection.name do
+            object.send reflection.name
+          end unless method_defined?(reflection.name)
 
           self._reflections << reflection
         end

lib/active_model/serializer/fieldset.rb

@@ -18,7 +18,9 @@ def fields_for(serializer)
 
     private
 
+      ActiveModelSerializers.silence_warnings do
       attr_reader :raw_fields, :root
+      end
 
       def parsed_fields
         if raw_fields.is_a?(Hash)
@@ -37,4 +39,4 @@ def parsed_fields
 
     end
   end
-end
+end

lib/active_model_serializers.rb

@@ -1,7 +1,18 @@
+module ActiveModelSerializers
+  module_function
+
+  def silence_warnings
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = verbose
+  end
+
+end
 require 'active_model'
 require 'active_model/serializer/version'
 require 'active_model/serializer'
-require 'active_model/serializer/fieldset'
 require 'active_model/serializable_resource'
 
 begin

test/action_controller/serialization_scope_name_test.rb

@@ -4,8 +4,10 @@
 class DefaultScopeNameTest < ActionController::TestCase
   class UserSerializer < ActiveModel::Serializer
     attributes :admin?
-    def admin?
-      current_user.admin
+    ActiveModelSerializers.silence_warnings do
+      def admin?
+        current_user.admin
+      end
     end
   end
 
@@ -34,8 +36,10 @@ def test_default_scope_name
 class SerializationScopeNameTest < ActionController::TestCase
   class AdminUserSerializer < ActiveModel::Serializer
     attributes :admin?
-    def admin?
-      current_admin.admin
+    ActiveModelSerializers.silence_warnings do
+      def admin?
+        current_admin.admin
+      end
     end
   end
 
@@ -60,4 +64,4 @@ def test_override_scope_name_with_controller
     get :render_new_user
     assert_equal '{"data":{"id":"1","type":"users","attributes":{"admin?":true}}}', @response.body
   end
-end
+end

test/action_controller/serialization_test.rb

@@ -129,7 +129,6 @@ def render_fragment_changed_object_with_except_cache_enabled
         def render_fragment_changed_object_with_relationship
           comment = Comment.new({ id: 1, body: 'ZOMG A COMMENT' })
           comment2 = Comment.new({ id: 1, body: 'ZOMG AN UPDATED-BUT-NOT-CACHE-EXPIRED COMMENT' })
-          author = Author.new(id: 1, name: 'Joao Moura.')
           like = Like.new({ id: 1, likeable: comment, time: 3.days.ago })
 
           generate_cached_serializer(like)
@@ -405,9 +404,9 @@ def use_adapter?
             false
           end
         }.new
-        assert_match /adapter: false/, (capture(:stderr) {
+        assert_match(/adapter: false/, (capture(:stderr) {
           controller.get_serializer(Profile.new)
-        })
+        }))
       end
 
       def test_dont_warn_overridding_use_adapter_as_truthy_on_controller_instance