From 6facf8898d11d383cc00ed83f07862a00973121b Mon Sep 17 00:00:00 2001 From: Lucas Hosseini Date: Mon, 26 Oct 2015 09:26:19 +0100 Subject: [PATCH] Rename `process_resource` into `resource_objects_for`. --- lib/active_model/serializer/adapter/json_api.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb index ea97ce304..cade7b676 100644 --- a/lib/active_model/serializer/adapter/json_api.rb +++ b/lib/active_model/serializer/adapter/json_api.rb @@ -51,7 +51,7 @@ def initialize(serializer, options = {}) def serializable_hash(options = nil) options ||= {} - resources = process_resource(serializer) + resources = resource_objects_for(serializer) primary_data, included = resources.each_with_object([[], []]) do |(_, resource), (prim, incl)| is_primary = resource.delete(:is_primary) if is_primary @@ -93,9 +93,9 @@ def fragment_cache(cached_hash, non_cached_hash) # on included associations. # # @api private - def process_resource(serializer, include_tree = @include_tree, is_primary = true, hashes = {}) + def resource_objects_for(serializer, include_tree = @include_tree, is_primary = true, hashes = {}) if serializer.respond_to?(:each) - serializer.each { |s| process_resource(s, include_tree, is_primary, hashes) } + serializer.each { |s| resource_objects_for(s, include_tree, is_primary, hashes) } return hashes end @@ -110,7 +110,7 @@ def process_resource(serializer, include_tree = @include_tree, is_primary = true hashes[key] = resource_object_for(serializer).merge(is_primary: is_primary) serializer.associations(include_tree).each do |association| - process_resource(association.serializer, include_tree[association.key], false, hashes) + resource_objects_for(association.serializer, include_tree[association.key], false, hashes) end hashes