LazyAssociation#object should not reevaluate reflection values

faucct · faucct · commit a39794df5b72 · 2019-01-09T09:52:38.000+03:00
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
@@ -11,7 +11,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
`@@ -11,7 +11,8 @@ def reflection_options`
`11`	`11`	`end`
`12`	`12`
`13`	`13`	`def object`
`14`		`- @object \|\|= reflection.value(`
	`14`	`+ return @object if defined?(@object)`
	`15`	`+ @object = reflection.value(`
`15`	`16`	`association_options.fetch(:parent_serializer),`
`16`	`17`	`association_options.fetch(:include_slice)`
`17`	`18`	`)`