rename each_serializer to serializer

rails-api · Oct 27, 2014 · d3d72b0 · d3d72b0
1 parent f1c3752
commit d3d72b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb
@@ -135,7 +135,7 @@ def each_association(&block)
         serializer_class = ActiveModel::Serializer.serializer_for(association, options)
         serializer = serializer_class.new(
           association,
-          each_serializer_from_options(options)
+          serializer_from_options(options)
         )
 
         if block_given?
@@ -144,10 +144,10 @@ def each_association(&block)
       end
     end
 
-    def each_serializer_from_options(options)
+    def serializer_from_options(options)
       opts = {}
-      each_serializer = options.fetch(:options, {}).fetch(:serializer, nil)
-      opts[:each_serializer] = each_serializer if each_serializer
+      serializer = options.fetch(:options, {}).fetch(:serializer, nil)
+      opts[:serializer] = serializer if serializer
       opts
     end
 

diff --git a/lib/active_model/serializer/array_serializer.rb b/lib/active_model/serializer/array_serializer.rb
@@ -7,7 +7,10 @@ class ArraySerializer
       def initialize(objects, options = {})
         @objects = objects.map do |object|
           serializer_class =
-            options.fetch(:each_serializer, ActiveModel::Serializer.serializer_for(object))
+            options.fetch(
+              :serializer,
+              ActiveModel::Serializer.serializer_for(object)
+            )
           serializer_class.new(object)
         end
       end