configurability 1.0.4 → 1.0.5

data/examples/basicconfig.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+
+BEGIN {
+	require 'pathname'
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+}
+
+require 'configurability'
+require 'sequel'
+require 'treequel'
+
+
+class DatabaseAdapter
+	extend Configurability
+
+	config_key :db
+
+	### Configure the database
+	def self::configure( dbconfig )
+		$stderr.puts "Configuring database adapter: %p" % [ dbconfig ]
+		@database = Sequel.connect( dbconfig )
+	end
+
+end # class DatabaseAdapter
+
+class LdapAdapter
+	extend Configurability
+
+	config_key :ldap
+
+	def self::configure( ldapconfig )
+		$stderr.puts "Configuring LDAP adapter: %p" % [ ldapconfig ]
+		@ldap = Treequel.directory( ldapconfig )
+	end
+
+end # class LdapAdapter
+
+
+config = YAML.load( DATA )
+Configurability.configure_objects( config )
+
+
+__END__
+
+:db:
+  :adapter: postgres
+  :host: localhost
+  :database: test
+  :user: test
+
+:ldap:
+  :host: localhost
+  :port: 389
+  :connect_type: tls
+  :base_dn: dc=acme,dc=com
+

data/examples/config.yml

@@ -0,0 +1,25 @@
+--- 
+database: 
+  development: 
+    adapter: sqlite3
+    database: db/dev.db
+    pool: 5
+    timeout: 5000
+  testing: 
+    adapter: sqlite3
+    database: db/testing.db
+    pool: 2
+    timeout: 5000
+  production: 
+    adapter: postgres
+    database: fixedassets
+    pool: 25
+    timeout: 50
+ldap: 
+  uri: ldap://ldap.acme.com/dc=acme,dc=com
+  bind_dn: cn=web,dc=acme,dc=com
+  bind_pass: Mut@ge.Mix@ge
+branding: 
+  header: "#333"
+  title: "#dedede"
+  anchor: "#9fc8d4"

data/lib/configurability.rb

@@ -9,10 +9,10 @@ require 'yaml'
 module Configurability
 
 	# Library version constant
-	VERSION = '1.0.4'
+	VERSION = '1.0.5'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: a8a6a67e2ede $
+	REVISION = %q$Revision: 12fda25efd84 $
 
 	require 'configurability/logformatter'
 	require 'configurability/deferredconfig'

data/lib/configurability/config.rb

@@ -303,10 +303,12 @@ class Configurability::Config
 	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.to_sym ] = symbolify_keys( val )
+				newhash[ key ] = symbolify_keys( val )
 			else
-				newhash[ key.to_sym ] = val
+				newhash[ key ] = val
 			end
 		end
 
@@ -377,7 +379,7 @@ class Configurability::Config
 		###                  Configurability::Config::ConfigStruct if +key+
 		###                  is a section name.
 		def []( key )
-			key = key.untaint.to_sym
+			key = key.untaint.to_sym if key.respond_to?( :to_sym )
 
 			# Create the config struct on the fly for subsections
 			if !@hash.key?( key )

data/spec/configurability/config_spec.rb

@@ -94,6 +94,23 @@ describe Configurability::Config do
 	end
 
 
+	NIL_KEY_CONFIG = %{
+	---
+	trap_on:
+	  "low disk space alert":
+	    ~:
+	      notepad:
+	        patterns:
+	          - pattern1
+	          - pattern2
+	}.gsub(/^\t/, '')
+
+	it "handles nil as a key in the configuration (issue #1)" do
+		config = Configurability::Config.new( NIL_KEY_CONFIG )
+		config[:trap_on]['low disk space alert'][nil][:notepad][:patterns].should == [ 'pattern1', 'pattern2' ]
+	end
+
+
 	describe "created with in-memory YAML source" do
 
 		before(:each) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configurability
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Michael Granger
@@ -35,16 +35,77 @@ cert_chain:
   cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
   -----END CERTIFICATE-----
 
-date: 2010-11-29 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe-mercurial
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: hoe-yard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 2
+        - 9
+        - 0
+        version: 2.9.0
+  type: :development
+  version_requirements: *id004
 description: |-
-  Configurability is a mixin that allows you to add 
-  configurability to one or more classes, assign them 
-  each a section of the configuration, and then when 
-  the configuration is loaded, the class is given the 
-  section it requested.
+  Configurability is a mixin that allows you to add configurability to one or
+  more objects or classes. You can assign them each a subsection of the
+  configuration, and then later, when the configuration is loaded, the
+  configuration is split up and sent to the objects that will use it.
 email: 
 - ged@FaerieMUD.org
 executables: []
@@ -52,47 +113,36 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- ChangeLog
-- README.md
-- LICENSE
+- History.md
 files: 
-- Rakefile
-- ChangeLog
-- README.md
+- History.md
 - LICENSE
-- spec/configurability/config_spec.rb
-- spec/configurability/deferredconfig_spec.rb
-- spec/configurability_spec.rb
-- spec/lib/helpers.rb
+- README.md
+- Rakefile
+- examples/basicconfig.rb
+- examples/config.yml
+- lib/configurability.rb
 - lib/configurability/behavior.rb
 - lib/configurability/config.rb
 - lib/configurability/deferredconfig.rb
 - lib/configurability/logformatter.rb
-- lib/configurability.rb
-- rake/191_compat.rb
-- rake/dependencies.rb
-- rake/documentation.rb
-- rake/helpers.rb
-- rake/hg.rb
-- rake/manual.rb
-- rake/packaging.rb
-- rake/publishing.rb
-- rake/style.rb
-- rake/svn.rb
-- rake/testing.rb
-- rake/verifytask.rb
+- spec/configurability/config_spec.rb
+- spec/configurability/deferredconfig_spec.rb
+- spec/configurability_spec.rb
+- spec/lib/helpers.rb
+- .gemtest
 has_rdoc: true
 homepage: http://bitbucket.org/ged/configurability
 licenses: 
 - BSD
-post_install_message: 
+post_install_message: "\n\n\
+  New!\n\n\
+  \t"
 rdoc_options: 
-- --tab-width=4
-- --show-hash
-- --include
-- .
-- --main=README.md
-- --title=configurability
+- --protected
+- --verbose
+- --title
+- Configurability Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -117,13 +167,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: configurability
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: A configurability mixin for Ruby
-test_files: 
-- spec/configurability/config_spec.rb
-- spec/configurability/deferredconfig_spec.rb
-- spec/configurability_spec.rb
-- spec/lib/helpers.rb
+summary: Configurability is a mixin that allows you to add configurability to one or more objects or classes
+test_files: []
+

metadata.gz.sig

@@ -1,2 +1,3 @@
-
���O�w"�#���v�:=X$��������c��і�/h�&v
-Ə6憺�w%d�kP�Ƈ��_�}:�1���PZ~�;��g��Ǵ�T̽��^��~<��2��G�Ghb~⏄R�^!��I���Z8��ݹ�ho���AS�N��zཬ��O1~��O��;g�=5AiG�B�R\�|e�ᦝOk�hA��g!�*�d�pp��FI?.����P��թ
6��Z��uo��2�̏bx�=�$���X���2��ByT:"�S
+}���N)W�&MG�i9���Y�T�������m�u�i
+Py=���4+ҔO6����j���P��TarI��.��A���>�pY�qy��$X�r�X藲���Ie]�<rHX�h_�k��ƍ�h��OÒ���k�o�zM�e�%d��x�կ���s�lp���k`�9��^¥��c�CP�a)��6l0�E��k̚uttW��<��p��)���˭RФ�V���\��lز�1����T�]	<�Z^J
(�3�{�
+ 

data/ChangeLog

@@ -1,87 +0,0 @@
-28[tip]   a2ae16f86c98   2010-11-29 15:43 -0800   ged
-  Added tag v1.0.3 for changeset 910ae8ac082f
-
-27[v1.0.3]   910ae8ac082f   2010-11-29 15:43 -0800   ged
-  Added signature for changeset 49e98e6334dd
-
-26[github/master,master]:25,24   49e98e6334dd   2010-11-29 15:32 -0800   ged
-  Merged with 24:7aec5228c2b0
-
-25:22   ec3f030074dc   2010-11-29 15:31 -0800   ged
-  Propagate the installed config to objects that add Configurability after the config is loaded.
-
-24   7aec5228c2b0   2010-10-29 18:00 -0700   ged
-  Added tag 1.0.2 for changeset ba2c849fde0d
-
-23[1.0.2]:21   ba2c849fde0d   2010-10-29 18:00 -0700   ged
-  Added signature for changeset 8718e7f4ea1f
-
-22   58cbefcef526   2010-11-29 15:29 -0800   ged
-  Updated build system
-
-21   8718e7f4ea1f   2010-10-29 17:32 -0700   ged
-  Fixes for specs under 1.9.2.
-
-20:17,19   17a6999c08b9   2010-10-29 17:29 -0700   ged
-  Merged with 17:e2bf2e43bccf
-
-19   e2bf2e43bccf   2010-10-25 10:53 -0700   ged
-  Fixed require for RSpec 2 in the shared behavior.
-
-18:15   5d18e28e387b   2010-10-25 10:48 -0700   ged
-  Converted tests to RSpec 2.
-
-17   4bff6d5f7b6e   2010-08-08 10:26 -0700   ged
-  Added tag 1.0.1 for changeset e3605ccbe057
-
-16[1.0.1]   e3605ccbe057   2010-08-08 10:26 -0700   ged
-  Added signature for changeset 41bc1de0bf36
-
-15   41bc1de0bf36   2010-08-04 18:51 -0700   ged
-  More Configurability::Config work
-
-14   44db952eb824   2010-08-04 18:23 -0700   ged
-  More work on Configurability::Config
-
-13   2323bf260e7c   2010-08-04 16:28 -0700   ged
-  Finishing up Configurability::Config.
-
-12   9e0bab83afd5   2010-08-04 10:18 -0700   ged
-  Build system updates.
-
-11   cba63cef2f7f   2010-08-04 10:17 -0700   ged
-  Add an rspec shared behavior for testing classes with Configurability
-
-10   4ffdde3f7a2f   2010-07-16 16:55 -0700   ged
-  Adding a Configurability::Config class for YAML config loading.
-
-9   d225cef4269e   2010-07-16 16:54 -0700   ged
-  Updating README, project metadata, adding .irbrc
-
-8   9da882b82786   2010-07-16 16:53 -0700   ged
-  Version bump; debugging log
-
-7   ecf5d4565338   2010-07-12 15:52 -0700   ged
-  Added tag 1.0.0 for changeset 74b5dd9a89c9
-
-6[1.0.0]   74b5dd9a89c9   2010-07-12 15:52 -0700   ged
-  Added signature for changeset e0fef8dabba4
-
-5   e0fef8dabba4   2010-07-12 15:51 -0700   ged
-  README formatting, YARD tag fix.
-
-4   4d7044641f87   2010-07-12 13:38 -0700   ged
-  Documentation, added a test for classname normalization.
-
-3   0b395dbf657f   2010-07-12 08:13 -0700   ged
-  Added some stuff to the README, made String config keys work.
-
-2   9531380cc3f2   2010-07-12 07:52 -0700   ged
-  Adding an example.
-
-1   982ba9fe2e6e   2010-07-11 11:26 -0700   ged
-  Initial version.
-
-0   ac34a9d6c913   2010-07-10 17:18 -0700   ged
-  Adding rake subrepo
-

data/rake/191_compat.rb

@@ -1,26 +0,0 @@
-# 1.9.1 fixes
-
-
-# Make Pathname compatible with 1.8.7 Pathname.
-unless Pathname.instance_methods.include?( :=~ )
-	class Pathname
-		def self::glob( *args ) # :yield: p
-			args = args.collect {|p| p.to_s }
-			if block_given?
-				Dir.glob(*args) {|f| yield self.new(f) }
-			else
-				Dir.glob(*args).map {|f| self.new(f) }
-			end
-		end
-
-		def =~( other )
-			self.to_s =~ other
-		end
-
-		def to_str
-			self.to_s
-		end
-	end
-end
-
-