object_logging 0.1.1 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,9 @@
+0.2.0
+* feature: threadsafety
+* feature: including ObjectLogging in a class's metaclass works as expected
+
+0.1.1
+* bugfix: ObjectLogging::Log not being loaded
+
+0.1.0
+* initial release

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/object_logging/log/base.rb

@@ -1,21 +1,24 @@
+require "thread"
+
 module ObjectLogging
   module Log
     class Base
       
       def initialize(object, options)
         @storage = []
+        @lock = Mutex.new
       end
       
       def log(level, context, message)
-        @storage << [level, context, message]
+        @lock.synchronize{ @storage << [level, context, message] }
       end
       
       def entries
-        @storage
+        @lock.synchronize{ @storage.dup }
       end
       
       def clear
-        @storage = []
+        @lock.synchronize{ @storage.clear }
       end
       
     end

data/lib/object_logging/logger.rb

@@ -38,7 +38,7 @@ module ObjectLogging
   private
     
     def instantiate_log(object)
-      type, options = object.class.object_logging
+      type, options = object.metaclass.object_logging
       type = "base", options = {} if type.nil?
       class_name = type.to_s.split("_").collect{ |word| word.capitalize }.join
       klass = ObjectLogging::Log.const_get(class_name)
@@ -48,7 +48,8 @@ module ObjectLogging
     def make_entry(level, message, options)
       method_name = options[:method_name] || get_method_name
       class_name  = options[:class_name] || get_class_name(method_name)
-      context = "#{class_name}##{method_name}"
+      invoker = @object.instance_of?(Class) ? "." : "#"
+      context = "#{class_name}#{invoker}#{method_name}"
       @log.log(level.upcase, context, message)
     end
     
@@ -63,7 +64,7 @@ module ObjectLogging
     
     def get_class_name(method_name)
       if @object.respond_to?(method_name.to_sym)
-        @object.class.name
+        @object.instance_of?(Class) ? @object.name : @object.class.name
       else
         "(unknown)"
       end

data/object_logging.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{object_logging}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christopher J. Bottaro"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-05-11}
   s.description = %q{It's a pain to trudge through large log files.  Sometimes you just want to see log messages for one particular object.}
   s.email = %q{cjbottaro@alumni.cs.utexas.edu}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/test/object_logging_test.rb

@@ -54,4 +54,18 @@ class ObjectLoggingTest < Test::Unit::TestCase
     assert_equal([:rails_log, {}], s.class.object_logging)
   end
   
+  def test_static
+    Static.foo
+    assert_equal([["DEBUG", "Static.foo", "hio"]], Static.logger.entries)
+  end
+  
+  def test_threads
+    u = User.new
+    threads = (1..10).collect{ Thread.new{ u.thr } }
+    threads.each{ |thread| thread.join }
+    expected = threads.collect{ |thread| "[INFO] User#thr from thread #{thread}" }.to_set
+    actual = u.logger.entries.collect{ |level, context, message| "[#{level}] #{context} #{message}" }.to_set
+    assert_equal expected, actual
+  end
+  
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'object_logging'
+require "set"
 
 class Test::Unit::TestCase
 end
@@ -18,6 +19,10 @@ class User
   def bar
     logger.info("bar")
   end
+  
+  def thr
+    logger.info("from thread #{Thread.current}")
+  end
 end
 
 class Account
@@ -39,4 +44,13 @@ class Person
 end
 
 class Schmuck < Person
+end
+
+class Static
+  class << self
+    include ObjectLogging
+    def foo
+      logger.debug "hio"
+    end
+  end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Christopher J. Bottaro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -05:00
+date: 2010-05-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.rdoc
 - Rakefile