Skip to content

Don't delete nulls inside Arrays #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Don't delete nulls inside Arrays #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 5 additions & 18 deletions lib/json/merge_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,18 @@ def call
private

def merge(orig, patch)
if is_array_or_primitive?(orig) || is_array_or_primitive?(patch)
orig = patch
else
if orig.kind_of?(Hash) && patch.kind_of?(Hash)
patch.each_key { |key| orig[key] = merge(orig[key], patch[key]) }
else
orig = patch
end

purge_nils orig
end

def is_array_or_primitive?(obj)
obj.kind_of?(Array) || is_primitive?(obj)
end

def is_primitive?(val)
[ String, Fixnum,
TrueClass, FalseClass,
NilClass
].include?(val.class)
end

def purge_nils(obj)
return obj if is_primitive?(obj)
return obj.compact if obj.kind_of?(Array)

obj.delete_if {|k, v| v.nil? }
obj.delete_if {|k, v| v.nil? } if obj.kind_of?(Hash)
obj
end
end
end
4 changes: 2 additions & 2 deletions test/merge_patch_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
it "replaces members" do
document = %q'{"foo":"bar"}'

merge_patch = %q'{"foo":"baz"}'
merge_patch = %q'{"foo":"baz","dev":[null,"bar"]}'

expected = %q'{"foo":"baz"}'
expected = %q'{"foo":"baz","dev":[null,"bar"]}'

assert_equal expected, JSON.merge(document, merge_patch)
end
Expand Down