Refactor resource_identifier.

rails-api · Sep 1, 2015 · 6fdd377 · 6fdd377
1 parent d9c6805
commit 6fdd377
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/lib/active_model/serializer/adapter/json_api.rb b/lib/active_model/serializer/adapter/json_api.rb
@@ -44,13 +44,25 @@ def fragment_cache(cached_hash, non_cached_hash)
 
         private
 
+        def resource_identifier_type(serializer)
+          if ActiveModel::Serializer.config.jsonapi_resource_type == :singular
+            serializer.object.class.model_name.singular
+          else
+            serializer.object.class.model_name.plural
+          end
+        end
+
+        def resource_identifier_id(serializer)
+          if serializer.respond_to?('id')
+            serializer.id.to_s
+          else
+            serializer.object.id.to_s
+          end
+        end
+
         def resource_identifier(serializer)
-          type = if ActiveModel::Serializer.config.jsonapi_resource_type == :plural
-                   serializer.object.class.model_name.plural
-                 else
-                   serializer.object.class.model_name.singular
-                 end
-          id = serializer.respond_to?('id') ? serializer.id.to_s : serializer.object.id.to_s
+          type = resource_identifier_type(serializer)
+          id   = resource_identifier_id(serializer)
 
           { id: id, type: type }
         end