configurability 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6efec5eb6d1c3f7a287d1b2e3b7e46d61a7bf35c
-  data.tar.gz: 4168132a01f061d48023c96b306bc5b63b075056
+  metadata.gz: e32883ba03aa78f84c42fddecf239f302dfd459e
+  data.tar.gz: 4b23dd3fae36d67b931995c1676a506a8edc847f
 SHA512:
-  metadata.gz: f48627d04ffa108d008416c4ffe1b85fe41e98551e4fbadc9868d8cd5faa0dcaa954198287aa46cbaa03c1758ad196ffccf6e031f944a52a9c1c00670b1ad1ec
-  data.tar.gz: ce7b26244d1de74547837558b55081a84f75604719f0abe7f7ac5fd506578c8ca19a5b584ab4413c24a4d79d421799fad78c4c647882a95d34129f748070e238
+  metadata.gz: 5ceaf6f368433e60377b72fe0d4aac4adbf12362a04938230fd981cd7114cddecc542fd8f2a2e65d9a8f62910e9bd35c941c7958cc0c983177b791a0c4d2c57b
+  data.tar.gz: ab7973670f49baa4528113fc96e0548ab5e4c40e2493d14c1ba1747653cf9855e678ddebe163524b50f64d894387d202815366bb98aa5dc38dbd77d79b913231

data/History.md

@@ -1,3 +1,10 @@
+## v3.1.1 [2017-01-03] Michael Granger <ged@FaerieMUD.org>
+
+Bugfix:
+
+- Fix inheritance of defaults when declared using settings
+
+
 ## v3.1.0 [2017-01-03] Michael Granger <ged@FaerieMUD.org>
 
 Enhancement:

data/lib/configurability.rb

@@ -13,10 +13,10 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '3.1.0'
+	VERSION = '3.1.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 0d8d72ac797f $
+	REVISION = %q$Revision: d6721e4b2dd5 $
 
 	require 'configurability/deferred_config'
 

data/lib/configurability/setting_installer.rb

@@ -57,8 +57,8 @@ class Configurability::SettingInstaller
 
 		self.target.instance_variable_set( "@#{name}", default_value )
 		if self.target.respond_to?( :const_defined? )
-			defaults = if self.target.const_defined?( :CONFIG_DEFAULTS )
-					self.target.const_get( :CONFIG_DEFAULTS )
+			defaults = if self.target.const_defined?( :CONFIG_DEFAULTS, false )
+					self.target.const_get( :CONFIG_DEFAULTS, false )
 				else
 					self.target.const_set( :CONFIG_DEFAULTS, {} )
 				end

data/spec/configurability_spec.rb

@@ -650,6 +650,28 @@ describe Configurability do
 			}.to raise_error( /Invalid API key/i )
 		end
 
+
+		it "supports inheritance of defaults" do
+			parent_class = Class.new
+			parent_class.extend( Configurability )
+			parent_class.configurability( :testconfig ) do
+				setting :environment, default: :production
+			end
+
+			child_class = Class.new( parent_class )
+			child_class..extend( Configurability )
+			child_class.configurability( :testconfig ) do
+				setting :environment, default: :staging
+				setting :apikey, default: 'foom'
+			end
+
+			expect( parent_class.defaults ).to contain_exactly([ :environment, :production ])
+			expect( child_class.defaults ).to contain_exactly(
+				[:environment, :staging],
+				[:apikey, 'foom']
+			)
+		end
+
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Michael Granger
@@ -36,7 +36,7 @@ cert_chain:
   w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
   p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability