From e19861a36c3f5b3ec264d7b7c4b41560e0aac691 Mon Sep 17 00:00:00 2001 From: soopa Date: Fri, 21 Oct 2011 08:15:19 -0500 Subject: [PATCH] prevent quoted nulls ("null") when to_json is called on nil relationship --- lib/dm-serializer/to_json.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dm-serializer/to_json.rb b/lib/dm-serializer/to_json.rb index a9c6152..6e7291b 100644 --- a/lib/dm-serializer/to_json.rb +++ b/lib/dm-serializer/to_json.rb @@ -41,7 +41,10 @@ def as_json(options = {}) if options[:relationships] options[:relationships].each do |relationship_name, opts| if respond_to?(relationship_name) - result[relationship_name] = __send__(relationship_name).to_json(opts.merge(:to_json => false)) + relationship = __send__(relationship_name) + result[relationship_name] = relationship ? + relationship.to_json(opts.merge(:to_json => false)) : + nil end end end