Simplifies the Mash

2 files changed, 5 insertions, 25 deletions

diff --git a/lib/hashie/hash_extensions.rb b/lib/hashie/hash_extensions.rb
index 8fb5657..67d73f6 100644
--- a/lib/hashie/hash_extensions.rb
+++ b/lib/hashie/hash_extensions.rb
@@ -12,7 +12,9 @@ module Hashie
     # to their string representations.
     def hashie_stringify_keys!
       self.keys.each do |k|
-        self[k.to_s] = self.delete(k)
+        unless String === k
+          self[k.to_s] = self.delete(k)
+        end
       end
       self
     end
diff --git a/lib/hashie/mash.rb b/lib/hashie/mash.rb
index 3add1ae..d185a48 100644
--- a/lib/hashie/mash.rb
+++ b/lib/hashie/mash.rb
@@ -102,34 +102,12 @@ module Hashie
     # in hash, merging each hash in the hierarchy.
     def deep_update(other_hash)
       other_hash.each_pair do |k,v|
-        ck = convert_key(k)
-        if Mash === v && Hash === other_hash
-          regular_writer(ck, v.deep_merge(other_hash[k]))
-        else
-          regular_writer(ck, convert_value(other_hash[k], true))
-        end
+        regular_writer(convert_key(k), convert_value(other_hash[k], true))
       end
       self
     end
     alias_method :deep_merge!, :deep_update
-
-    # ==== Parameters
-    # other_hash<Hash>::
-    # A hash to update values in the mash with. Keys will be
-    # stringified and Hashes will be converted to Mashes.
-    #
-    # ==== Returns
-    # Mash:: The updated mash.
-    def update(other_hash)
-      other_hash.each_pair do |key, value|
-        if respond_to?(convert_key(key) + "=")
-          self.send(convert_key(key) + "=", convert_value(value))
-        else
-          regular_writer(convert_key(key), convert_value(value))
-        end
-      end
-      self
-    end
+    alias_method :update, :deep_update
     alias_method :merge!, :update
 
     # Converts a mash back to a hash (with stringified keys)