lib/logging/logger.rb in logging-0.5.1 vs lib/logging/logger.rb in logging-0.5.2

- old
+ new

@@ -1,6 +1,6 @@ -# $Id: logger.rb 37 2007-10-26 19:12:44Z tim_pease $ +# $Id: logger.rb 52 2007-11-27 23:53:23Z tim_pease $ require 'thread' require 'logging' require 'logging/appender' require 'logging/log_event' @@ -141,11 +141,11 @@ # log1.object_id == log2.object_id # => true # log2.object_id == log3.object_id # => true # def initialize( name ) case name - when String: + when String raise(ArgumentError, "logger must have a name") if name.empty? else raise(ArgumentError, "logger name must be a String") end repo = ::Logging::Repository.instance @name = name @@ -164,13 +164,13 @@ # Compares this logger by name to another logger. The normal return codes # for +String+ objects apply. # def <=>( other ) case other - when self: 0 - when ::Logging::RootLogger: 1 - when ::Logging::Logger: @name <=> other.name + when self; 0 + when ::Logging::RootLogger; 1 + when ::Logging::Logger; @name <=> other.name else raise ArgumentError, 'expecting a Logger instance' end end # call-seq: # log << "message" @@ -191,13 +191,13 @@ # 'true', +false+, 'false', or +nil+. In this case +nil+ does not # change the additivity # def additive=( val ) @additive = case val - when true, 'true': true - when false, 'false': false - when nil: @additive + when true, 'true'; true + when false, 'false'; false + when nil; @additive else raise ArgumentError, 'expecting a boolean' end end # call-seq: # trace = true @@ -206,13 +206,13 @@ # 'true', +false+, 'false', or +nil+. In this case +nil+ does not # change the tracing. # def trace=( val ) @trace = case val - when true, 'true': true - when false, 'false': false - when nil: @trace + when true, 'true'; true + when false, 'false'; false + when nil; @trace else raise ArgumentError, 'expecting a boolean' end end # call-seq: # level = :all @@ -242,13 +242,13 @@ # log.level = -1 # log.level = 1_000_000_000_000 # def level=( level ) lvl = case level - when String, Symbol: ::Logging::level_num(level) - when Fixnum: level - when nil: @parent.level + when String, Symbol; ::Logging::level_num(level) + when Fixnum; level + when nil; @parent.level else raise ArgumentError, "level must be a String, Symbol, or Integer" end if lvl.nil? or lvl < 0 or lvl > ::Logging::LEVELS.length @@ -297,11 +297,11 @@ # def remove( *args ) args.each do |arg| @appenders.delete_if do |a| case arg - when String: arg == a.name - when ::Logging::Appender: arg.object_id == a.object_id + when String; arg == a.name + when ::Logging::Appender; arg.object_id == a.object_id else raise TypeError, "#{arg.inspect} is not a 'Logging::Appender'" end end end