configurability 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d07154d070a00edad0282c0dc59e0c5e66ef95
-  data.tar.gz: a4b60f5580fd34ca3d8d84adc19628381fb2c640
+  metadata.gz: 17a4c6df3cb0a6943ed03e5dbcd4947b1cade237
+  data.tar.gz: fcb169f4effc4a6230ef6ce25d43687dcead2e1c
 SHA512:
-  metadata.gz: d72df2c94b3d9d35fa8ec2b7485ca54c7c99a0f24fc061c6bf21c8c1f6d16a4f6e66aa8a2c87c6b988bf8e55168e7c805453a5a8f696656fefadd332101d993a
-  data.tar.gz: 0e9900c3689b65a0e4d5c6e63e66a953bace0b1f2cc94735369cdc6406756c8def7c60fe803fd2cddace09298816a6c3a4443d2f13253b1825f8238ecbcb7ea3
+  metadata.gz: fb1529ea0da93d38299926bb04cf6b2d45fb7b2414147455d771e0ca11418d9107750aaaf33541c96ceec2a26930ed5ded8d77202e3a04dbd99db1aa8bff384c
+  data.tar.gz: 1f3b8b3a8426134c7d8dcee6ef86909d3e8c09784cfcbbaf500527d08bf4f796fd317a9fc4ae405a8b642168b1d99c2a716377d6b6f129ea53b635caf36c0e76

data/History.rdoc

@@ -1,3 +1,8 @@
+== v2.1.2 [2014-01-20] Michael Granger <ged@FaerieMUD.org>
+
+Symbolify keys of defaults for Configurability::Config.new (fixes #3).
+
+
 == v2.1.1 [2013-11-20] Michael Granger <ged@FaerieMUD.org>
 
 - Fix untainting to not try to dup/untaint immediate objects.

data/lib/configurability.rb

@@ -18,10 +18,10 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '2.1.1'
+	VERSION = '2.1.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 9d24e71e0018 $
+	REVISION = %q$Revision: 8ccc787daf98 $
 
 	require 'configurability/deferredconfig'
 

data/lib/configurability/behavior.rb

@@ -14,7 +14,7 @@ share_examples_for "an object with Configurability" do
 	end
 
 	it "has a config key that is a reasonable section name" do
-		expect( described_class.config_key.to_s ).to match( /^[a-z][a-z0-9]*$/i )
+		expect( described_class.config_key.to_s ).to match( /^[a-z]\w*$/i )
 	end
 
 end

data/lib/configurability/config.rb

@@ -240,7 +240,6 @@ class Configurability::Config
 	protected
 	#########
 
-
 	### Read in the specified +filename+ and return a config struct.
 	def make_configstruct_from_source( source, defaults=nil )
 		defaults ||= {}
@@ -251,7 +250,8 @@ class Configurability::Config
 				   YAML.load( source )
 			   end
 		ihash = symbolify_keys( untaint_hash(hash) )
-		mergedhash = defaults.merge( ihash, &mergefunc )
+		idefaults = symbolify_keys( defaults )
+		mergedhash = idefaults.merge( ihash, &mergefunc )
 
 		return Configurability::Config::Struct.new( mergedhash )
 	end
@@ -277,76 +277,77 @@ class Configurability::Config
 	end
 
 
-	#######
-	private
-	#######
+	# A collection of data-structure-manipulation functions.
+	module DataUtilities
 
-	### Return a copy of the specified +hash+ with all of its values
-	### untainted.
-	def untaint_hash( hash )
-		newhash = {}
-		hash.each_key do |key|
-			newhash[ key ] = untaint_value( hash[key] )
+		### Return a copy of the specified +hash+ with all of its values
+		### untainted.
+		def untaint_hash( hash )
+			newhash = {}
+			hash.each_key do |key|
+				newhash[ key ] = untaint_value( hash[key] )
+			end
+			return newhash
 		end
-		return newhash
-	end
 
 
-	### Return an untainted copy of the specified +val+.
-	def untaint_value( val )
-		case val
-		when Hash
-			return untaint_hash( val )
+		### Return an untainted copy of the specified +val+.
+		def untaint_value( val )
+			case val
+			when Hash
+				return untaint_hash( val )
 
-		when Array
-			return val.collect {|v| untaint_value(v) }
+			when Array
+				return val.collect {|v| untaint_value(v) }
 
-		when NilClass, TrueClass, FalseClass, Numeric, Symbol, Encoding
-			return val
+			when NilClass, TrueClass, FalseClass, Numeric, Symbol, Encoding
+				return val
 
-		else
-			if val.respond_to?( :dup ) && val.respond_to?( :untaint )
-				return val.dup.untaint
 			else
-				return val
+				if val.respond_to?( :dup ) && val.respond_to?( :untaint )
+					return val.dup.untaint
+				else
+					return val
+				end
 			end
 		end
-	end
 
 
-	### Return a duplicate of the given +hash+ with its identifier-like keys
-	### transformed into symbols from whatever they were before.
-	def symbolify_keys( hash )
-		newhash = {}
-		hash.each do |key,val|
-			key = key.to_sym if key.respond_to?( :to_sym )
+		### Return a duplicate of the given +hash+ with its identifier-like keys
+		### transformed into symbols from whatever they were before.
+		def symbolify_keys( hash )
+			newhash = {}
+			hash.each do |key,val|
+				key = key.to_sym if key.respond_to?( :to_sym )
 
-			if val.is_a?( Hash )
-				newhash[ key ] = symbolify_keys( val )
-			else
-				newhash[ key ] = val
+				if val.is_a?( Hash )
+					newhash[ key ] = symbolify_keys( val )
+				else
+					newhash[ key ] = val
+				end
 			end
-		end
 
-		return newhash
-	end
+			return newhash
+		end
 
 
-	### Return a version of the given +hash+ with its keys transformed
-	### into Strings from whatever they were before.
-	def stringify_keys( hash )
-		newhash = {}
-		hash.each do |key,val|
-			if val.is_a?( Hash )
-				newhash[ key.to_s ] = stringify_keys( val )
-			else
-				newhash[ key.to_s ] = val
+		### Return a version of the given +hash+ with its keys transformed
+		### into Strings from whatever they were before.
+		def stringify_keys( hash )
+			newhash = {}
+			hash.each do |key,val|
+				if val.is_a?( Hash )
+					newhash[ key.to_s ] = stringify_keys( val )
+				else
+					newhash[ key.to_s ] = val
+				end
 			end
-		end
 
-		return newhash
+			return newhash
+		end
 	end
 
+	include DataUtilities
 
 
 	#############################################################
@@ -357,7 +358,8 @@ class Configurability::Config
 	### hashes.
 	class Struct
 		extend Forwardable
-		include Enumerable
+		include Enumerable,
+		        Configurability::Config::DataUtilities
 
 		# Mask most of Kernel's methods away so they don't collide with
 		# config values.
@@ -371,7 +373,7 @@ class Configurability::Config
 		### Create a new ConfigStruct using the values from the given +hash+ if specified.
 		def initialize( hash=nil )
 			hash ||= {}
-			@hash = hash.dup
+			@hash = symbolify_keys( hash )
 			@dirty = false
 		end
 

data/spec/configurability/config_spec.rb

@@ -74,6 +74,12 @@ describe Configurability::Config do
 		expect( config.defaultkey ).to eq( "Oh yeah." )
 	end
 
+	it "symbolifies keys in defaults (issue #3)" do
+		config = Configurability::Config.new( TEST_CONFIG, 'stringkey' => "String value." )
+
+		expect( config.stringkey ).to eq( "String value." )
+	end
+
 	it "yields itself if a block is given at creation" do
 		yielded_self = nil
 		config = Configurability::Config.new { yielded_self = self }
@@ -102,12 +108,12 @@ describe Configurability::Config do
 	it "autoloads predicates for its members" do
 		config = Configurability::Config.new( TEST_CONFIG )
 
-		expect( config.mergekey? ).to be_true()
-		expect( config.mergemonkey? ).to be_false()
-		expect( config.section? ).to be_true()
-		expect( config.section.subsection? ).to be_true()
-		expect( config.section.subsection.subsubsection? ).to be_true()
-		expect( config.section.monkeysubsection? ).to be_false()
+		expect( config.mergekey? ).to be_truthy()
+		expect( config.mergemonkey? ).to be_falsey()
+		expect( config.section? ).to be_truthy()
+		expect( config.section.subsection? ).to be_truthy()
+		expect( config.section.subsection.subsubsection? ).to be_truthy()
+		expect( config.section.monkeysubsection? ).to be_falsey()
 	end
 
 	it "untaints values loaded from a config" do
@@ -180,7 +186,7 @@ describe Configurability::Config do
 
 		it "returns struct members as an Array of Symbols" do
 			expect( config.members ).to be_an_instance_of( Array )
-			expect( config.members ).to have_at_least( 4 ).things
+			expect( config.members.size ).to be >= 4
 			config.members.each do |member|
 				expect( member ).to be_an_instance_of( Symbol )
 			end
@@ -225,7 +231,7 @@ describe Configurability::Config do
 
 
 		it "should report that it is changed" do
-			expect( config.changed? ).to be_true()
+			expect( config.changed? ).to be_truthy()
 		end
 
 		it "should report that its internal struct was modified as the reason for the change" do
@@ -301,7 +307,7 @@ describe Configurability::Config do
 		it "doesn't re-read its source file if it hasn't changed" do
 			expect( config.path ).not_to receive( :read )
 			expect( Configurability ).not_to receive( :configure_objects )
-			expect( config.reload ).to be_false()
+			expect( config.reload ).to be_falsey()
 		end
 	end
 
@@ -340,7 +346,7 @@ describe Configurability::Config do
 		it "re-reads its file when reloaded" do
 			expect( @config.path ).to receive( :read ).and_return( TEST_CONFIG )
 			expect( Configurability ).to receive( :configure_objects ).with( @config )
-			expect( @config.reload ).to be_true()
+			expect( @config.reload ).to be_truthy()
 		end
 
 		it "reapplies its defaults when reloading" do

data/spec/configurability_spec.rb

@@ -368,9 +368,9 @@ describe Configurability do
 			expect( config ).to be_a( Configurability::Config )
 			expect( config.testconfig.one ).to eq( 1 )
 			expect( config.testconfig.two ).to eq( 2 )
-			expect( config.testconfig.types.one ).to be_true()
-			expect( config.testconfig.types.two ).to be_true()
-			expect( config.otherconfig.other ).to be_true()
+			expect( config.testconfig.types.one ).to be_truthy()
+			expect( config.testconfig.types.two ).to be_truthy()
+			expect( config.otherconfig.other ).to be_truthy()
 		end
 
 		it "returns defaults for an object that inherits from a class with Configurability" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -160,6 +160,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
+- .gemtest
 - ChangeLog
 - History.rdoc
 - LICENSE
@@ -177,7 +178,6 @@ files:
 - spec/configurability/deferredconfig_spec.rb
 - spec/configurability_spec.rb
 - spec/helpers.rb
-- .gemtest
 homepage: https://bitbucket.org/ged/configurability
 licenses:
 - BSD
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: configurability
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Configurability is a unified, unintrusive, assume-nothing configuration system