Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions lib/mongoid-cached-json/cached_json.rb
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,11 @@ def resolve_json_reference(options, object, _field, reference_def)
reference_def_definition = reference_def[:definition]
reference = reference_def_definition.is_a?(Symbol) ? object.send(reference_def_definition) : reference_def_definition.call(object)
reference_json = nil
if reference
if reference.respond_to?(:as_json_partial)
reference_keys, reference_json = reference.as_json_partial(options)
keys = keys ? keys.merge_set(reference_keys) : reference_keys
else
reference_json = reference.as_json(options)
end
if reference.respond_to?(:as_json_partial)
reference_keys, reference_json = reference.as_json_partial(options)
keys = keys ? keys.merge_set(reference_keys) : reference_keys
else
reference_json = reference.as_json(options)
end
end
[keys, reference_json]
Expand Down
8 changes: 8 additions & 0 deletions spec/cached_json_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@
expect(@image.as_json(properties: :all)).to eq(name: 'Image', urls: [])
end
end
context 'evaluating a false-y value in a reference type' do
it 'correctly returns false instead of nil' do
manager = JsonManager.create!(name: 'Boss')
manager.json_employees.create!(name: 'Matt')
manager_short_json = manager.as_json(properties: :short)
expect(manager_short_json[:has_left_handed_employee]).to eq(false)
end
end
end
end
end
1 change: 1 addition & 0 deletions spec/support/json_employee.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class JsonEmployee

field :name
field :nickname, default: 'My Favorite'
field :is_left_handed, type: Boolean, default: false
belongs_to :json_manager

json_fields \
Expand Down
7 changes: 6 additions & 1 deletion spec/support/json_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ class JsonManager
belongs_to :supervisor, class_name: 'JsonSupervisor', required: false
end

def has_left_handed_employee?
json_employees.any? { |e| e.is_left_handed? }
end

json_fields \
name: {},
ssn: { properties: :all },
employees: { type: :reference, definition: :json_employees }
employees: { type: :reference, definition: :json_employees },
has_left_handed_employee: { type: :reference, definition: :has_left_handed_employee? }
end