syslogger 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b700c9de11a93cefdb98ca53a92bf2499a0c74
-  data.tar.gz: 5c11451c3ec8745595fe0a85e0d9cd5423bef221
+  metadata.gz: 32d5b47d8aa6a4b2a3df0bf108b8ed76fea1540a
+  data.tar.gz: 314383df890e4fa2badaeb3a9b39f4f148f626be
 SHA512:
-  metadata.gz: 33b809d97e51893468e8a5679a2bf74d69d4bb8829662090aa0439a2f6eeebdcf8bed7baa8c34b7143a985390f8442ff94974b84610ae7c5fbb6b045e4b884ea
-  data.tar.gz: 412a3de21a03b23978d38ce2ddaa74aa15f0901129a468594afd591bd0b66a5e7d3bca329753a34352db8de955d10c25ae93fd1ded0583a17f12539ff970c2a9
+  metadata.gz: 5762ef3865af23f47acdeb71f4b8d197780a7a02b87604b53e561871fe9ac8815a794e41024b3f4ef57f8ff6e6c657166165a4b5ec021c855f6f26d574202585
+  data.tar.gz: ff39d2bf1863e1c391cb3c6b7f4625c9aa021838463df85be82d1801192f4ea6e18ab50c6f8912c055faebaf4c9dff036687628bb88709c895caec807ac3d579

data/lib/syslogger.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 class Syslogger
 
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 
   attr_reader :level, :ident, :options, :facility, :max_octets
   attr_accessor :formatter
@@ -40,6 +40,7 @@ class Syslogger
   #   logger.level = Logger::INFO # use Logger levels
   #   logger.warn "warning message"
   #   logger.debug "debug message"
+  #   logger.info "my_subapp" { "Some lazily computed message" }
   #
   def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil)
     @ident = ident
@@ -56,9 +57,9 @@ 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)
+      severity = Logger.const_get(logger_method.upcase)
+      return true if @level > severity
+      add(severity, nil, args.first, &block)
     end
 
     unless logger_method == 'unknown'

data/spec/syslogger_spec.rb

@@ -31,6 +31,18 @@ describe "Syslogger" do
       }.should_not raise_error
     end
 
+    it "should log #{logger_method} using message as progname with the block's result" do
+      logger = Syslogger.new
+      logger.level = Logger.const_get(logger_method.upcase)
+      Syslog.should_receive(:open).with("Woah", anything, nil)
+        .and_yield(syslog=double("syslog", :mask= => true))
+      severity = Syslogger::MAPPING[Logger.const_get(logger_method.upcase)]
+      syslog.should_receive(:log).with(severity, "Some message that really needs a block")
+      lambda {
+        logger.send(logger_method.to_sym, "Woah") { "Some message that really needs a block" }
+      }.should_not raise_error
+    end
+
     it "should log #{logger_method} without raising an exception if called with a nil message" do
       logger = Syslogger.new
       lambda {
@@ -54,7 +66,6 @@ describe "Syslogger" do
         logger.send(logger_method.to_sym,msg)
       }.should_not raise_error
     end
-
   end
 
   %w{debug info warn error}.each do |logger_method|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogger
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Cyril Rohr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake