configurability 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32883ba03aa78f84c42fddecf239f302dfd459e
-  data.tar.gz: 4b23dd3fae36d67b931995c1676a506a8edc847f
+  metadata.gz: 7c45a9143a15707d91401576cb803aceedd10855
+  data.tar.gz: 73ccce66fcded9ec68e40913f17a9524cdb1c88b
 SHA512:
-  metadata.gz: 5ceaf6f368433e60377b72fe0d4aac4adbf12362a04938230fd981cd7114cddecc542fd8f2a2e65d9a8f62910e9bd35c941c7958cc0c983177b791a0c4d2c57b
-  data.tar.gz: ab7973670f49baa4528113fc96e0548ab5e4c40e2493d14c1ba1747653cf9855e678ddebe163524b50f64d894387d202815366bb98aa5dc38dbd77d79b913231
+  metadata.gz: 2429a91eacfdac2d85086a7c27df4eef69df8e9829305cb305beb406c47e130028a0e0e6de015c032524e3a793e504857de5c64033fe129935db1c596e4a15bf
+  data.tar.gz: a167625e37fd5e66f1416d3c68751dc1ab7bfa2c7fdc0690dc102f5a86d7f291851d27491a51f154f146c98b1d9fe2cc5aafba4e7faaedeaa09edceaf0802c8a

data/History.md

@@ -1,3 +1,10 @@
+## v3.1.2 [2017-01-16] Michael Granger <ged@FaerieMUD.org>
+
+Bugfix:
+
+- Always use the pre-processor block for defaults.
+
+
 ## v3.1.1 [2017-01-03] Michael Granger <ged@FaerieMUD.org>
 
 Bugfix:

data/lib/configurability.rb

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

data/lib/configurability/setting_installer.rb

@@ -55,7 +55,7 @@ class Configurability::SettingInstaller
 	def add_default( name, options )
 		default_value = options[ :default ]
 
-		self.target.instance_variable_set( "@#{name}", default_value )
+		self.target.send( "#{name}=", default_value )
 		if self.target.respond_to?( :const_defined? )
 			defaults = if self.target.const_defined?( :CONFIG_DEFAULTS, false )
 					self.target.const_get( :CONFIG_DEFAULTS, false )

data/spec/configurability_spec.rb

@@ -613,7 +613,7 @@ describe Configurability do
 		end
 
 
-		it "installs the current config after its done if it's already been loaded" do
+		it "installs the current config after it's done if it's already loaded" do
 			config = OpenStruct.new( testconfig: {
 				environment: 'production',
 				apikey: 'jofRtkw&QzCoukGwAWDMjyTkQzWnCXhhgEs'
@@ -633,11 +633,11 @@ describe Configurability do
 
 		it "can declare settings with a block to do writer pre-processing" do
 			mod.configurability( :testconfig ) do
-				setting :data_dir do |dir|
+				setting :data_dir, default: '/tmp/data' do |dir|
 					Pathname( dir )
 				end
 				setting :apikey do |key|
-					raise "Invalid API key!" unless key.to_s =~ /\A\p{Xdigit}{32}\z/
+					raise "Invalid API key!" unless key.nil? || key.to_s =~ /\A\p{Xdigit}{32}\z/
 					key
 				end
 			end
@@ -651,6 +651,17 @@ describe Configurability do
 		end
 
 
+		it "uses the setting block for setting up the initial defaults" do
+			mod.configurability( :testconfig ) do
+				setting :data_dir, default: 'this/that' do |dir|
+					Pathname( dir )
+				end
+			end
+
+			expect( mod.data_dir ).to be_a( Pathname )
+		end
+
+
 		it "supports inheritance of defaults" do
 			parent_class = Class.new
 			parent_class.extend( Configurability )
@@ -672,6 +683,7 @@ describe Configurability do
 			)
 		end
 
+
 	end
 
 end

metadata

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