Skip to content
Merged
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
52 changes: 34 additions & 18 deletions lib/json/merge_patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,47 @@ def call
elsif is_primitive?(@patch) || is_primitive?(@orig)
@orig = @patch
elsif @patch.kind_of?(Hash)
@patch.each_key do |m|
if @orig.has_key?(m)
if @patch[m].nil?
@orig.delete(m)
else
if is_primitive?(@patch[m])
@orig[m] = @patch[m]
else
if @orig[m].kind_of?(Array)
@orig[m] = purge_nils(@patch[m])
else
@orig[m] = self.class.new(@orig[m], @patch[m]).call
end
end
end
elsif !(@patch[m].nil?)
@orig[m] = purge_nils(@patch[m])
end
@patch.each_key do |property|
process_patch_property(property)
end
end
@orig
end

private

def process_patch_property(property)
if @orig.has_key?(property)
evaluate_patch_property(property)
elsif !(@patch[property].nil?)
@orig[property] = purge_nils(@patch[property])
end
end

def evaluate_patch_property(property)
if @patch[property].nil?
remove_property(property)
else
@orig[property] = update_property(property)
end
end

def remove_property(property)
@orig.delete(property)
end

def update_property(property)
if is_primitive?(@patch[property])
@patch[property]
else
if @orig[property].kind_of?(Array)
purge_nils(@patch[property])
else
self.class.new(@orig[property], @patch[property]).call
end
end
end

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