class_logger 1.0 → 1.1

data/README.md

@@ -55,9 +55,6 @@ The following can be used in the *path* or *in* options.
 
   <dt><strong>%{class_name}</strong></dt>
   <dd>Will replace itself with the name of the class.</dd>
-
-  <dt><strong>%{caller_path_}</strong></dt>
-  <dd>Will replace itself the path of the calling file. (Useful if you want logs relative to your scripts location)</dd>
 </dl>
   
 Example Usage
@@ -100,7 +97,7 @@ Example Usage
   # create a logger for a module
   module Something
     include ClassLogger
-    has_logger :in => "%{caller_path}/log/my_module.log"
+    has_logger :in => "#{File.dirname(__FILE__)}/log/my_module.log"
     has_logger :in => "/var/log/utoh.log", :as => :utoh_logger
   end
   Something.logger.info "Testing 123" # => goes to ./log/my_module.log

data/class_logger.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "class_logger/version"
+require 'class_logger'
 
 Gem::Specification.new do |s|
   s.name        = "class_logger"

data/examples/examples.rb

@@ -4,7 +4,7 @@ $log_path = File.dirname(__FILE__)
 # test module functionality
 module Hello
   include ClassLogger
-  has_logger :in => "%{class_name}.log", :as => :my_logger
+  has_logger :in => "#{$log_path}/%{class_name}.log", :as => :my_logger
   
   def self.alternate
     loggers[:my_logger]
@@ -17,7 +17,7 @@ Hello.alternate.info "Hai der!"
 class Gateway
   include ClassLogger
   has_logger :path => $log_path, :level => Logger::ERROR
-  has_logger :in => "%{caller_path}/transaction.log", :as => :transaction_logger,
+  has_logger :in => "#{$log_path}/transaction.log", :as => :transaction_logger,
     :formatter => proc{ |severity, time, program_name, message| "[%s-Transaction]: %s\n" % [severity, message] }
   
   def initialize
@@ -36,7 +36,7 @@ g.transact!
 # test default functionality
 class Default
   include ClassLogger
-  has_logger :path => "%{caller_path}"
+  has_logger :path => $log_path
 end
 
 Default.new.logger.info "Testing"

data/lib/class_logger.rb

@@ -1,6 +1,8 @@
 require 'logger'
 
 module ClassLogger
+  VERSION = '1.1'
+  
   def self.included(base)
     base.extend DSL
   end
@@ -25,22 +27,22 @@ module ClassLogger
   
   module ClassMethods
     def loggers
-      @@loggers ||= {}
+      @loggers ||= {}
     end
     
     def setup_logger(options)
       interpolations = {
         :rails_root => (defined?(Rails) ? Rails.root : ''),
-        :class_name => self.to_s.downcase,
-        :caller_path => (File.dirname(caller[1]) rescue '.')
+        :class_name => self.to_s.downcase
       }
-
+      
       if i = options[:in]
         options[:file] = File.basename(i)
         options[:path] = File.dirname(i)
       end  
 
       file_path = File.join(options[:path], options[:file]).to_s % interpolations
+      
       if (rotate = options[:rotate])
         _logger = ::Logger.new(file_path, rotate)
       else

data/test/test_class_logger.rb

@@ -0,0 +1,80 @@
+require File.expand_path('../../lib/class_logger', __FILE__)
+require 'fileutils'
+require 'test/unit'
+
+$logpath = File.expand_path('../logs', __FILE__)
+Dir[File.join($logpath, '*')].each{ |f| File.delete f }
+
+def log_includes(filename, regexp)
+  IO.read(filename) =~ regexp
+end
+
+module TestModule
+  include ClassLogger
+  has_logger :path => $logpath
+  has_logger :in => File.join($logpath, 'module_named.log'), :as => :named
+  has_logger :path => $logpath, :file => "module_file.log", :as => :file
+  has_logger :in => "#{$logpath}/module_formatted.log", :as => :formatted, 
+    :formatter => proc{ |s,t,p,m| "FORMATTED-%s: %s" % [s,m] }
+end
+
+class TestClass
+  include ClassLogger
+  has_logger :path => $logpath
+  has_logger :in => "#{$logpath}/class_named.log", :as => :named
+  has_logger :in => "#{$logpath}/level.log", :as => :level, :level => Logger::ERROR
+end
+
+class ModuleLoggerTest < Test::Unit::TestCase
+  def test_log_creation
+    assert File.exists?(File.join($logpath, TestModule.to_s.downcase+'.log')), '[Default] log wasnt created in the proper place'
+    assert File.exists?(File.join($logpath, 'module_named.log')), '[Named] log wasnt created in the proper place'
+    assert File.exists?(File.join($logpath, 'module_file.log')), '[File1] log wasnt created in the proper place'
+    assert File.exists?(File.join($logpath, 'module_formatted.log')), '[Formatted] log wasnt created in the proper place'
+  end
+  
+  def test_default_logger
+    assert TestModule.logger.info("Hello")
+    assert log_includes(File.join($logpath,TestModule.to_s.downcase+'.log'), /Hello/)
+  end
+  
+  def test_named_logger
+    assert TestModule.named.info("Named!")
+    assert log_includes(File.join($logpath,'module_named.log'), /Named/)
+  end
+  
+  def test_formatted_logger
+    assert TestModule.formatted.info("Am i formatted?")
+    assert log_includes(File.join($logpath,'module_formatted.log'), /FORMATTED-INFO: Am i formatted\?/)
+  end
+end
+
+class ClassLoggerTest < Test::Unit::TestCase
+  def setup
+    @tc = TestClass.new
+  end
+  
+  def test_log_creation
+    assert File.exists?(File.join($logpath, TestClass.to_s.downcase+'.log')), '[Default] log wasnt created in the proper place'
+  end
+  
+  def test_default_logger
+    assert TestClass.logger.info("Hello")
+    assert @tc.logger.info("Instanced!")
+    assert log_includes(File.join($logpath,TestClass.to_s.downcase+'.log'), /Hello/)
+  end
+  
+  def test_named_logger
+    assert @tc.named.info("NamedINSTANCE")
+    assert TestClass.named.info("NamedCLASS")
+    assert log_includes(File.join($logpath,'class_named.log'), /NamedINSTANCE/)
+    assert log_includes(File.join($logpath,'class_named.log'), /NamedCLASS/)
+  end
+  
+  def test_level
+    @tc.level.info "Info"
+    @tc.level.error "Error"
+    assert !log_includes(File.join($logpath, 'level.log'), /Info/) 
+    assert log_includes(File.join($logpath, 'level.log'), /Error/) 
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: class_logger
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "1.0"
+  version: "1.1"
 platform: ruby
 authors: 
 - Rob Hurring
@@ -31,7 +31,7 @@ files:
 - class_logger.gemspec
 - examples/examples.rb
 - lib/class_logger.rb
-- lib/class_logger/version.rb
+- test/test_class_logger.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -60,5 +60,5 @@ rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Adds custom logger(s) to any ruby module or class
-test_files: []
-
+test_files: 
+- test/test_class_logger.rb

data/lib/class_logger/version.rb

@@ -1,3 +0,0 @@
-module ClassLogger
-  VERSION = '1.0'
-end