syslogger 1.4.2 → 1.5.0

data/lib/syslogger.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 class Syslogger
 
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 
   attr_reader :level, :ident, :options, :facility, :max_octets
 
@@ -81,11 +81,15 @@ class Syslogger
   #             If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger.
   # +progname+:: optionally, overwrite the program name that appears in the log message.
   def add(severity, message = nil, progname = nil, &block)
+    if message.nil? && block.nil? && !progname.nil? 
+      message, progname = progname, nil 
+    end
     progname ||= @ident
+
     @mutex.synchronize do
       Syslog.open(progname, @options, @facility) do |s|
         s.mask = Syslog::LOG_UPTO(MAPPING[@level])
-        communication = clean(message || (block && block.call) || progname)
+        communication = clean(message || block && block.call)
         if self.max_octets
           buffer = ""
           communication.bytes do |byte|

data/spec/syslogger_spec.rb

@@ -103,6 +103,24 @@ describe "Syslogger" do
       @logger.add(Logger::INFO, "message", "progname") { "my message" }
     end
 
+    it "should use the default progname when message is passed in progname" do
+      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, "message")
+      @logger.add(Logger::INFO, nil, "message")
+    end
+
+    it "should use the given progname if message is passed in block" do
+      Syslog.should_receive(:open).
+        with("progname", Syslog::LOG_PID, Syslog::LOG_USER).
+        and_yield(syslog = mock("syslog", :mask= => true))
+
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "message")
+      @logger.add(Logger::INFO, nil, "progname") { "message" }
+    end
+
     it "should substitute '%' for '%%' before adding the :message" do
       Syslog.stub(:open).and_yield(syslog=mock("syslog", :mask= => true))
       syslog.should_receive(:log).with(Syslog::LOG_INFO, "%%me%%ssage%%")
@@ -119,17 +137,17 @@ describe "Syslogger" do
       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, "my_app")
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "")
       lambda {
         @logger.add(Logger::INFO, nil)
       }.should_not raise_error
     end
 
-    it "should use given progname as the message if the message and block are nil" do
+    it "should send an empty string if the message and block are nil" do
       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, "my_app")
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "")
       @logger.add(Logger::INFO, nil)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syslogger
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake