Merge pull request #2307 from faucct/bugfix/double-evaluation-of-object

bf4 · web-flow · commit c6c3927e0076 · 2019-01-10T11:58:27.000-06:00
Reevaluation of object
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Features:
 
 Fixes:
 
+- [#2307](https://github.com/rails-api/active_model_serializers/pull/2307) Falsey attribute values should not be reevaluated.
 
 Misc:
 
diff --git a/lib/active_model/serializer/lazy_association.rb b/lib/active_model/serializer/lazy_association.rb
@@ -13,7 +13,8 @@ def reflection_options
       end
 
       def object
-        @object ||= reflection.value(
+        return @object if defined?(@object)
+        @object = reflection.value(
           association_options.fetch(:parent_serializer),
           association_options.fetch(:include_slice)
         )

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ Features:`
`8`	`8`
`9`	`9`	`Fixes:`
`10`	`10`
	`11`	`+- [#2307](https://github.com/rails-api/active_model_serializers/pull/2307) Falsey attribute values should not be reevaluated.`
`11`	`12`
`12`	`13`	`Misc:`
`13`	`14`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ def reflection_options`
`13`	`13`	`end`
`14`	`14`
`15`	`15`	`def object`
`16`		`- @object \|\|= reflection.value(`
	`16`	`+ return @object if defined?(@object)`
	`17`	`+ @object = reflection.value(`
`17`	`18`	`association_options.fetch(:parent_serializer),`
`18`	`19`	`association_options.fetch(:include_slice)`
`19`	`20`	`)`