Skip to content
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

typo: mergable => mergeable #635

Merged
merged 1 commit into from
Oct 14, 2022
Merged

typo: mergable => mergeable #635

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
2 changes: 1 addition & 1 deletion bridgetown-core/lib/bridgetown-core/drops/drop.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def merge!(other)
if block_given?
self[key] = yield key, self[key], other[key]
else
if Utils.mergable?(self[key]) && Utils.mergable?(other[key])
if Utils.mergeable?(self[key]) && Utils.mergeable?(other[key])
self[key] = Utils.deep_merge_hashes(self[key], other[key])
next
end
Expand Down
7 changes: 5 additions & 2 deletions bridgetown-core/lib/bridgetown-core/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

module Bridgetown
module Utils # rubocop:todo Metrics/ModuleLength
extend Gem::Deprecate
extend self
autoload :Ansi, "bridgetown-core/utils/ansi"
autoload :Aux, "bridgetown-core/utils/aux"
Expand Down Expand Up @@ -62,9 +63,11 @@ def deep_merge_hashes!(target, overwrite)
target
end

def mergable?(value)
def mergeable?(value)
value.is_a?(Hash) || value.is_a?(Drops::Drop)
end
alias_method :mergable?, :mergeable?
deprecate :mergable?, :mergeable?, 2023, 7

def duplicable?(obj)
case obj
Expand Down Expand Up @@ -508,7 +511,7 @@ def merge_values(target, overwrite)
target.merge!(overwrite) do |_key, old_val, new_val|
if new_val.nil?
old_val
elsif mergable?(old_val) && mergable?(new_val)
elsif mergeable?(old_val) && mergeable?(new_val)
deep_merge_hashes(old_val, new_val)
else
new_val
Expand Down