hashie 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/hashie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2010-01-13}
   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/dash.rb

@@ -26,8 +26,8 @@ module Hashie
     def self.property(property_name, options = {})
       property_name = property_name.to_sym
 
-      (@properties ||= []) << property_name
-      (@defaults ||= {})[property_name] = options.delete(:default)
+      (@@properties ||= []) << property_name
+      (@@defaults ||= {})[property_name] = options.delete(:default)
 
       class_eval <<-RUBY
         def #{property_name}
@@ -43,7 +43,7 @@ module Hashie
     # Get a String array of the currently defined
     # properties on this Dash.
     def self.properties
-      @properties.collect{|p| p.to_s}
+      @@properties.collect{|p| p.to_s}
     end
 
     # Check to see if the specified property has already been
@@ -54,7 +54,7 @@ module Hashie
 
     # The default values that have been set for this Dash
     def self.defaults
-      @defaults
+      @@defaults
     end
 
     # You may initialize a Dash with an attributes hash

data/lib/hashie/mash.rb

@@ -141,7 +141,7 @@ module Hashie
       case val
         when ::Hash
           val = val.dup if duping
-          Hashie::Mash.new(val)
+          self.class.new(val)
         when Array
           val.collect{ |e| convert_value(e) }
         else

data/spec/hashie/dash_spec.rb

@@ -6,6 +6,9 @@ class DashTest < Hashie::Dash
   property :count, :default => 0
 end
 
+class Subclassed < DashTest
+end
+
 describe Hashie::Dash do
   it 'should be a subclass of Hashie::Hash' do
     (Hashie::Dash < Hash).should be_true
@@ -77,4 +80,18 @@ describe Hashie::Dash do
       DashTest.new.defaulted.should == 'abc'
     end
   end
+end
+
+describe Subclassed do
+  it "should inherit all properties from DashTest" do
+    Subclassed.properties.size.should == 5
+  end
+  
+  it "should inherit all defaults from DashTest" do
+    Subclassed.defaults.size.should == 5
+  end
+  
+  it "should init without raising" do
+    lambda { Subclassed.new }.should_not raise_error
+  end
 end

data/spec/hashie/mash_spec.rb

@@ -74,6 +74,15 @@ describe Hashie::Mash do
     @mash.details.address.state.should == 'TX'
   end
   
+  it "should not convert the type of Hashie::Mashes childs to Hashie::Mash" do
+    class MyMash < Hashie::Mash
+    end
+    
+    record = MyMash.new
+    record.son = MyMash.new
+    record.son.class.should == MyMash
+  end
+  
   context "#initialize" do
     it "should convert an existing hash to a Hashie::Mash" do
       converted = Hashie::Mash.new({:abc => 123, :name => "Bob"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hashie
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 -08:00
+date: 2010-01-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency