hashie 0.1.6 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

data/hashie.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hashie}
-  s.version = "0.1.6"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-01-13}
+  s.date = %q{2010-01-14}
   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,14 @@ module Hashie
     # Get a String array of the currently defined
     # properties on this Dash.
     def self.properties
-      @@properties.collect{|p| p.to_s}
+      properties = []
+      ancestors.each do |elder| 
+        if elder.instance_variable_defined?("@properties")
+          properties << elder.instance_variable_get("@properties")
+        end
+      end
+
+      properties.flatten.map{|p| p.to_s}
     end
 
     # Check to see if the specified property has already been
@@ -54,7 +61,14 @@ module Hashie
 
     # The default values that have been set for this Dash
     def self.defaults
-      @@defaults
+      properties = {}
+      ancestors.each do |elder|
+        if elder.instance_variable_defined?("@defaults")
+          properties.merge! elder.instance_variable_get("@defaults")
+        end
+      end
+      
+      properties
     end
 
     # You may initialize a Dash with an attributes hash

data/spec/hashie/dash_spec.rb

@@ -7,6 +7,7 @@ class DashTest < Hashie::Dash
 end
 
 class Subclassed < DashTest
+  property :last_name
 end
 
 describe Hashie::Dash do
@@ -84,14 +85,19 @@ end
 
 describe Subclassed do
   it "should inherit all properties from DashTest" do
-    Subclassed.properties.size.should == 5
+    Subclassed.properties.size.should == 6
   end
   
   it "should inherit all defaults from DashTest" do
-    Subclassed.defaults.size.should == 5
+    Subclassed.defaults.size.should == 6
   end
   
   it "should init without raising" do
     lambda { Subclassed.new }.should_not raise_error
+    lambda { Subclassed.new(:first_name => 'Michael') }.should_not raise_error
+  end
+  
+  it "should share defaults from DashTest" do
+    Subclassed.new.count.should == 0
   end
 end

metadata

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