Skip to content

New deep merge #770

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

Merged
merged 2 commits into from
Oct 9, 2017
Merged

New deep merge #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b31abd8
Fix whitespace
nateberkopec Oct 9, 2017
c7f43bb
Use the new deep_merge from Rails, 5-10% faster
nateberkopec Oct 9, 2017
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
20 changes: 6 additions & 14 deletions lib/raven/utils/deep_merge.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# rubocop:disable all
module Raven
module Utils
# ported from ActiveSupport
Expand All @@ -8,23 +7,16 @@ def self.deep_merge(hash, other_hash, &block)
end

def self.deep_merge!(hash, other_hash, &block)
other_hash.each_pair do |current_key, other_value|
this_value = hash[current_key]

hash[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
deep_merge(this_value, other_value, &block)
hash.merge!(other_hash) do |key, this_val, other_val|
if this_val.is_a?(Hash) && other_val.is_a?(Hash)
deep_merge(this_val, other_val, &block)
elsif block_given?
block.call(key, this_val, other_val)
else
if block_given? && key?(current_key)
block.call(current_key, this_value, other_value)
else
other_value
end
other_val
end
end

hash
end
end
end
end
# rubocop:enable all
2 changes: 1 addition & 1 deletion spec/raven/processors/utf8conversion_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
data = ["\xE2\x9C\x89 Hello".force_encoding(Encoding::ASCII_8BIT).freeze]

results = @processor.process(data)

expect(JSON.generate(results)).to eq("[\"✉ Hello\"]")
end
end