@@ -1,12 +1,12 @@ class Hash - def deep_merge other - self.dup.deep_merge! other + def merge_tree other + self.dup.merge_tree! other end - def deep_merge! other + def merge_tree! other other.each do |key, value| if self[key].is_a?(Hash) && value.is_a?(Hash) - self[key] = self[key].deep_merge(value) + self[key] = self[key].merge_tree(value) else self[key] = value end lib/extensions.rb @@ -321,10 +321,10 @@ module Squirrel def to_find_include @condition_blocks.inject({}) do |inc, cb| if cb.reflection.nil? - inc.merge(cb.to_find_include) + inc.merge_tree(cb.to_find_include) else inc[cb.reflection] ||= {} - inc[cb.reflection] = inc[cb.reflection].merge(cb.to_find_include) + inc[cb.reflection] = inc[cb.reflection].merge_tree(cb.to_find_include) inc end end lib/squirrel.rb 89b6ee959fd06aecdd46a7576639a3f91be99902 Jon Yurek jyurek@thoughtbot.com http://github.com/thoughtbot/squirrel/commit/bb9c40eafd4768dade916441abcaab585cf4a59e bb9c40eafd4768dade916441abcaab585cf4a59e 2008-06-26T13:24:49-07:00 2008-06-26T13:24:49-07:00 Fixed the actual problem this time. b363755c3c20ada153fca73c97659a92779a53c5 Jon Yurek jyurek@thoughtbot.com