syslogger 1.2.6 → 1.2.7

data/README.rdoc

@@ -40,11 +40,7 @@ Documentation available at <http://rdoc.info/github/crohr/syslogger/master/file/
 
 == Contributions
 
-* crhym3
-* theflow
-* smulube
-* levent
-* Flameeyes
+See <https://github.com/crohr/syslogger/contributors>.
 
 == Copyright
 

data/lib/syslogger.rb

@@ -3,7 +3,7 @@ require 'logger'
 
 class Syslogger
 
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 
   attr_reader :level, :ident, :options, :facility
 
@@ -50,6 +50,7 @@ class Syslogger
     # Accepting *args as message could be nil.
     #  Default params not supported in ruby 1.8.7
     define_method logger_method.to_sym do |*args, &block|
+      return true if @level > Logger.const_get(logger_method.upcase)
       message = args.first || block && block.call
       add(Logger.const_get(logger_method.upcase), message)
     end
@@ -61,6 +62,11 @@ class Syslogger
     end
   end
 
+  # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger
+  def write(msg)
+    add(Logger::INFO, msg)
+  end
+
   # Logs a message at the Logger::INFO level.
   def <<(msg)
     add(Logger::INFO, msg)

data/spec/syslogger_spec.rb

@@ -22,6 +22,7 @@ describe "Syslogger" do
 
     it "should log #{logger_method} without raising an exception if called with a block" do
       logger = Syslogger.new
+      logger.level = Logger.const_get(logger_method.upcase)
       Syslog.stub!(:open).and_yield(syslog=mock("syslog", :mask= => true))
       severity = Syslogger::MAPPING[Logger.const_get(logger_method.upcase)]
       syslog.should_receive(:log).with(severity, "Some message that doesn't need to be in a block")
@@ -45,6 +46,24 @@ describe "Syslogger" do
     end
   end
 
+  %w{debug info warn error}.each do |logger_method|
+    it "should not log #{logger_method} when level is higher" do
+      logger = Syslogger.new
+      logger.level = Logger::FATAL
+      Syslog.should_not_receive(:open).with($0, Syslog::LOG_PID | Syslog::LOG_CONS, nil).and_yield(syslog=mock("syslog", :mask= => true))
+      syslog.should_not_receive(:log).with(Syslog::LOG_NOTICE, "Some message")
+      logger.send(logger_method.to_sym, "Some message")
+    end
+
+    it "should not evaluate a block or log #{logger_method} when level is higher" do
+      logger = Syslogger.new
+      logger.level = Logger::FATAL
+      Syslog.should_not_receive(:open).with($0, Syslog::LOG_PID | Syslog::LOG_CONS, nil).and_yield(syslog=mock("syslog", :mask= => true))
+      syslog.should_not_receive(:log).with(Syslog::LOG_NOTICE, "Some message")
+      logger.send(logger_method.to_sym) { violated "This block should not have been called" }
+    end
+  end
+
   it "should respond to <<" do
     logger = Syslogger.new("my_app", Syslog::LOG_PID, Syslog::LOG_USER)
     logger.should respond_to(:<<)
@@ -53,6 +72,14 @@ describe "Syslogger" do
     logger << "yop"
   end
 
+  it "should respond to write" do
+    logger = Syslogger.new("my_app", Syslog::LOG_PID, Syslog::LOG_USER)
+    logger.should respond_to(:write)
+    Syslog.should_receive(:open).with("my_app", Syslog::LOG_PID, Syslog::LOG_USER).and_yield(syslog=mock("syslog", :mask= => true))
+    syslog.should_receive(:log).with(Syslog::LOG_INFO, "yop")
+    logger.write "yop"
+  end
+
   describe "add" do
     before do
       @logger = Syslogger.new("my_app", Syslog::LOG_PID, Syslog::LOG_USER)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: syslogger
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 2
-  - 6
-  version: 1.2.6
+  - 7
+  version: 1.2.7
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-27 00:00:00 +01:00
+date: 2012-03-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency