torquebox-core 2.1.0-java → 2.1.1-java

data/lib/torquebox-core.rb

@@ -1,6 +1,6 @@
 module TorqueboxCore
-  VERSION = '2.1.0'
-  MAVEN_VERSION = '2.1.0'
+  VERSION = '2.1.1'
+  MAVEN_VERSION = '2.1.1'
 end
 begin
   require 'java'

data/lib/torquebox/logger.rb

@@ -43,7 +43,7 @@ module TorqueBox
     return
   end
 
-  class Logger 
+  class Logger
 
     def initialize name = nil
       category = name || (TORQUEBOX_APP_NAME if defined? TORQUEBOX_APP_NAME) || "TorqueBox"
@@ -56,6 +56,15 @@ module TorqueBox
 
     attr_accessor :level
 
+    def add(severity, message, progname, &block)
+      severities = ['debug', 'info', 'warn', 'error', 'fatal']
+      # default to warn for unknown log level since jboss logger
+      # doesn't support unknown
+      delegate = severity > (severities.length - 1) ? 'warn' : severities[severity]
+      params = params_for_logger([message, progname], block)
+      @logger.send(delegate, *params)
+    end
+
     def method_missing(method, *args, &block)
       delegate = method
       is_boolean = false
@@ -65,7 +74,7 @@ module TorqueBox
       end
       self.class.class_eval do
         define_method(method) do |*a, &b|
-          params = [ a[0] || (b && b.call) ].compact
+          params = params_for_logger(a, b)
           params = [""] if params.empty? && !is_boolean
           @logger.send(delegate, *params)
         end
@@ -73,5 +82,11 @@ module TorqueBox
       self.send(method, *args, &block)
     end
 
+    private
+
+    def params_for_logger(args, block)
+      [ args[0] || (block && block.call) ].compact
+    end
+
   end
 end

data/spec/logger_spec.rb

@@ -38,5 +38,29 @@ describe TorqueBox::Logger do
     logger = TorqueBox::Logger.new
     logger.info(nil)
   end
+
+  it "should support the add method" do
+    fake_logger = mock('logger')
+    org.jboss.logging::Logger.stub!(:getLogger).and_return(fake_logger)
+    logger = TorqueBox::Logger.new
+
+    fake_logger.should_receive(:debug).with('debug')
+    logger.add(Logger::DEBUG, 'debug', nil)
+
+    fake_logger.should_receive(:info).with('info')
+    logger.add(Logger::INFO, 'info', nil)
+
+    fake_logger.should_receive(:warn).with('warning')
+    logger.add(Logger::WARN, 'warning', nil)
+
+    fake_logger.should_receive(:error).with('error')
+    logger.add(Logger::ERROR, 'error', nil)
+
+    fake_logger.should_receive(:warn).with('unknown')
+    logger.add(Logger::UNKNOWN, 'unknown', nil)
+
+    fake_logger.should_receive(:warn).with('block')
+    logger.add(Logger::WARN, nil, nil) { 'block' }
+  end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: torquebox-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.0
+  version: 2.1.1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
@@ -37,17 +37,17 @@ files:
   - lib/torquebox-core.jar
   - lib/torquebox-core.rb
   - lib/gem_hook.rb
-  - lib/torquebox/registry.rb
   - lib/torquebox/core.rb
-  - lib/torquebox/component_manager.rb
-  - lib/torquebox/kernel.rb
   - lib/torquebox/service_registry.rb
-  - lib/torquebox/logger.rb
   - lib/torquebox/injectors.rb
-  - spec/injectors_spec.rb
+  - lib/torquebox/logger.rb
+  - lib/torquebox/kernel.rb
+  - lib/torquebox/registry.rb
+  - lib/torquebox/component_manager.rb
   - spec/kernel_spec.rb
-  - spec/logger_spec.rb
+  - spec/injectors_spec.rb
   - spec/service_registry_spec.rb
+  - spec/logger_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -76,7 +76,7 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Core Gem
 test_files: 
-  - spec/injectors_spec.rb
   - spec/kernel_spec.rb
-  - spec/logger_spec.rb
+  - spec/injectors_spec.rb
   - spec/service_registry_spec.rb
+  - spec/logger_spec.rb