loggr 1.0.0 → 1.1.0

data/test/unit/adapter/base_test.rb

@@ -11,47 +11,47 @@ class Loggr::Adapter::BaseTest < MiniTest::Unit::TestCase
   def setup
     @adapter = Loggr::Adapter::BaseAdapter.new
   end
-  
+
   def teardown
     unlink_log_files
   end
-  
+
   include Loggr::Lint::Tests
-  
+
   def test_base_should_be_a_base_adapter
     assert Loggr::Adapter::Base.is_a?(Loggr::Adapter::BaseAdapter)
   end
-  
+
   def test_logger_instance_should_be_a_stdlib_logger_with_level_info
     @logger = @adapter.logger 'test'
-    assert_kind_of ::Logger, @logger
+    assert_kind_of ::Logger, as_3_2? ? @logger.instance_variable_get('@logger') : @logger
     assert_same ::Logger::INFO, @logger.level
     assert_equal 'test', @logger.progname
   end
-  
+
   def test_logger_should_use_name_as_path
     @logger = @adapter.logger 'test'
     assert File.exist?(File.join(ROOT, 'test.log')), "./test.log should exist"
-    
+
     @logger = @adapter.logger 'test name'
     assert File.exist?(File.join(ROOT, 'test_name.log')), "./test_name.log should exist"
   end
-  
+
   def test_logger_should_use_class_name_as_name
     @logger = @adapter.logger self
     assert File.exist?(File.join(ROOT, 'Loggr_Adapter_BaseTest.log')), "./Loggr_Adapter_BaseTest.log should exist"
   end
-  
+
   def test_should_allow_to_option_to_provide_path
     @logger = @adapter.logger 'test', :to => "other.log"
-    assert File.exist?(File.join(ROOT, 'other.log')), "./other.log should exist"    
+    assert File.exist?(File.join(ROOT, 'other.log')), "./other.log should exist"
   end
-  
+
   def test_should_setting_level_via_options
     @logger = @adapter.logger 'test', :level => ::Logger::ERROR
     assert_same ::Logger::ERROR, @logger.level
   end
-  
+
   def test_normalize_name_converts_all_inputs_to_sane_strings
     assert_equal "logger", @adapter.send(:normalize_name, "logger")
     assert_equal "logger", @adapter.send(:normalize_name, :logger)
@@ -60,6 +60,6 @@ class Loggr::Adapter::BaseTest < MiniTest::Unit::TestCase
     assert_equal "Loggr::Adapter::BaseTest", @adapter.send(:normalize_name, self)
     assert_equal "ATestModule", @adapter.send(:normalize_name, ATestModule)
     assert_equal "ATestModule::ATestClass", @adapter.send(:normalize_name, ATestModule::ATestClass)
-    assert_equal "ATestModule::ATestClass", @adapter.send(:normalize_name, ATestModule::ATestClass.new)    
-  end  
+    assert_equal "ATestModule::ATestClass", @adapter.send(:normalize_name, ATestModule::ATestClass.new)
+  end
 end

data/test/unit/adapter/buffered_test.rb

@@ -3,40 +3,40 @@ require 'loggr/lint'
 require 'loggr/adapter/buffered'
 
 class Loggr::Adapter::BufferedTest < MiniTest::Unit::TestCase
-    
+
   def setup
     @adapter = Loggr::Adapter::BufferedAdapter.new
   end
-  
+
   def teardown
     unlink_log_files
   end
-  
+
   include Loggr::Lint::Tests
-  
+
   def test_buffered_should_be_a_buffered_adapter
     assert_kind_of Loggr::Adapter::BufferedAdapter, Loggr::Adapter::Buffered
   end
-  
+
   def test_logger_instance_should_be_a_buffered_logger_with_level_debug
     @logger = @adapter.logger 'test'
-    assert_kind_of ActiveSupport::BufferedLogger, @logger
+    assert_kind_of ActiveSupport::BufferedLogger, as_3_2? ? @logger.instance_variable_get('@logger') : @logger
     assert_same ActiveSupport::BufferedLogger::INFO, @logger.level
   end
-  
+
   def test_logger_should_use_name_as_path
     @logger = @adapter.logger 'test'
     assert File.exist?(File.join(ROOT, 'test.log')), "./test.log should not exist"
-    
+
     @logger = @adapter.logger 'test name'
     assert File.exist?(File.join(ROOT, 'test_name.log')), "./test_name.log should not exist"
   end
-  
+
   def test_should_allow_to_option_to_provide_path
     @logger = @adapter.logger 'test', :to => "other.log"
-    assert File.exist?(File.join(ROOT, 'other.log')), "./other.log should not exist"    
+    assert File.exist?(File.join(ROOT, 'other.log')), "./other.log should not exist"
   end
-  
+
   def test_should_setting_level_via_options
     @logger = @adapter.logger 'test', :level => ActiveSupport::BufferedLogger::ERROR
     assert_same ActiveSupport::BufferedLogger::ERROR, @logger.level

data/test/unit/adapter/rails_test.rb

@@ -17,22 +17,20 @@ class Loggr::Adapter::RailsTest < MiniTest::Unit::TestCase
     Object.const_set(:Rails, ::MockRails)
     @adapter = Loggr::Adapter::RailsAdapter.new
   end
-  
-  include Loggr::Lint::Tests
-  
+
   def test_rails_should_be_a_rails_adapter
     assert_kind_of Loggr::Adapter::RailsAdapter, Loggr::Adapter::Rails
   end
-  
+
   def test_should_use_same_logger_as_rails
     assert_equal ::Rails.logger, Loggr::Adapter::Rails.logger('log')
   end
-  
+
   def test_should_default_to_rails_adapter
     clazz = Class.new do
       extend Loggr::Adapter
     end
-    
+
     assert_equal Loggr::Adapter::Rails, clazz.adapter
   end
 end

data/test/unit/factory_test.rb

@@ -19,39 +19,54 @@ class Loggr::FactoryTest < MiniTest::Unit::TestCase
     @adapter = LoggerFactory # lint it!
     @adapter.adapter = Loggr::Adapter::Base
   end
-    
+
   def teardown
     unlink_log_files
-  end  
+  end
 
   def test_default_adapter_is_base
     assert_equal @factory.adapter, Loggr::Adapter::Base
   end
-  
+
   def test_change_adapter_using_symbol
     @factory.adapter = :buffered
     assert_equal @factory.adapter, Loggr::Adapter::Buffered
   end
-  
+
   def test_change_adapter_to_slf4j_using_symbol
-    skip_unless_jruby    
+    skip_unless_jruby
     @factory.adapter = :slf4j
-    assert_equal @factory.adapter, Loggr::Adapter::SLF4J    
+    assert_equal @factory.adapter, Loggr::Adapter::SLF4J
   end
-  
+
   def test_change_adapter_using_string
     @factory.adapter = 'NOP'
-    assert_equal @factory.adapter, Loggr::Adapter::NOP    
+    assert_equal @factory.adapter, Loggr::Adapter::NOP
+  end
+
+  def test_change_adapter_to_nop
+    @factory.adapter = :nop
+    assert_equal @factory.adapter, Loggr::Adapter::NOP
   end
-  
+
+  def test_change_adapter_to_nop_by_using_nil
+    @factory.adapter = nil
+    assert_equal @factory.adapter, Loggr::Adapter::NOP
+  end
+
+  def test_change_adapter_to_nop_by_using_false
+    @factory.adapter = false
+    assert_equal @factory.adapter, Loggr::Adapter::NOP
+  end
+
   def test_change_adapter_to_instance
     @factory.adapter = Mocks::MyAdapter.new
     assert_kind_of Mocks::MyAdapter, @factory.adapter
   end
-  
+
   # Lint LoggerFactory, should work the same as an adapter
   include Loggr::Lint::Tests
-  
+
   # Ensure class
   def test_logger_factory
     singleton_class = (class << LoggerFactory; self end)

data/test/unit/slf4j/logger_test.rb

@@ -9,15 +9,15 @@ class Loggr::SLF4J::LoggerTest < MiniTest::Unit::TestCase
       @logger = Loggr::SLF4J::Logger.new('test')
     end
   end
-  
+
   def test_setting_logger_name
     skip_unless_jruby
     assert_equal 'test', @logger.java_logger.getName()
-    assert_equal 'test', Loggr::SLF4J::Logger.new(:test).java_logger.getName()    
-    assert_equal 'test/fancy::Logger', Loggr::SLF4J::Logger.new(:'test/fancy::Logger').java_logger.getName()    
+    assert_equal 'test', Loggr::SLF4J::Logger.new(:test).java_logger.getName()
+    assert_equal 'test/fancy::Logger', Loggr::SLF4J::Logger.new(:'test/fancy::Logger').java_logger.getName()
     assert_equal 'test.Logger', Loggr::SLF4J::Logger.new('test.Logger').java_logger.getName()
     assert_equal 'Loggr::SLF4J', Loggr::SLF4J::Logger.new('Loggr::SLF4J').java_logger.getName()
-    assert_equal 'Loggr::SLF4J/basic', Loggr::SLF4J::Logger.new('Loggr::SLF4J/basic').java_logger.getName()        
+    assert_equal 'Loggr::SLF4J/basic', Loggr::SLF4J::Logger.new('Loggr::SLF4J/basic').java_logger.getName()
     assert_equal 'loggr.slf4j.LoggerTest', Loggr::SLF4J::Logger.new(self).java_logger.getName()
     assert_equal 'loggr.slf4j.LoggerTest', Loggr::SLF4J::Logger.new(self.class).java_logger.getName()
     assert_equal 'loggr.SLF4J', Loggr::SLF4J::Logger.new(Loggr::SLF4J).java_logger.getName()
@@ -30,19 +30,19 @@ class Loggr::SLF4J::LoggerTest < MiniTest::Unit::TestCase
       assert_respond_to @logger, "#{level}?"
     end
   end
-  
+
   def test_should_respond_to_close_and_flush
     skip_unless_jruby
     assert_respond_to @logger, :close
-    assert_respond_to @logger, :flush    
-  end  
-  
+    assert_respond_to @logger, :flush
+  end
+
   def test_trace_message
     skip_unless_jruby
     @logger.trace "a trace message"
     assert_log_event 5000, "a trace message", @appender.last
   end
-  
+
   def test_debug_message
     skip_unless_jruby
     @logger.debug "a debug message"
@@ -52,25 +52,25 @@ class Loggr::SLF4J::LoggerTest < MiniTest::Unit::TestCase
   def test_info_message
     skip_unless_jruby
     @logger.info "an info message"
-    assert_log_event 20000, "an info message", @appender.last    
+    assert_log_event 20000, "an info message", @appender.last
   end
-  
+
   def test_warn_message
     skip_unless_jruby
     @logger.warn "a warn message"
-    assert_log_event 30000, "a warn message", @appender.last    
+    assert_log_event 30000, "a warn message", @appender.last
   end
 
   def test_error_message
     skip_unless_jruby
     @logger.error "an error message"
-    assert_log_event 40000, "an error message", @appender.last    
+    assert_log_event 40000, "an error message", @appender.last
   end
 
   def test_fatal_message
     skip_unless_jruby
     @logger.fatal "a fatal message"
-    assert_log_event 40000, "a fatal message", @appender.last    
+    assert_log_event 40000, "a fatal message", @appender.last
   end
 
   def test_logging_message_using_block
@@ -78,59 +78,95 @@ class Loggr::SLF4J::LoggerTest < MiniTest::Unit::TestCase
     @logger.info { "block info message" }
     assert_log_event 20000, "block info message", @appender.last
   end
-  
+
   def test_default_logger_has_no_marker
     skip_unless_jruby
     @logger.info "no marker"
     assert_equal nil, @appender.last.getMarker()
   end
-  
+
   def test_use_progname_as_marker
     skip_unless_jruby
     @logger.info "with marker", "MARK"
     assert_equal "MARK", @appender.last.getMarker().to_s
-    
+
     @logger.debug "other marker", "KRAM"
     assert_equal "KRAM", @appender.last.getMarker().to_s
   end
-  
+
   def test_ability_to_provide_default_marker
     skip_unless_jruby
     @other = Loggr::SLF4J::Logger.new('test.marker', :marker => "MARK")
 
     @other.info "no marker"
     assert_equal "MARK", @appender.last.getMarker().to_s
-    
+
     @other.debug "other marker", "KRAM"
     assert_equal "KRAM", @appender.last.getMarker().to_s
   end
-  
+
   def test_level_should_be_unknown
     skip_unless_jruby
     assert_equal Loggr::SLF4J::Logger::UNKNOWN, @logger.level
   end
-  
+
+  def test_support_for_nested_tagged_calls
+    skip_unless_jruby
+    assert_nil @logger.java_mdc[:tags]
+    @logger.tagged("demo") do
+      assert_equal "demo", @logger.java_mdc[:tags]
+      @logger.tagged("action", "test") do
+        assert_equal "demo, action, test", @logger.java_mdc[:tags]
+      end
+      assert_equal "demo", @logger.java_mdc[:tags]
+    end
+    assert_nil @logger.java_mdc[:tags]
+  end
+
+  def test_that_tagged_also_accepts_array
+    skip_unless_jruby
+    @logger.tagged(%w{a b c}) do
+      assert_equal "a, b, c", @logger.java_mdc[:tags]
+    end
+  end
+
+  def test_support_for_nested_mapped_calls
+    skip_unless_jruby
+    @logger.mapped(:user => "demo") do
+      assert_equal({ "user" => "demo" }, @logger.java_mdc.to_hash)
+      @logger.mapped(:request_id => "123456", :auth => "secure") do
+        assert_equal({ "user" => "demo", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+        @logger.mapped(:user => "system") do
+          assert_equal({ "user" => "system", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+        end
+        assert_equal({ "user" => "demo", "request_id" => "123456", "auth" => "secure" }, @logger.java_mdc.to_hash)
+      end
+      assert_equal({ "user" => "demo" }, @logger.java_mdc.to_hash)
+    end
+    assert_equal Hash.new, @logger.java_mdc.to_hash
+  end
+
   def test_java_logger
     skip_unless_jruby
     refute_nil @logger.java_logger
     assert_kind_of Java::OrgSlf4j::Logger, @logger.java_logger
   end
-  
+
   def test_java_marker
     skip_unless_jruby
     assert_nil @logger.java_marker
-    
+
     @other = Loggr::SLF4J::Logger.new('test.marker', :marker => 'APP')
     refute_nil @other.java_marker
-    assert_kind_of Java::OrgSlf4j::Marker, @other.java_marker    
+    assert_kind_of Java::OrgSlf4j::Marker, @other.java_marker
   end
-  
+
   def test_internal_marker_factory
     skip_unless_jruby
     assert_nil Loggr::SLF4J::MarkerFactory[nil]
     assert_nil Loggr::SLF4J::MarkerFactory[' ']
     assert_nil Loggr::SLF4J::MarkerFactory[""]
-    
+
     @marker = Loggr::SLF4J::MarkerFactory["MARK"]
     refute_nil @marker
     assert_kind_of Java::OrgSlf4j::Marker, @marker

metadata

@@ -1,58 +1,65 @@
 --- !ruby/object:Gem::Specification 
 name: loggr
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
-- Lukas Westermann
+  - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +02:00
+date: 2011-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.8.7
+    type: :development
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: minitest
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: activesupport
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.0.0
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: appraisal
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.3.8
+    type: :development
+    version_requirements: *id004
 description: Adapters for different ruby logging backends. Create loggers using different adapters, like Logger (Stdlib), Rails or SLF4J (in JRuby only).
 email: 
-- lukas@at-point.ch
+  - lukas@at-point.ch
 executables: []
 
 extensions: []
@@ -60,44 +67,50 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- Gemfile
-- LICENSES.md
-- MIT-LICENSE
-- README.md
-- Rakefile
-- lib/logback-classic-0.9.29.jar
-- lib/logback-core-0.9.29.jar
-- lib/loggr.rb
-- lib/loggr/adapter.rb
-- lib/loggr/adapter/abstract.rb
-- lib/loggr/adapter/base.rb
-- lib/loggr/adapter/buffered.rb
-- lib/loggr/adapter/nop.rb
-- lib/loggr/adapter/rails.rb
-- lib/loggr/adapter/slf4j.rb
-- lib/loggr/factory.rb
-- lib/loggr/lint.rb
-- lib/loggr/severity.rb
-- lib/loggr/slf4j.rb
-- lib/loggr/slf4j/jars.rb
-- lib/loggr/slf4j/logger.rb
-- lib/loggr/slf4j/mdc.rb
-- lib/loggr/version.rb
-- lib/slf4j-api-1.6.1.jar
-- loggr.gemspec
-- test/logback_helper.rb
-- test/test_helper.rb
-- test/unit/adapter/abstract_test.rb
-- test/unit/adapter/base_test.rb
-- test/unit/adapter/buffered_test.rb
-- test/unit/adapter/nop_test.rb
-- test/unit/adapter/rails_test.rb
-- test/unit/adapter/slf4j_test.rb
-- test/unit/factory_test.rb
-- test/unit/slf4j/jars_test.rb
-- test/unit/slf4j/logger_test.rb
-- test/unit/slf4j/mdc_test.rb
+  - .gitignore
+  - .travis.yml
+  - Appraisals
+  - Gemfile
+  - LICENSES.md
+  - MIT-LICENSE
+  - README.md
+  - Rakefile
+  - gemfiles/activesupport-3.0.x.gemfile
+  - gemfiles/activesupport-3.1.gemfile
+  - gemfiles/activesupport-head.gemfile
+  - lib/logback-classic-0.9.29.jar
+  - lib/logback-core-0.9.29.jar
+  - lib/loggr.rb
+  - lib/loggr/adapter.rb
+  - lib/loggr/adapter/abstract.rb
+  - lib/loggr/adapter/base.rb
+  - lib/loggr/adapter/buffered.rb
+  - lib/loggr/adapter/nop.rb
+  - lib/loggr/adapter/rails.rb
+  - lib/loggr/adapter/slf4j.rb
+  - lib/loggr/factory.rb
+  - lib/loggr/lint.rb
+  - lib/loggr/severity.rb
+  - lib/loggr/slf4j.rb
+  - lib/loggr/slf4j/jars.rb
+  - lib/loggr/slf4j/logger.rb
+  - lib/loggr/slf4j/mdc.rb
+  - lib/loggr/support/annotations.rb
+  - lib/loggr/version.rb
+  - lib/slf4j-api-1.6.1.jar
+  - loggr.gemspec
+  - test/logback_helper.rb
+  - test/test_helper.rb
+  - test/unit/adapter/abstract_test.rb
+  - test/unit/adapter/base_test.rb
+  - test/unit/adapter/buffered_test.rb
+  - test/unit/adapter/nop_test.rb
+  - test/unit/adapter/rails_test.rb
+  - test/unit/adapter/slf4j_test.rb
+  - test/unit/factory_test.rb
+  - test/unit/slf4j/jars_test.rb
+  - test/unit/slf4j/logger_test.rb
+  - test/unit/slf4j/mdc_test.rb
 has_rdoc: true
 homepage: https://github.com/at-point/loggr/wiki
 licenses: []
@@ -106,46 +119,36 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Logger factory framework (including an SLF4J wrapper)
 test_files: 
-- test/logback_helper.rb
-- test/test_helper.rb
-- test/unit/adapter/abstract_test.rb
-- test/unit/adapter/base_test.rb
-- test/unit/adapter/buffered_test.rb
-- test/unit/adapter/nop_test.rb
-- test/unit/adapter/rails_test.rb
-- test/unit/adapter/slf4j_test.rb
-- test/unit/factory_test.rb
-- test/unit/slf4j/jars_test.rb
-- test/unit/slf4j/logger_test.rb
-- test/unit/slf4j/mdc_test.rb
+  - test/logback_helper.rb
+  - test/test_helper.rb
+  - test/unit/adapter/abstract_test.rb
+  - test/unit/adapter/base_test.rb
+  - test/unit/adapter/buffered_test.rb
+  - test/unit/adapter/nop_test.rb
+  - test/unit/adapter/rails_test.rb
+  - test/unit/adapter/slf4j_test.rb
+  - test/unit/factory_test.rb
+  - test/unit/slf4j/jars_test.rb
+  - test/unit/slf4j/logger_test.rb
+  - test/unit/slf4j/mdc_test.rb