From caaedba5fc7ba3113f7b7821557f4f97e1299765 Mon Sep 17 00:00:00 2001 From: Adam Michela Date: Wed, 25 Sep 2013 10:01:39 -0700 Subject: [PATCH] prevent quoted 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 e3ece92..27d7c7f 100644 --- a/lib/dm-serializer/to_json.rb +++ b/lib/dm-serializer/to_json.rb @@ -40,7 +40,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