0
@@ -44,9 +44,9 @@ class Mash < Hash
0
   # convert it to a Mash including recursively
0
   # descending into arrays and hashes, converting
0
   # them as well.
0
-  def initialize(source_hash = nil)
0
+  def initialize(source_hash = nil, &blk)
0
     deep_update(source_hash) if source_hash
0
-    super(nil)
0
+    super(&blk)
0
   end
0
   
0
   def id #:nodoc:
0
@@ -65,7 +65,7 @@ class Mash < Hash
0
     if key.is_a?(Symbol) && key?(key) 
0
       self[key] 
0
     else 
0
-      super 
0
+      key ? super : super()
0
     end 
0
   end
0
   
0
@@ -174,7 +174,7 @@ class Mash < Hash
0
     elsif key?(method_name)
0
       self[method_name]
0
     elsif match = method_name.to_s.match(/^([a-z][a-z0-9A-Z_]+)$/)
0
-      default
0
+      default(method_name)
0
     else
0
       super
0
     end

0
@@ -106,6 +106,13 @@ describe Mash do
0
       copy.address.object_id.should_not == initial.address.object_id
0
     end
0
     
0
+    it "should accept a default block" do
0
+      initial = Mash.new { |h,i| h[i] = []}
0
+      initial.default_proc.should_not be_nil
0
+      initial.default.should be_nil
0
+      initial.test.should == []
0
+      initial.test?.should be_true
0
+    end
0
   end
0
 end
0