configurability 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17a4c6df3cb0a6943ed03e5dbcd4947b1cade237
-  data.tar.gz: fcb169f4effc4a6230ef6ce25d43687dcead2e1c
+  metadata.gz: e20c53d95f82bf536b091f4076ecb2500e86f50a
+  data.tar.gz: 88cd57ee350ff322fa6aab8681c8c1568348c4ed
 SHA512:
-  metadata.gz: fb1529ea0da93d38299926bb04cf6b2d45fb7b2414147455d771e0ca11418d9107750aaaf33541c96ceec2a26930ed5ded8d77202e3a04dbd99db1aa8bff384c
-  data.tar.gz: 1f3b8b3a8426134c7d8dcee6ef86909d3e8c09784cfcbbaf500527d08bf4f796fd317a9fc4ae405a8b642168b1d99c2a716377d6b6f129ea53b635caf36c0e76
+  metadata.gz: 7977fc61c2a3cd943e8cc762b5b94751b55cb267bd8be482001acea0736cf318fc2d9c3f12df1811741e597c1f63ebf6c299c6a88b338373657a94b38158dce8
+  data.tar.gz: 659341e2d540ed698d704537b60b28d213430b0ad962dec659b30f55e3a001b682ebb8afe919ebb99fa68306783bd89c8594bd941910481cf9ab0c376cd8a8ba

data/History.rdoc

@@ -1,3 +1,8 @@
+== v2.2.0 [2014-05-19] Michael Granger <ged@FaerieMUD.org>
+
+- Add a .default_config method to objects with Configurability.
+
+
 == v2.1.2 [2014-01-20] Michael Granger <ged@FaerieMUD.org>
 
 Symbolify keys of defaults for Configurability::Config.new (fixes #3).

data/Rakefile

@@ -6,6 +6,7 @@ rescue LoadError
 	abort "This Rakefile requires 'hoe' (gem install hoe)"
 end
 
+GEMSPEC = 'configurability.gemspec'
 
 Hoe.plugin :mercurial
 Hoe.plugin :signing
@@ -29,6 +30,7 @@ hoespec = Hoe.spec 'configurability' do |spec|
 	spec.dependency 'hoe-deveiate', '~> 0.3', :developer
 	spec.dependency 'simplecov', '~> 0.5', :developer
 	spec.dependency 'hoe-bundler', '~> 1.2', :developer
+	spec.dependency 'rspec', '3.0.0.beta2', :developer
 
 	spec.require_ruby_version( '>= 1.9.2' )
 
@@ -48,3 +50,18 @@ task :coverage do
 	Rake::Task[:spec].invoke
 end
 
+
+task :gemspec => GEMSPEC
+file GEMSPEC => __FILE__
+task GEMSPEC do |task|
+	spec = $hoespec.spec
+	spec.files.delete( '.gemtest' )
+	spec.version = "#{spec.version}.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
+	File.open( task.name, 'w' ) do |fh|
+		fh.write( spec.to_ruby )
+	end
+end
+
+CLOBBER.include( GEMSPEC.to_s )
+task :default => :gemspec
+

data/lib/configurability.rb

@@ -18,10 +18,10 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '2.1.2'
+	VERSION = '2.2.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 8ccc787daf98 $
+	REVISION = %q$Revision: 7ecaadfcf254 $
 
 	require 'configurability/deferredconfig'
 
@@ -243,6 +243,15 @@ module Configurability
 		end
 	end
 
+
+	### Return a Configurability::Config object that contains the configuration
+	### defaults for the receiver.
+	def default_config
+		default_values = self.defaults or return Configurability::Config.new( {} )
+		return Configurability::Config::Struct.new( default_values )
+	end
+
+
 	### Inject Configurability support into Loggability to avoid circular dependency
 	### load issues.
 	Loggability.extend( self )

data/lib/configurability/config.rb

@@ -244,11 +244,18 @@ class Configurability::Config
 	def make_configstruct_from_source( source, defaults=nil )
 		defaults ||= {}
 		mergefunc = Configurability::Config.method( :merge_complex_hashes )
-		hash = if defined?( SafeYAML ) then
+		hash = nil
+
+		if source.is_a?( Hash )
+			hash = source
+		else
+			hash = if defined?( SafeYAML ) then
 				   YAML.load( source, :safe => true )
 			   else
 				   YAML.load( source )
 			   end
+		end
+
 		ihash = symbolify_keys( untaint_hash(hash) )
 		idefaults = symbolify_keys( defaults )
 		mergedhash = idefaults.merge( ihash, &mergefunc )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Granger
@@ -12,7 +12,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTMwMjI3MTY0ODU4WhcNMTQwMjI3MTY0ODU4WjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
   ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
   +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
@@ -23,14 +23,14 @@ cert_chain:
   AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
   qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
   BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  Vlcfyq6GwyE8i0QuFPCeVOwJaneSvcwx316DApjy9/tt2YD2HomLbtpXtji5QXor
-  ON6oln4tWBIB3Klbr3szq5oR3Rc1D02SaBTalxSndp4M6UkW9hRFu5jn98pDB4fq
-  5l8wMMU0Xdmqx1VYvysVAjVFVC/W4NNvlmg+2mEgSVZP5K6Tc9qDh3eMQInoYw6h
-  t1YA6RsUJHp5vGQyhP1x34YpLAaly8icbns/8PqOf7Osn9ztmg8bOMJCeb32eQLj
-  6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
-  /YSusaiDXHKU2O3Akc3htA==
+  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
+  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
+  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
+  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
+  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
+  ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -52,56 +52,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: hoe-highline
+  name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: hoe-deveiate
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -130,20 +130,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.12'
 description: |-
   Configurability is a unified, unintrusive, assume-nothing configuration system
   for Ruby. It lets you keep the configuration for multiple objects in a single
@@ -199,8 +213,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: configurability
-rubygems_version: 2.2.1
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Configurability is a unified, unintrusive, assume-nothing configuration system