torquebox-core 3.0.0-java → 3.0.1-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2d63bd1863c61f8b0e2589383b342faed0da1002
+  data.tar.gz: d3f20a98e2111aa72193e43b91b26a6ae1d0ee5b
+SHA512:
+  metadata.gz: 3befc54625a78d345b0df1a39475b03e1a25d935fcba77fe1278aa51c12932a9e634ac3e870b512f31efd24efe5dc68921c16f9a39750b1e966046b6eb373500
+  data.tar.gz: e12667d270ff94bcfafff96c6619a9c25ff23c882d532b6a6fc9c17e12d13093a0c08b9d54076a785ec25b72814a49ab088ba4bcabedeb957ee3e5e0c54e815b

data/lib/torquebox-core.rb

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

data/lib/torquebox/logger.rb

@@ -22,9 +22,12 @@ module TorqueBox
   # @api private
   class FallbackLogger < ::Logger
 
+    attr_accessor :formatter
+
     def initialize name = nil
-      super( $stderr )
+      super(ENV['TORQUEBOX_FALLBACK_LOGFILE'] || $stderr)
       @category = name || (TORQUEBOX_APP_NAME if defined? TORQUEBOX_APP_NAME) || "TorqueBox"
+      @formatter = ::Logger::Formatter.new
     end
 
     def add(severity, message, progname, &block)
@@ -35,7 +38,17 @@ module TorqueBox
       message = progname if message.nil?
       super( severity, message, @category, &block )
     end
-  end 
+
+    # Allow our logger to be used for env['rack.errors']
+    def puts(message)
+      info message.to_s
+    end
+    def write(message)
+      info message.strip
+    end
+    def flush
+    end
+  end
 
   begin
     org.jboss.logging::Logger
@@ -46,15 +59,30 @@ module TorqueBox
 
   class Logger
 
+    attr_accessor :formatter
+
     def initialize name = nil
       category = name || (TORQUEBOX_APP_NAME if defined? TORQUEBOX_APP_NAME) || "TorqueBox"
       @logger = org.jboss.logging::Logger.getLogger( category.to_s.gsub('::','.') )
+      @formatter = ::Logger::Formatter.new
     end
 
     [:warn?, :error?, :fatal?].each do |method|
       define_method(method) { true }
     end
 
+    def info?
+      @logger.info_enabled?
+    end
+
+    def debug?
+      @logger.debug_enabled?
+    end
+
+    def trace?
+      @logger.trace_enabled?
+    end
+
     # The minimum log level to actually log, with debug being the lowest
     # and fatal the highest
     attr_accessor :level
@@ -80,26 +108,25 @@ module TorqueBox
     #   @param [String] message The message to log
     def method_missing(method, *args, &block)
       delegate = method
-      is_boolean = false
-      if method.to_s.end_with?('?')
-        delegate = "#{method.to_s.chop}_enabled?".to_sym
-        is_boolean = true
-      end
       self.class.class_eval do
         define_method(method) do |*a, &b|
           params = params_for_logger(a, b)
-          params = [""] if params.empty? && !is_boolean
+          params = [""] if params.empty?
           @logger.send(delegate, *params)
         end
       end
       self.send(method, *args, &block)
     end
 
-    # Make the Logger compatible with Rack::CommonLogger
-    #
+    # Allow our logger to be used for env['rack.errors']
+    def puts(message)
+      info message.to_s
+    end
     def write(message)
       info message.strip
     end
+    def flush
+    end
 
     private
 

data/spec/logger_spec.rb

@@ -1,44 +1,60 @@
 
 require 'torquebox/logger'
+require 'fileutils'
 require 'logger'
 
-describe TorqueBox::Logger do
-
+shared_examples_for 'a torquebox logger' do
   it "should look nice for class objects" do
     require 'torquebox/service_registry'
-    logger = TorqueBox::Logger.new( TorqueBox::ServiceRegistry )
+    logger = TorqueBox::Logger.new(TorqueBox::ServiceRegistry)
     logger.error("JC: log for cache store")
   end
 
   it "should support the various boolean methods" do
-    logger = TorqueBox::Logger.new
-   
-    logger.trace?.should be_false
-    logger.debug?.should be_false
-    logger.info?.should be_false
-    logger.warn?.should be_true
-    logger.error?.should be_true
-    logger.fatal?.should be_true
+    logger.should respond_to(:debug?)
+    logger.should respond_to(:info?)
+    logger.should respond_to(:warn?)
+    logger.should respond_to(:error?)
+    logger.should respond_to(:fatal?)
   end
 
   it "should not barf on meaningless level setting" do
-    logger = TorqueBox::Logger.new
     logger.level = Logger::WARN
     logger.level.should == Logger::WARN
   end
 
-  it "should deal with blocks correctly" do 
-    logger = TorqueBox::Logger.new
+  it "should deal with blocks correctly" do
     logger.error "JC: message zero"
     logger.error { "JC: message" }
     logger.error "JC: message too"
   end
 
   it "should handle nil parameters" do
-    logger = TorqueBox::Logger.new
     logger.info(nil)
   end
 
+  it "should support the rack.errors interface" do
+    logger.should respond_to(:puts)
+    logger.should respond_to(:write)
+    logger.should respond_to(:flush)
+  end
+
+  it "should have a formatter" do
+    logger.should respond_to(:formatter)
+    logger.formatter.should_not be_nil
+  end
+end
+
+describe TorqueBox::Logger do
+
+  let(:logger) { TorqueBox::Logger.new }
+
+  it_should_behave_like 'a torquebox logger'
+
+  it "should support the trace boolean method" do
+    logger.should respond_to(:trace?)
+  end
+
   it "should support the add method" do
     fake_logger = mock('logger')
     org.jboss.logging::Logger.stub!(:getLogger).and_return(fake_logger)
@@ -64,3 +80,24 @@ describe TorqueBox::Logger do
   end
 end
 
+describe TorqueBox::FallbackLogger do
+  before(:each) do
+    @log_path = File.expand_path(File.join(File.dirname(__FILE__), '..',
+                                           'target',
+                                           'logger_spec_output.log'))
+    ENV['TORQUEBOX_FALLBACK_LOGFILE'] = @log_path
+  end
+
+  after(:each) do
+    FileUtils.rm_f(@log_path)
+  end
+
+  let(:logger) { TorqueBox::FallbackLogger.new }
+
+  it_should_behave_like 'a torquebox logger'
+
+  it "should let users override the fallback log file" do
+    logger.info('testing fallback log file')
+    File.read(@log_path).should include('testing fallback log file')
+  end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-core
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 3.0.0
+  version: 3.0.1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -18,13 +17,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.6
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -50,13 +45,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   prerelease: false
   type: :development
 description: ''
@@ -70,31 +63,32 @@ files:
 - lib/torquebox-core.jar
 - lib/torquebox-core.rb
 - lib/gem_hook.rb
-- lib/torquebox/core.rb
-- lib/torquebox/injectors.rb
-- lib/torquebox/component_manager.rb
+- lib/torquebox/msc.rb
 - lib/torquebox/scheduled_job.rb
 - lib/torquebox/logger.rb
 - lib/torquebox/service.rb
 - lib/torquebox/kernel.rb
-- lib/torquebox/service_registry.rb
+- lib/torquebox/core.rb
+- lib/torquebox/component_manager.rb
 - lib/torquebox/codecs.rb
-- lib/torquebox/msc.rb
 - lib/torquebox/registry.rb
-- lib/torquebox/codecs/marshal_base64.rb
+- lib/torquebox/injectors.rb
+- lib/torquebox/service_registry.rb
+- lib/torquebox/codecs/json.rb
 - lib/torquebox/codecs/marshal.rb
-- lib/torquebox/codecs/marshal_smart.rb
+- lib/torquebox/codecs/marshal_base64.rb
 - lib/torquebox/codecs/edn.rb
-- lib/torquebox/codecs/json.rb
-- spec/kernel_spec.rb
-- spec/logger_spec.rb
+- lib/torquebox/codecs/marshal_smart.rb
 - spec/scheduled_job_spec.rb
 - spec/injectors_spec.rb
+- spec/logger_spec.rb
 - spec/codecs_spec.rb
 - spec/service_registry_spec.rb
+- spec/kernel_spec.rb
 homepage: http://torquebox.org/
 licenses:
 - Public Domain
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -104,23 +98,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: TorqueBox Core Gem
 test_files:
-- spec/kernel_spec.rb
-- spec/logger_spec.rb
 - spec/scheduled_job_spec.rb
 - spec/injectors_spec.rb
+- spec/logger_spec.rb
 - spec/codecs_spec.rb
 - spec/service_registry_spec.rb
+- spec/kernel_spec.rb