Merge pull request #1048 from bf4/cleanup_meta_in_adapter

Let FlattenJson adapter decide it doesn't include meta
rails-api · Aug 18, 2015 · e384b65 · e384b65
2 parents e7d3323 + 98d009a
commit e384b65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/active_model/serializer/adapter.rb b/lib/active_model/serializer/adapter.rb
@@ -22,7 +22,7 @@ def serializable_hash(options = nil)
 
       def as_json(options = nil)
         hash = serializable_hash(options)
-        include_meta(hash) unless self.class == FlattenJson
+        include_meta(hash)
         hash
       end
 

diff --git a/lib/active_model/serializer/adapter/flatten_json.rb b/lib/active_model/serializer/adapter/flatten_json.rb
@@ -6,6 +6,13 @@ def serializable_hash(options = {})
           super
           @result
         end
+
+        private
+
+        # no-op: FlattenJson adapter does not include meta data, because it does not support root.
+        def include_meta(json)
+          json
+        end
       end
     end
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,13 @@ def serializable_hash(options = {}) @@
               super
               @result
             end
+            private
+            # no-op: FlattenJson adapter does not include meta data, because it does not support root.
+            def include_meta(json)
+              json
+            end
           end
         end
       end
@@ Expand Down @@