lib/contentful/management/support.rb in contentful-management-0.0.3 vs lib/contentful/management/support.rb in contentful-management-0.1.0

- old
+ new

@@ -2,25 +2,23 @@ module Contentful module Management # Utility methods used by the contentful management gem module Support class << self - # Transforms CamelCase into snake_case (taken from zucker) def snakify(object) snake = String(object).gsub(/(?<!^)[A-Z]/) { "_#$&" } snake.downcase end # Merges two hashes with recursion - def deep_hash_merge(hash_1, hash_2) - hash_1.merge(hash_2) do |_key, oldval, newval| + def deep_hash_merge(query_hash, attribute_hash) + query_hash.merge(attribute_hash) do |_key, oldval, newval| oldval = oldval.to_hash if oldval.respond_to?(:to_hash) newval = newval.to_hash if newval.respond_to?(:to_hash) - oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? self.deep_hash_merge(oldval, newval) : newval + oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? deep_hash_merge(oldval, newval) : newval end end - end end end end