lib/jekyll/utils.rb in jekyll-3.0.0.pre.beta10 vs lib/jekyll/utils.rb in jekyll-3.0.0.pre.rc1

@@ -6,28 +6,33 @@
     SLUGIFY_MODES = %w{raw default pretty}
     SLUGIFY_RAW_REGEXP = Regexp.new('\\s+').freeze
     SLUGIFY_DEFAULT_REGEXP = Regexp.new('[^[:alnum:]]+').freeze
     SLUGIFY_PRETTY_REGEXP = Regexp.new("[^[:alnum:]._~!$&'()+,;=@]+").freeze
 
+    # Non-destructive version of deep_merge_hashes! See that method.
+    #
+    # Returns the merged hashes.
+    def deep_merge_hashes(master_hash, other_hash)
+      deep_merge_hashes!(master_hash.dup, other_hash)
+    end
+
     # Merges a master hash with another hash, recursively.
     #
     # master_hash - the "parent" hash whose values will be overridden
     # other_hash  - the other hash whose values will be persisted after the merge
     #
     # This code was lovingly stolen from some random gem:
     # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
     #
     # Thanks to whoever made it.
-    def deep_merge_hashes(master_hash, other_hash)
-      target = master_hash.dup
-
-      other_hash.each_key do |key|
-        if other_hash[key].is_a? Hash and target[key].is_a? Hash
-          target[key] = Utils.deep_merge_hashes(target[key], other_hash[key])
+    def deep_merge_hashes!(target, overwrite)
+      overwrite.each_key do |key|
+        if overwrite[key].is_a? Hash and target[key].is_a? Hash
+          target[key] = Utils.deep_merge_hashes(target[key], overwrite[key])
           next
         end
 
-        target[key] = other_hash[key]
+        target[key] = overwrite[key]
       end
 
       target
     end