filum 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmNkYjY1OWM5YzhjZDEyNmE3ZTgzMDhmYzhlOTdkNDhkY2I3NjY1MA==
+    NmRmOWQ4ZjJkNmJiZTIxZWRmN2MzYmJkNTEzNzgzZjJhZjBiNjI5Mw==
   data.tar.gz: !binary |-
-    MzVkNDc3ZjBlMTMzODQyNDE5N2FjODBkYjJkYWRlMWEwNmZlNzk2Nw==
+    MGMxNGQwMmIyZTNkYzlmZjRjZjI4YWIzYTY2OTZmYzUzOTU3MWQ1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YzQ4YjMzMDQzNDIwODczNmYxMzMxZmMyMTQyMTkyN2ViMDliODQ0NmIyNjFk
-    NGUxYzNkOWYzNDIxNGY5ZDljMjRlNjg4YzU4NWI3ZDViNzdkNTE2NzM4NmEw
-    ZjRkOWRmMzdlNWQ0YTFlMjhkOWFjNWMyZDdlYjVhNWJhZGFlNmE=
+    YjU3ZTVmMmZjMGU4NDczM2M0NjE4OWMzMzBmZDE5OGFlNGJkNGM0ZGUxOWMz
+    ODE1ODU1NzNiM2Y5YjQ2NWY5NGRmYTQ2YmM3ZWE4ZDM1YmExZWE3NjY2MmU4
+    MDk0NDc4Njg2ZWJkZGNjMjQzNTRkZTMyZWJiOGU1Y2Y3OWMxYzU=
   data.tar.gz: !binary |-
-    NjFiMGQzNGUzMDFiYjNjMmNlZjhlZWJkMGE3M2I2ZWQ3YjRjNGZmOGFlZGE2
-    MjYxZGEwOGE2MDdmODllZDljMTZiMTBiNmU1NTZlN2I5NGYxODE5MTg3ZmI4
-    NDFmOTNkOGQ2MjMwNGI2YjlhYzdkZGNhM2RmMjIxNmRjYWUwOTE=
+    ZmE2NGY5ZTE2NzQ0N2Y2OGJhMmU0MWNlMGUyM2M1N2ZhNjhkYjBhOTJjM2Jl
+    N2Y4ZjI5ZmRjZjZkZGQyZTZiZDg3YjdiODQ0NjkyYjI5MmI2MzRiZDYxNjk3
+    MGRhN2MwYTkyZGI5NGUzMzMwZWNmZmJkMmJmMzI0NWM4ODhkOTM=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+1.0.1 / 2013-12-13
+[BUG_FIX] Rendering correct source file/line 
+
 1.0.0 / 2013-12-11
 [RELEASE] API-stable release
 

data/lib/filum.rb

@@ -1,6 +1,7 @@
 require "filum/version"
 require "filum/filum_error"
 require "filum/configuration"
+require "filum/log_formatter"
 require "filum/logger"
 
 module Filum

data/lib/filum/log_formatter.rb

@@ -0,0 +1,31 @@
+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"
+    end
+
+    private
+    def formatted_context_id
+      context_id.ljust(Filum.config.context_id_length)
+    end
+
+    def context_id
+      Thread.current[:context_id].to_s
+    end
+
+    def formatted_calling_file_and_line
+      filename_length = Filum.config.filename_length
+      truncated_filename_length = filename_length - 3
+
+      _, file, line = calling_code.match(/([\w\.]+)\:(\d+)\:in /).to_a
+      file = "#{file[0,truncated_filename_length]}..." if file.length >= filename_length 
+      "#{file}:#{line.ljust(3)}".ljust(filename_length + 4)
+    end
+
+    def calling_code
+      caller[5]
+    end
+  end
+end

data/lib/filum/logger.rb

@@ -5,39 +5,11 @@ module Filum
 
     def initialize(*args)
       super
-      self.formatter = Filum::Logger::Formatter.new
+      self.formatter = Filum::LogFormatter.new
     end
 
     def context_id=(context_id)
       Thread.current[:context_id] = context_id
     end
-
-    class Formatter < 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"
-      end
-
-      private
-      def formatted_context_id
-        context_id.ljust(Filum.config.context_id_length)
-      end
-
-      def context_id
-        Thread.current[:context_id].to_s
-      end
-
-      def formatted_calling_file_and_line
-        filename_length = Filum.config.filename_length
-        truncated_filename_length = filename_length - 3
-
-        _, file, line = calling_code.match(/([\w\.]+)\:(\d+)\:in /).to_a
-        file = "#{file[0,truncated_filename_length]}..." if file.length >= filename_length 
-        "#{file}:#{line.ljust(3)}".ljust(filename_length + 4)
-      end
-
-      def calling_code
-        caller[4]
-      end
-    end
   end
 end

data/lib/filum/version.rb

@@ -1,3 +1,3 @@
 module Filum
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/integration/logger_test.rb

@@ -34,8 +34,16 @@ module Filum
     end
 
     def test_info_string_is_correct
+      random_string = [*'a'..'z'].sample(10).join
+      Filum.logger.info "Foobar #{random_string}"
+      assert_logged(/Foobar #{random_string}$/)
+    end
+    
+    def test_caller_line_is_correct
+      expected_file = 'logger_test.rb'
+      expected_line = __LINE__+1
       Filum.logger.info "Foobar"
-      assert_logged(/Foobar$/)
+      assert_logged(/#{expected_file}:#{expected_line}/)
     end
 
     private
@@ -43,95 +51,4 @@ module Filum
       assert File.readlines(Filum.config.logfile).grep(regex).size == 1
     end
   end
-
-  class LogFormatterTest < IntegrationTest
-    def test_string_format
-      formatter = Filum::Logger::Formatter.new
-      severity = "SEV123"
-      timestamp = "Timestamp123"
-      msg = "My Message"
-      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)
-      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
-    end
-
-    def test_call_calls_formatted_context_id
-      formatter = Filum::Logger::Formatter.new
-      formatter.expects(:formatted_context_id)
-      formatter.call("", "", "", "")
-    end
-
-    def test_formatted_context_id_uses_config
-      Filum.config.context_id_length = 20
-      context_id = "12345"
-      Thread.current[:context_id] = context_id
-      formatter = Filum::Logger::Formatter.new
-      output = formatter.send(:formatted_context_id)
-      assert_equal "#{context_id}               ", output
-    end
-
-    def test_call_calls_formatted_calling_file_and_line
-      formatter = Filum::Logger::Formatter.new
-      formatter.expects(:formatted_calling_file_and_line)
-      formatter.call("", "", "", "")
-    end
-
-    def test_call_should_not_truncate_context_id
-      context_id = "context_id"
-      Thread.current[:context_id] = context_id
-      formatter = Filum::Logger::Formatter.new
-      output = formatter.send(:formatted_context_id)
-      assert_equal context_id, output
-    end
-
-    def test_call_should_return_fixed_width_context_id
-      context_id = "1234"
-      Thread.current[:context_id] = context_id
-      formatter = Filum::Logger::Formatter.new
-      output = formatter.send(:formatted_context_id)
-      assert_equal "#{context_id}  ", output
-    end
-
-    def test_calling_file_and_line_parses_correctly
-      formatter = Filum::Logger::Formatter.new
-      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/logger.rb:30:in `formatted_calling_file_and_line'"
-      formatter.stubs(calling_code: line)
-      output = formatter.send(:formatted_calling_file_and_line)
-      assert output =~ /logger\.rb:30\s*/
-    end
-
-    def test_formatted_calling_file_and_line_uses_config
-      Filum.config.filename_length = 40
-      filename = "abcdefghij"
-      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
-      formatter = Filum::Logger::Formatter.new
-      formatter.stubs(calling_code: line)
-      output = formatter.send(:formatted_calling_file_and_line)
-      assert_equal "#{filename}:30 #{" " * 30}", output
-    end
-
-    def test_formatted_calling_file_and_line_should_truncate
-      filename = "abcdefghijklmnopqrstuvwxyz1234"
-      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
-      formatter = Filum::Logger::Formatter.new
-      formatter.stubs(calling_code: line)
-      output = formatter.send(:formatted_calling_file_and_line)
-      assert_equal "abcdefghijklmnopq...:30 ", output
-    end
-
-    def test_formatted_calling_file_and_line_should_pad
-      filename = "foobar.txt"
-      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
-      formatter = Filum::Logger::Formatter.new
-      formatter.stubs(calling_code: line)
-      output = formatter.send(:formatted_calling_file_and_line)
-      assert_equal "foobar.txt:30           ", output
-    end
-  end
 end

data/test/unit/log_formatter_test.rb

@@ -0,0 +1,96 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Filum
+  
+  class LogFormatterTest < Minitest::Test
+    
+    def test_string_format
+      formatter = Filum::LogFormatter.new
+      severity = "SEV123"
+      timestamp = "Timestamp123"
+      msg = "My Message"
+      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)
+      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
+    end
+
+    def test_call_calls_formatted_context_id
+      formatter = Filum::LogFormatter.new
+      formatter.expects(:formatted_context_id)
+      formatter.call("", "", "", "")
+    end
+
+    def test_formatted_context_id_uses_config
+      Filum.config.context_id_length = 20
+      context_id = "12345"
+      Thread.current[:context_id] = context_id
+      formatter = Filum::LogFormatter.new
+      output = formatter.send(:formatted_context_id)
+      assert_equal "#{context_id}               ", output
+    end
+
+    def test_call_calls_formatted_calling_file_and_line
+      formatter = Filum::LogFormatter.new
+      formatter.expects(:formatted_calling_file_and_line)
+      formatter.call("", "", "", "")
+    end
+
+    def test_call_should_not_truncate_context_id
+      context_id = "context_id"
+      Thread.current[:context_id] = context_id
+      formatter = Filum::LogFormatter.new
+      output = formatter.send(:formatted_context_id)
+      assert_equal context_id, output
+    end
+
+    def test_call_should_return_fixed_width_context_id
+      context_id = "1234"
+      Thread.current[:context_id] = context_id
+      formatter = Filum::LogFormatter.new
+      output = formatter.send(:formatted_context_id)
+      assert_equal "#{context_id}  ", output
+    end
+
+    def test_calling_file_and_line_parses_correctly
+      formatter = Filum::LogFormatter.new
+      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/logger.rb:30:in `formatted_calling_file_and_line'"
+      formatter.stubs(calling_code: line)
+      output = formatter.send(:formatted_calling_file_and_line)
+      assert output =~ /logger\.rb:30\s*/
+    end
+
+    def test_formatted_calling_file_and_line_uses_config
+      Filum.config.filename_length = 40
+      filename = "abcdefghij"
+      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
+      formatter = Filum::LogFormatter.new
+      formatter.stubs(calling_code: line)
+      output = formatter.send(:formatted_calling_file_and_line)
+      assert_equal "#{filename}:30 #{" " * 30}", output
+    end
+
+    def test_formatted_calling_file_and_line_should_truncate
+      filename = "abcdefghijklmnopqrstuvwxyz1234"
+      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
+      formatter = Filum::LogFormatter.new
+      formatter.stubs(calling_code: line)
+      output = formatter.send(:formatted_calling_file_and_line)
+      assert_equal "abcdefghijklmnopq...:30 ", output
+    end
+
+    def test_formatted_calling_file_and_line_should_pad
+      filename = "foobar.txt"
+      line = "/Users/iHiD/Projects/meducation/filum/lib/filum/#{filename}:30:in `formatted_calling_file_and_line'"
+      formatter = Filum::LogFormatter.new
+      formatter.stubs(calling_code: line)
+      output = formatter.send(:formatted_calling_file_and_line)
+      assert_equal "foobar.txt:30           ", output
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filum
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - MalcyL
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,12 +97,14 @@ files:
 - lib/filum.rb
 - lib/filum/configuration.rb
 - lib/filum/filum_error.rb
+- lib/filum/log_formatter.rb
 - lib/filum/logger.rb
 - lib/filum/version.rb
 - test/integration/integration_test.rb
 - test/integration/logger_test.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
+- test/unit/log_formatter_test.rb
 homepage: ''
 licenses:
 - AGPL3
@@ -132,4 +134,5 @@ test_files:
 - test/integration/logger_test.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
+- test/unit/log_formatter_test.rb
 has_rdoc: