defaultable 0.0.5 → 0.0.6

data/defaultable.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency("rspec", "~> 2.7")
   gem.add_development_dependency("pry")
+  gem.add_development_dependency("awesome_print")
 end

data/lib/defaultable/registry.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/hash'
 module Defaultable
 	class Registry
 		def initialize
-			@table = {}
+			@table = HashWithIndifferentAccess.new
 		end
 
 		def add(key, value)
@@ -22,11 +22,5 @@ module Defaultable
         hash
       end
 		end
-
-		# def diff(defaults)
-		# 	settings = self.as_hash
-
-		# 	settings.diff(defaults)
-		# end
 	end
 end

data/lib/defaultable/settings.rb

@@ -43,9 +43,9 @@ module Defaultable
         	value.parent   = self
         end
 
-        if self.parent && self.parent.registry_enabled
-        	self.registry.add(key, value)
-        	self.parent.registry.add(self.root_key, self.class.new(self.registry.as_hash))
+        if self.parent
+          self.registry.add(key, value)
+        	update_parent_registries
         end
 
         @table[key] = value
@@ -89,6 +89,13 @@ module Defaultable
         self.send("#{key}=", self.class.new(hash, true, self.registry_enabled))
       end
     end
+
+    def update_parent_registries
+      if self.parent && self.root_key
+        self.parent.registry.add(self.root_key, self)
+        self.parent.update_parent_registries
+      end
+    end
     
     class << self
       def set_defaults(settings, env=nil)

data/lib/defaultable/version.rb

@@ -1,3 +1,3 @@
 module Defaultable
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/registry_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'awesome_print'
 
 describe Defaultable::Registry do
 	before(:each) do
@@ -9,32 +10,32 @@ describe Defaultable::Registry do
 		DummySetting.set_defaults Hash.new
 	end
 
-	it "should log settings to the registry" do
+	it "should log settings to the registry." do
 		setting = DummySetting.new
 		setting.blah = 'asdf'
 
 		setting.registry.as_hash.should have_key('blah')
 	end
 
-	it "should not log defaults to the registry" do
+	it "should not log defaults to the registry." do
 		DummySetting.set_defaults :foo => 'bar'
 
 		setting = DummySetting.new
 		setting.registry.as_hash.should_not have_key('foo')
 	end
 
-	it "should set registry values for nested attributes" do
+	it "should set registry values for nested attributes." do
 		setting = DummySetting.new(:stuff => {:bar => 'foo'})
 		setting.registry.as_hash['stuff'].should have_key('bar')
 	end
 
-	it "should not set nested attributes registry values even in nested defaults" do
+	it "should not set nested attributes registry values even in nested defaults." do
 		DummySetting.set_defaults :values => {:foo => 'bar'}
 
 		DummySetting.new.registry.as_hash.should_not have_key('values')
 	end
 
-	it "should set nested attributes registry values even in nested defaults" do
+	it "should set nested attributes registry values even in nested defaults." do
 		DummySetting.set_defaults :values => {:foo => 'bar'}
 
 		setting = DummySetting.new(:values => {:bar => 'foo'})
@@ -42,7 +43,7 @@ describe Defaultable::Registry do
 		setting.values.bar?.should be_true
 	end
 
-	it "should set nested attributes registry values and retain nested defaults" do
+	it "should set nested attributes registry values and retain nested defaults." do
 		DummySetting.set_defaults :values => {:foo => 'bar'}
 
 		setting = DummySetting.new(:values => {:bar => 'foo'})
@@ -50,4 +51,14 @@ describe Defaultable::Registry do
 		setting.values.bar?.should be_true
 		setting.values.foo?.should be_true
 	end
+
+	it "should set really nested attributes after defaults are set." do
+		DummySetting.set_defaults :values => { :foo => { :foo => 'fighters'} }
+
+		setting = DummySetting.new
+		setting.values.foo.boo = 'notta'
+
+		setting.registry.as_hash['values']['foo'].should have_key('boo')
+		setting.registry.as_hash['values']['foo'].should_not have_key('foo')
+	end
 end

data/spec/serialization_spec.rb

@@ -10,11 +10,11 @@ describe Defaultable::Serialization do
 		DummySetting.set_defaults Hash.new
 	end
 
-	it "should set a class for settings" do
+	it "should set a class for settings." do
 		Defaultable::Serialization.settings_class.should eq(DummySetting)
 	end
 
-	it "should serialize a settings object" do
+	it "should serialize a settings object." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -23,7 +23,7 @@ describe Defaultable::Serialization do
 		serialized.should be_a String
 	end
 
-	it "should deserialize a settings object back to a kind of Defaultable::Settings" do
+	it "should deserialize a settings object back to a kind of Defaultable::Settings." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -33,19 +33,19 @@ describe Defaultable::Serialization do
 		encoder.load(serialized).should be_kind_of Defaultable::Settings
 	end
 
-	it "should throw an exception when the class doesn't match the settings class on load" do
+	it "should throw an exception when the class doesn't match the settings class on load." do
 		encoder = Defaultable::Serialization.new
 
 		lambda { encoder.load('adfghjsfjdhg') }.should raise_error TypeError
 	end
 
-	it "should throw an exception when the class doesn't match the settings class on dump" do
+	it "should throw an exception when the class doesn't match the settings class on dump." do
 		encoder = Defaultable::Serialization.new
 
 		lambda { encoder.dump('adfghjsfjdhg'.to_yaml) }.should raise_error TypeError
 	end
 
-	it "should load with keys still in tact" do
+	it "should load with keys still in tact." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -56,7 +56,7 @@ describe Defaultable::Serialization do
 		unserialized.foo.should eq('bar')
 	end
 
-	it "should load defaults in after the fact" do
+	it "should load defaults in after the fact." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -69,7 +69,7 @@ describe Defaultable::Serialization do
 		unserialized.bobby?.should be_true
 	end
 
-	it "should not serialize defaults that didn't get overwritten" do
+	it "should not serialize defaults that didn't get overwritten." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -82,7 +82,7 @@ describe Defaultable::Serialization do
 		unserialized.bobby?.should be_false
 	end
 
-	it "should not serialize nested defaults that didn't get overwritten" do
+	it "should not serialize nested defaults that didn't get overwritten." do
 		encoder  = Defaultable::Serialization.new
 		settings = DummySetting.new
 
@@ -95,7 +95,7 @@ describe Defaultable::Serialization do
 		unserialized.bobby?.should be_false
 	end
 
-	it "should not serialize nested defaults that didn't get overwritten (but other values did)" do
+	it "should not serialize nested defaults that didn't get overwritten (but other values did)." do
 		encoder  = Defaultable::Serialization.new
 		DummySetting.set_defaults :bobby => {:effing => 'tables'}
 		settings = DummySetting.new
@@ -106,4 +106,16 @@ describe Defaultable::Serialization do
 		unserialized = encoder.raw_load(serialized)
 		unserialized.bobby?.should be_true
 	end
+
+	it "should serialize really nested defaults that were overwritten." do
+		encoder  = Defaultable::Serialization.new
+		DummySetting.set_defaults :bobby => {:effing => {:stillgoing => 'tables'}}
+		settings = DummySetting.new
+
+		settings.bobby.effing.stillgoing = 'ross'
+		serialized = encoder.dump(settings)
+
+		unserialized = encoder.raw_load(serialized)
+		unserialized.bobby.effing.stillgoing?.should be_true
+	end
 end

data/spec/{defaultable_spec.rb → settings_spec.rb}

@@ -5,55 +5,55 @@ describe Defaultable::Settings do
     Defaultable::Settings.set_defaults({})
   end
 
-  it "should initialize with a hash" do
+  it "should initialize with a hash." do
     setting = Defaultable::Settings.new({:child => 'Bobert'})
     setting.child.should eq('Bobert')
   end
 
-  it "should be able to set nonexsistent keys" do
+  it "should be able to set nonexsistent keys." do
     setting = Defaultable::Settings.new
     setting.child = 'Bri Bri'
     setting.child.should eq('Bri Bri')
   end
 
-  it "should be able to set nonexsistent keys to another setting" do
+  it "should be able to set nonexsistent keys to another setting." do
     setting = Defaultable::Settings.new
     setting.child = Defaultable::Settings.new
     setting.child.name = 'Mocha'
     setting.child.name.should eq('Mocha')
   end
 
-  it "should accept nested hashes" do
+  it "should accept nested hashes." do
     setting = Defaultable::Settings.new({:parent => {:child => 'Rob'}})
     setting.parent.child.should eq('Rob')
   end
 
-  it "should have a question mark method for keys" do
+  it "should have a question mark method for keys." do
     setting = Defaultable::Settings.new(:foo => 'bar')
     setting.foo?.should be_true
   end
 
-  describe "Defaults" do
-    it "should have default settings" do
+  describe "Defaults." do
+    it "should have default settings." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
       Defaultable::Settings.defaults.should be_kind_of(Hash)
     end
 
-    it "should have a default setting for a key" do
+    it "should have a default setting for a key." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
 
       setting = Defaultable::Settings.new
       setting.grandparent.should be_kind_of Defaultable::Settings
     end
 
-    it "should have another key for another setting" do
+    it "should have another key for another setting." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
 
       setting = Defaultable::Settings.new
       setting.grandparent.child.grandchild1.should eq('robert')
     end
 
-    it "should set a key but still have defaults" do
+    it "should set a key but still have defaults." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
 
       setting = Defaultable::Settings.new({
@@ -68,7 +68,7 @@ describe Defaultable::Settings do
       setting.grandparent.child.grandchild2.should eq('brian')
     end
 
-    it "should be able to overwrite a default" do
+    it "should be able to overwrite a default." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
 
       setting = Defaultable::Settings.new({
@@ -84,7 +84,7 @@ describe Defaultable::Settings do
       setting.grandparent.child.grandchild2.should eq('drpepper')
     end
 
-    it "should be able to set a key in the middle of defaults" do
+    it "should be able to set a key in the middle of defaults." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/test.yml'
 
       setting = Defaultable::Settings.new({
@@ -100,14 +100,14 @@ describe Defaultable::Settings do
       setting.grandparent.someotherkey.should eq('saweet')
     end
 
-    it "should be able to set a hash for defaults" do
+    it "should be able to set a hash for defaults." do
       Defaultable::Settings.set_defaults :child => 'sxephil'
 
       setting = Defaultable::Settings.new
       setting.child.should eq('sxephil')
     end
 
-    it "should accept a filename with an environment" do
+    it "should accept a filename with an environment." do
       Defaultable::Settings.set_defaults File.expand_path('../', __FILE__) + '/env_test.yml', 'development'
 
       setting = Defaultable::Settings.new
@@ -115,8 +115,8 @@ describe Defaultable::Settings do
     end
   end
 
-  describe "Extendable" do
-    it "should be extendable" do
+  describe "Extendable." do
+    it "should be extendable." do
       class DummySetting < Defaultable::Settings
         set_defaults :movie => 'Iron Man'
       end
@@ -125,7 +125,7 @@ describe Defaultable::Settings do
       setting.movie.should eq('Iron Man')
     end
 
-    it "should return settings the same class of the extension for detauls" do
+    it "should return settings the same class of the extension for detauls." do
       class DummySetting < Defaultable::Settings
         set_defaults :movie => 'Iron Man'
       end
@@ -134,8 +134,8 @@ describe Defaultable::Settings do
     end
   end
 
-  describe "Hashes" do
-    it ".as_hash should return a hash" do
+  describe "Hashes." do
+    it ".as_hash should return a hash." do
       Defaultable::Settings.set_defaults :child => 'sxephil'
       setting = Defaultable::Settings.new
 
@@ -143,7 +143,7 @@ describe Defaultable::Settings do
       setting.as_hash.should be_kind_of Hash
     end
 
-    it ".as_hash should return a hash with the correct keys" do
+    it ".as_hash should return a hash with the correct keys." do
       Defaultable::Settings.set_defaults :child => 'sxephil'
       setting = Defaultable::Settings.new
 
@@ -152,24 +152,24 @@ describe Defaultable::Settings do
     end
   end
 
-  describe "Defaults" do
+  describe "Defaults." do
     before(:each) do
       class DummySetting < Defaultable::Settings
         set_defaults :movie => {:name => 'Iron Man' }
       end
     end
 
-    it "should have a key from defaults on initialization" do
+    it "should have a key from defaults on initialization." do
       setting = DummySetting.new
       setting.movie?.should be_true
     end
 
-    it "should have a hash with a length from defaults on initialization" do
+    it "should have a hash with a length from defaults on initialization." do
       setting = DummySetting.new
       setting.as_hash.length.should eq(1)
     end
 
-    it "should mash defaults together with new settings" do
+    it "should mash defaults together with new settings." do
       setting = DummySetting.new(:movie => { :genre => 'asdf' })
     end
   end
@@ -181,18 +181,18 @@ describe Defaultable::Settings do
       end
     end
 
-    it "should not include defaults in the registry" do
+    it "should not include defaults in the registry." do
       setting = DummySetting.new
       setting.registry.as_hash.has_key?(:movie).should be_false
     end
 
-    it "should not include defaults in the registry unless overwritten" do
+    it "should not include defaults in the registry unless overwritten." do
       setting = DummySetting.new
       setting.movie = 'asdf'
       setting.registry.as_hash.has_key?(:movie).should be_false
     end
 
-    it "should be able to overwrite nested defaults" do
+    it "should be able to overwrite nested defaults." do
       class DummySetting < Defaultable::Settings
         set_defaults :movie => {:name => 'Iron Man', :genre => 'Action Adventure'}
       end
@@ -203,7 +203,7 @@ describe Defaultable::Settings do
       setting.registry.as_hash['movie'].has_key?('name').should be_false
     end
 
-    it "should be able to overwrite multiple nested defaults" do
+    it "should be able to overwrite multiple nested defaults." do
       class DummySetting < Defaultable::Settings
         set_defaults :movie => {:name => 'Iron Man', :genre => 'Action Adventure'}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defaultable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000 Z
+date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70121466071200 !ruby/object:Gem::Requirement
+  requirement: &70253939215940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121466071200
+  version_requirements: *70253939215940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70121466070520 !ruby/object:Gem::Requirement
+  requirement: &70253939215280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70121466070520
+  version_requirements: *70253939215280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70121466069920 !ruby/object:Gem::Requirement
+  requirement: &70253939214780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121466069920
+  version_requirements: *70253939214780
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &70253939214140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70253939214140
 description: Defaultable is an extendable class to allow easy method chaining for
   settings along with defaults.
 email:
@@ -63,10 +74,10 @@ files:
 - lib/defaultable/serialization.rb
 - lib/defaultable/settings.rb
 - lib/defaultable/version.rb
-- spec/defaultable_spec.rb
 - spec/env_test.yml
 - spec/registry_spec.rb
 - spec/serialization_spec.rb
+- spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/test.yml
 homepage: https://github.com/bobbytables/defaultable
@@ -94,9 +105,9 @@ signing_key:
 specification_version: 3
 summary: Settings made easy.
 test_files:
-- spec/defaultable_spec.rb
 - spec/env_test.yml
 - spec/registry_spec.rb
 - spec/serialization_spec.rb
+- spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/test.yml