loggability 0.2.0 → 0.2.1

data/History.rdoc

@@ -1,3 +1,8 @@
+== v0.2.1 [2012-05-10] Michael Granger <ged@FaerieMUD.org>
+
+Bugfix for configuration via a Configurability::Config object.
+
+
 == v0.2.0 [2012-05-10] Michael Granger <ged@FaerieMUD.org>
 
 Add Configurability support.

data/lib/loggability.rb

@@ -9,10 +9,10 @@ require 'date'
 module Loggability
 
 	# Package version constant
-	VERSION = '0.2.0'
+	VERSION = '0.2.1'
 
 	# VCS revision
-	REVISION = %q$Revision: 4c9840dcb9fd $
+	REVISION = %q$Revision: 3d9dced14889 $
 
 	# The key for the global logger (Loggability's own logger)
 	GLOBAL_KEY = :__global__
@@ -22,11 +22,7 @@ module Loggability
 
 	# Configuration defaults
 	CONFIG_DEFAULTS = {
-		:defaults => {
-			:severity  => 'warn',
-			:formatter => 'default',
-			:output    => 'STDERR',
-		},
+		:__default__ => 'warn STDERR',
 	}
 
 	# Regexp for parsing logspec lines in the config
@@ -293,9 +289,10 @@ module Loggability
 	def self::configure( config=nil )
 		if config
 			self.log.debug "Configuring Loggability with custom config."
+			confighash = config.to_hash
 
 			# Set up all loggers with defaults first
-			if defaultspec = config.delete( :__default__ ) || config.delete( '__default__' )
+			if defaultspec = confighash.delete( :__default__ ) || confighash.delete( '__default__' )
 				level, format, target = self.parse_config_spec( defaultspec )
 				Loggability.level = level if level
 				Loggability.format_as( format ) if format
@@ -303,7 +300,7 @@ module Loggability
 			end
 
 			# Then let individual configs override.
-			config.each do |key, logspec|
+			confighash.each do |key, logspec|
 				unless Loggability.log_host?( key )
 					self.log.debug "  no such log host %p; skipping" % [ key ]
 					next

data/spec/loggability_spec.rb

@@ -146,6 +146,28 @@ describe Loggability do
 			Loggability[ class2 ].logdev.dev.path.should == 'spec-error.log'
 		end
 
+		it "can configure loghosts with a Configurability::Config object" do
+			class1 = Class.new { extend Loggability; log_as :class1 }
+			class2 = Class.new { extend Loggability; log_as :class2 }
+
+			configsource = (<<-"END_CONFIG").gsub( /^\t{3}/, '' )
+			---
+			logging:
+			  class1: debug (html)
+			  class2: error spec-error.log
+
+			END_CONFIG
+
+			config = Configurability::Config.new( configsource )
+			config.install
+
+			Loggability[ class1 ].level.should == :debug
+			Loggability[ class1 ].formatter.should be_a( Loggability::Formatter::HTML )
+			Loggability[ class2 ].level.should == :error
+			Loggability[ class2 ].logdev.dev.should be_a( File )
+			Loggability[ class2 ].logdev.dev.path.should == 'spec-error.log'
+		end
+
 		it "can configure all loghosts with a config key of __default__" do
 			Loggability.configure( '__default__' => 'debug STDERR (html)' )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggability
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: