Changeset 7664

Timestamp:

09/28/07 14:09:35 (9 months ago)

Author:

bitsweat

Message:

BufferedLogger#add converts the message to a string. Closes #9724.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/buffered_logger.rb (modified) (1 diff)
• trunk/activesupport/test/buffered_logger_test.rb (modified) (2 diffs)

trunk/activesupport/CHANGELOG

@@ -5 +5 @@
-* Backport Object#instance_variable_defined? for Ruby < 1.8.6.  [Jeremy Kemper]
-
-doesn't modify the message argument.  #9702 [eigentone
+converts the message to a string.  #9702, #9724 [eigentone, DrMark, tomafro
-
-* Added ActiveSupport::BufferedLogger as a duck-typing alternative (albeit with no formatter) to the Ruby Logger, which provides a very nice speed bump (inspired by Ezra's buffered logger) [DHH]

trunk/activesupport/lib/active_support/buffered_logger.rb

@@ -52 +52 @@
-    def add(severity, message = nil, progname = nil, &block)
-      return if @level > severity
-message || (block && block.call) || progname
+(message || (block && block.call) || progname).to_s
-      # If a newline is necessary then create a new message ending with a newline.
-      # Ensures that the original message is not mutated.

trunk/activesupport/test/buffered_logger_test.rb

@@ -5 +5 @@
-  def setup
-    @message = "A debug message"
+    @integer_message = 12345
-    @output  = StringIO.new
-    @logger  = ActiveSupport::BufferedLogger.new(@output)
@@ -33 +34 @@
-  end
-  
+  def test_should_convert_message_to_string
+    @logger.level = Logger::INFO
+    @logger.info @integer_message
+    assert @output.string.include?(@integer_message.to_s)
+  end
+  
+  def test_should_convert_message_to_string_when_passed_in_block
+    @logger.level = Logger::INFO
+    @logger.info {@integer_message}
+    assert @output.string.include?(@integer_message.to_s)
+  end
+  
-  def test_should_not_evaluate_block_if_message_wont_be_logged
-    @logger.level = Logger::INFO