filum 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJkNDNlYTU1YjkyMjM0ZTVjZDAxYjUwNGM0YmIzYmZhZjg4NDg3Yg==
+    NDM1NGQzMzc1YzgzN2RhNWEyMjkwYmM3MGRkOTAyM2E1OWExNmQzMQ==
   data.tar.gz: !binary |-
-    ZjAxNDg3NDQwNzk3YThmZmM1NjllMjc1ZjI5NjEwNGM1NDcxNjUyZA==
+    MmIyNzE3ZTg4MmNjZmI4ODliYmQwZGViYWRkZjUzMDlkM2U4OTk5OQ==
 SHA512:
   metadata.gz: !binary |-
-    NjBhNTM3NDk1ODQ4MDU1OTZmYTYxZTNjYjY5MTFmNWRmNzhkNmU5MzY2MzAy
-    ZGYyMzViNDhlZmRiMDc3MjMwY2E4ZmFlZDNlODU1ZjhjZmZhOGQwYzc1MmVi
-    MjQ2YjVhOTI1YTkyZDI4NDUzNGQ3MDg3YTQ1ZTcyYmM4OTE4NTM=
+    YjUyYWY5NjM1ZGQzMjg3MzBkZTNiODI0N2MyODZhOWMzMGY1OTFkY2E1ZWU5
+    OGRiZTg4NTMwOGZmMTdhNWUwMGJlZGZjZGI5ZjE4Nzk0YTQ0M2U2ODYzOWFk
+    ODJhNjIxZDFlMDM0YTI3NTIyY2E5NzQyYjhkMTc2OWZmZDQ1Njc=
   data.tar.gz: !binary |-
-    ZmUwYzliYjU3Yzc3MDdkNDkwYjUzMzg1MzgyMjc1NDE3NzYzMzM5MmFmNTlj
-    ZTJlMGU2ZjIwNDNiMWY0ODJiOWY1NzViM2ZhYjM5MGFiZmI2NmQ1YWJkZTZl
-    YjFmNWMzNTc4OGI2MzY4ZTE2YTI4ZGM0M2NhY2YyYjNiNGU1Y2E=
+    ZmQzNTlkZGE0OWY3OGZlMjMzN2ZhY2FhMmU2MzMzZmUyZGJmZjRjZmI1NTY5
+    ZjZhZTE1MjQ1NDA3YTFkYzI2NTU0YzQ1NDA2NTY3Y2RlZDAxMGRlYjRhYjNi
+    OTZlOTdjZTJhMGYxZjhkY2UwNzI2YWI4NWY4OTEzNjI4ZmFlNjE=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+1.0.3 / 2013-12-17
+[FEATURE] Tidy up formatting to have positional padding 
+
 1.0.2 / 2013-12-16
 [FEATURE] By default, rotate logs daily 
 

data/lib/filum/log_formatter.rb

@@ -3,7 +3,7 @@ require 'logger'
 module Filum
   class LogFormatter < Logger::Formatter
     def call(severity, timestamp, progname, msg)
-      "#{timestamp} thread_id-#{Thread.current.object_id} [#{formatted_context_id}] #{severity} | #{formatted_calling_file_and_line} | #{msg}\n"
+      "#{timestamp} #{formatted_thread_id} [#{formatted_context_id}] #{severity.to_s.ljust(5)} | #{formatted_calling_file_and_line} | #{msg}\n"
     end
 
     private
@@ -23,9 +23,17 @@ module Filum
       file = "#{file[0,truncated_filename_length]}..." if file.length >= filename_length 
       "#{file}:#{line.ljust(3)}".ljust(filename_length + 4)
     end
+    
+    def formatted_thread_id
+      "t-#{thread_id}".ljust(12)
+    end
 
     def calling_code
       caller[5]
     end
+
+    def thread_id
+      Thread.current.object_id
+    end
   end
 end

data/lib/filum/version.rb

@@ -1,3 +1,3 @@
 module Filum
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/test/unit/log_formatter_test.rb

@@ -4,7 +4,7 @@ module Filum
   
   class LogFormatterTest < Minitest::Test
     
-    def test_string_format
+    def test_string_format_contains_correct_when_padding_stripped_out
       formatter = Filum::LogFormatter.new
       severity = "SEV123"
       timestamp = "Timestamp123"
@@ -12,12 +12,37 @@ module Filum
       context_id = "context_id"
       object_id = Thread.current.object_id
       file_and_line = "file_and_line"
-      formatter.stubs(calling_file_and_line: file_and_line)
+      formatter.stubs(formatted_calling_file_and_line: file_and_line)
       Thread.current[:context_id] = context_id
 
       output = formatter.call(severity, timestamp, nil, msg)
-      desired = "#{timestamp} thread_id-#{object_id} [#{context_id}] #{severity} | #{file_and_line} | #{msg}\n"
-      assert_equal desired.strip.hex, output.strip.hex
+      desired = "#{timestamp} t-#{object_id} [#{context_id}] #{severity} | #{file_and_line} | #{msg}\n"
+      assert_equal desired, output.gsub(/[ ]+/, ' ')
+    end
+    
+    def test_severity_should_pad_to_5_chars
+      formatter = Filum::LogFormatter.new
+      severity = "SEV"
+      timestamp = "Timestamp123"
+      msg = "My Message"
+      output = formatter.call(severity, timestamp, nil, msg)
+      actual_severity_field = output.match(/SEV\s+\|/)[0]
+      assert_equal "SEV   |", actual_severity_field
+    end
+    
+    def test_can_format_with_nil_severity
+      formatter = Filum::LogFormatter.new
+      formatter.call(nil, "timestamp", nil, "msg")
+    end
+    
+    def test_can_format_with_nil_timestamp
+      formatter = Filum::LogFormatter.new
+      formatter.call("SEV", nil, nil, "msg")
+    end
+    
+    def test_can_format_with_nil_msg
+      formatter = Filum::LogFormatter.new
+      formatter.call("SEV", "timestamp", nil, nil)
     end
 
     def test_call_calls_formatted_context_id
@@ -92,5 +117,26 @@ module Filum
       output = formatter.send(:formatted_calling_file_and_line)
       assert_equal "foobar.txt:30           ", output
     end
+    
+    def test_call_calls_formatted_thread_id
+      formatter = Filum::LogFormatter.new
+      formatter.expects(:formatted_thread_id)
+      formatter.call("", "", "", "")
+    end
+    
+    def test_formatted_thread_id_should_pad
+      formatter = Filum::LogFormatter.new
+      formatter.stubs(thread_id: "0123456")
+      output = formatter.send(:formatted_thread_id)
+      assert_equal "t-0123456   ", output
+    end
+    
+    def test_formatted_thread_id_should_overflow_not_trim
+      formatter = Filum::LogFormatter.new
+      formatter.stubs(thread_id: "01234567890")
+      output = formatter.send(:formatted_thread_id)
+      assert_equal "t-01234567890", output
+    end
+    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filum
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - MalcyL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler