buffered_logger 0.1.0 → 0.1.1

data/lib/buffered_logger/formatting.rb

@@ -71,7 +71,7 @@ class BufferedLogger::Formatter
 
   def %(message)
     formatted_message = @format % message.to_s
-    color? ? parse_color(formatted_message) : formatted_message
+    parse_color(formatted_message)
   end
 
 private
@@ -81,11 +81,15 @@ private
     color_matcher = /#{color_methods.map {|m| "\\$#{m}\\s?"}.join('|')}/
 
     strings = message.split(color_matcher)
-    colors = message.scan(color_matcher).map { |c| c[1..-1].strip }
+    if color?
+      colors = message.scan(color_matcher).map { |c| c[1..-1].strip }
 
-    colored_message = ''
-    strings[1..-1].each_with_index { |s,i| colored_message << self.send(colors[i], s) }
-    strings[0] + colored_message
+      colored_message = ''
+      strings[1..-1].each_with_index { |s,i| colored_message << self.send(colors[i], s) }
+      strings[0] + colored_message
+    else
+      strings.join('')
+    end
   end
 
 end

data/spec/formatting_spec.rb

@@ -77,7 +77,7 @@ describe BufferedLogger do
       @l.info "haha"
 
       # colors are off so the keywords won't be parsed
-      @f.string.should == "$blue oh\n$red blah\n$blue hey\n$blue haha\n"
+      @f.string.should == "oh\nblah\nhey\nhaha\n"
     end
 
     it 'should use appropriate formatting for each severity level' do
@@ -85,7 +85,7 @@ describe BufferedLogger do
       @l.send(:set_formatter, :info, "$blue %s")
       @l.error 'error'
       @l.info 'info'
-      @f.string.should == "$red error\n$blue info\n"
+      @f.string.should == "error\ninfo\n"
     end
 
     it 'should use the master thread formatter if one isnt set' do
@@ -95,7 +95,7 @@ describe BufferedLogger do
       t = Thread.new do
         @l.error 'blah'
       end; t.join
-      @f.string.should == "$red test\n$red blah\n"
+      @f.string.should == "test\nblah\n"
     end
 
     it 'should use the master thread default formatter if one isnt set' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buffered_logger
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Alex Skryl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -05:00
+date: 2011-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency