hashie 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/hashie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-19}
   s.description = %q{Hashie is a small collection of tools that make hashes more powerful. Currently includes Mash (Mocking Hash) and Dash (Discrete Hash).}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [

data/lib/hashie.rb

@@ -1,9 +1,9 @@
-require 'hashie/hash_extensions'
-require 'hashie/hash'
-require 'hashie/mash'
-require 'hashie/dash'
-require 'hashie/clash'
-
 module Hashie
+  autoload :HashExtensions, 'hashie/hash_extensions'
+  autoload :PrettyInspect, 'hashie/hash_extensions'  
+  autoload :Hash, 'hashie/hash'
   autoload :Trash, 'hashie/trash'
+  autoload :Mash, 'hashie/mash'
+  autoload :Dash, 'hashie/dash'
+  autoload :Clash, 'hashie/clash'
 end

data/lib/hashie/hash_extensions.rb

@@ -27,7 +27,7 @@ module Hashie
 
     # Convert this hash into a Mash
     def to_mash
-      Hashie::Mash.new(self)
+      ::Hashie::Mash.new(self)
     end
   end
 

data/lib/hashie/mash.rb

@@ -86,7 +86,7 @@ module Hashie
     alias_method :regular_dup, :dup
     # Duplicates the current mash as a new mash.
     def dup
-      Mash.new(self, self.default)
+      self.class.new(self, self.default)
     end
 
     def key?(key)
@@ -141,6 +141,8 @@ module Hashie
 
     def convert_value(val, duping=false) #:nodoc:
       case val
+        when ::Hashie::Mash
+          val.dup
         when ::Hash
           val = val.dup if duping
           self.class.new(val)

data/spec/hashie/mash_spec.rb

@@ -90,6 +90,16 @@ describe Hashie::Mash do
     record.son.class.should == MyMash
   end
   
+  it "should not change the class of Mashes when converted" do
+    class SubMash < Hashie::Mash
+    end
+    
+    record = Hashie::Mash.new
+    son = SubMash.new
+    record['submash'] = son
+    record['submash'].should be_kind_of(SubMash)
+  end
+  
   describe '#respond_to?' do
     it 'should respond to a normal method' do
       Hashie::Mash.new.should be_respond_to(:key?)

data/spec/spec.opts

@@ -1,2 +1,3 @@
 --colour
---format progress
+--format progress
+--backtrace

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hashie
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -05:00
+date: 2010-08-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency