mash 0.0.5 → 0.0.6

data/lib/mash.rb

@@ -40,15 +40,13 @@
 #   mash.author # => <Mash name="Michael Bleigh">
 #
 class Mash < Hash
-  VERSION = '0.0.3'
-  
   # If you pass in an existing hash, it will
   # convert it to a Mash including recursively
   # descending into arrays and hashes, converting
   # them as well.
-  def initialize(source_hash = nil)
+  def initialize(source_hash = nil, &blk)
     deep_update(source_hash) if source_hash
-    super(nil)
+    super(&blk)
   end
   
   def id #:nodoc:
@@ -67,7 +65,7 @@ class Mash < Hash
     if key.is_a?(Symbol) && key?(key) 
       self[key] 
     else 
-      super 
+      key ? super : super()
     end 
   end
   
@@ -95,18 +93,18 @@ class Mash < Hash
     self[key] = Mash.new
   end
   
+  alias_method :regular_dup, :dup  
   # Duplicates the current mash as a new mash.
   def dup
     Mash.new(self)
   end
   
-  alias_method :regular_inspect, :inspect
-  
   alias_method :picky_key?, :key?
   def key?(key)
     picky_key?(convert_key(key))
   end
   
+  alias_method :regular_inspect, :inspect  
   # Prints out a pretty object-like string of the
   # defined attributes.
   def inspect
@@ -128,14 +126,15 @@ class Mash < Hash
   # Recursively merges this mash with the passed
   # in hash, merging each hash in the hierarchy.
   def deep_update(other_hash)
-    other_hash = other_hash.stringify_keys unless other_hash.is_a?(Mash)
+    other_hash = other_hash.to_hash if other_hash.is_a?(Mash)
+    other_hash = other_hash.stringify_keys
     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) && other_hash[k].is_a?(Hash)
-        self[k].deep_merge!(other_hash[k])
+        self[k] = self[k].deep_merge(other_hash[k]).dup
       else
-        self.send(k + "=", convert_value(other_hash[k]))
+        self.send(k + "=", convert_value(other_hash[k],true))
       end
     end
   end
@@ -175,7 +174,7 @@ class Mash < Hash
     elsif key?(method_name)
       self[method_name]
     elsif match = method_name.to_s.match(/^([a-z][a-z0-9A-Z_]+)$/)
-      default
+      default(method_name)
     else
       super
     end
@@ -187,9 +186,10 @@ class Mash < Hash
     key.to_s
   end
   
-  def convert_value(value) #:nodoc:
+  def convert_value(value, dup=false) #:nodoc:
     case value
       when Hash
+        value = value.dup if value.is_a?(Mash) && dup
         value.is_a?(Mash) ? value : value.to_mash
       when Array
         value.collect{ |e| convert_value(e) }

data/mash.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "mash"
-  s.version = "0.0.5"
-  s.date = "2008-04-26"
+  s.version = "0.0.6"
+  s.date = "2008-07-22"
   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"
   s.homepage = "http://github.com/mbleigh/mash"

data/spec/mash_spec.rb

@@ -69,6 +69,12 @@ describe Mash do
     @mash.details.email.should == "michael@intridea.com"
   end
   
+  it "should convert hash assignments into mashes" do
+    @mash.details = {:email => 'randy@asf.com', :address => {:state => 'TX'} }
+    @mash.details.email.should == 'randy@asf.com'
+    @mash.details.address.state.should == 'TX'
+  end
+  
   context "#initialize" do
     it "should convert an existing hash to a Mash" do
       converted = Mash.new({:abc => 123, :name => "Bob"})
@@ -90,11 +96,23 @@ describe Mash do
     end
     
     it "should convert an existing Mash into a Mash" do
-      initial = Mash.new(:name => 'randy')
+      initial = Mash.new(:name => 'randy', :address => {:state => 'TX'})
       copy = Mash.new(initial)
       initial.name.should == copy.name      
+      initial.object_id.should_not == copy.object_id
+      copy.address.state.should == 'TX'
+      copy.address.state = 'MI'
+      initial.address.state.should == 'TX'
+      copy.address.object_id.should_not == initial.address.object_id
     end
     
+    it "should accept a default block" do
+      initial = Mash.new { |h,i| h[i] = []}
+      initial.default_proc.should_not be_nil
+      initial.default.should be_nil
+      initial.test.should == []
+      initial.test?.should be_true
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mash
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 -07:00
+date: 2008-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: []