mbleigh-mash 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.5 / 2008-04-29
+
+* [bugfix] Mashes do not infinite loop when initialized with another Mash.
+
 === 0.0.4 / 2008-04-25
 
 * Setting up for GitHub gem hosting instead of Rubyforge.

data/README.txt

@@ -46,7 +46,8 @@ http://mbleigh.lighthouseapp.com/projects/10112-mash
 
 == LICENSE:
 
-Copyright (c) 2008 Michael Bleigh
+Copyright (c) 2008 Michael Bleigh (http://mbleigh.com/) 
+and Intridea Inc. (http://intridea.com/), released under the MIT license
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mash.rb

@@ -128,14 +128,14 @@ class Mash < Hash
   # Recursively merges this mash with the passed
   # in hash, merging each hash in the hierarchy.
   def deep_update(other_hash)
-    stringified_hash = other_hash.stringify_keys
-    stringified_hash.each_pair do |k,v|
+    other_hash = other_hash.stringify_keys unless other_hash.is_a?(Mash)
+    other_hash.each_pair do |k,v|
       k = convert_key(k)
       self[k] = self[k].to_mash if self[k].is_a?(Hash) unless self[k].is_a?(Mash)
-      if self[k].is_a?(Hash) && stringified_hash[k].is_a?(Hash)
-        self[k].deep_merge!(stringified_hash[k])
+      if self[k].is_a?(Hash) && other_hash[k].is_a?(Hash)
+        self[k].deep_merge!(other_hash[k])
       else
-        self.send(k + "=", convert_value(stringified_hash[k]))
+        self.send(k + "=", convert_value(other_hash[k]))
       end
     end
   end

data/mash.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "mash"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.date = "2008-04-26"
   s.summary = "An extended Hash that gives simple pseudo-object functionality that can be built from hashes and easily extended"  
   s.email = "michael@intridea.com"

data/spec/mash_spec.rb

@@ -88,6 +88,13 @@ describe Mash do
       converted.a.first.b.should == 12
       converted.a.last.should == 23
     end
+    
+    it "should convert an existing Mash into a Mash" do
+      initial = Mash.new(:name => 'randy')
+      copy = Mash.new(initial)
+      initial.name.should == copy.name      
+    end
+    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-mash
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Michael Bleigh