Skip to content

Commit 9a3ca1a

Browse files
authored
Merge pull request rails#52774 from amomchilov/Object-as_json-hoist-nil-check
Hoist `nil` check out of loop
2 parents fc92adf + 35d7664 commit 9a3ca1a

File tree

1 file changed

+9
-3
lines changed
  • activesupport/lib/active_support/core_ext/object

1 file changed

+9
-3
lines changed

activesupport/lib/active_support/core_ext/object/json.rb

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,11 @@ def as_json(options = nil) # :nodoc:
164164

165165
class Array
166166
def as_json(options = nil) # :nodoc:
167-
map { |v| options ? v.as_json(options.dup) : v.as_json }
167+
if options
168+
map { |v| v.as_json(options.dup) }
169+
else
170+
map { |v| v.as_json }
171+
end
168172
end
169173
end
170174

@@ -184,8 +188,10 @@ def as_json(options = nil) # :nodoc:
184188
end
185189

186190
result = {}
187-
subset.each do |k, v|
188-
result[k.to_s] = options ? v.as_json(options.dup) : v.as_json
191+
if options
192+
subset.each { |k, v| result[k.to_s] = v.as_json(options.dup) }
193+
else
194+
subset.each { |k, v| result[k.to_s] = v.as_json }
189195
end
190196
result
191197
end

0 commit comments

Comments
 (0)