syslogger 1.2.1 → 1.2.2

data/Rakefile

@@ -15,6 +15,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
 end
 
 Rake::RDocTask.new do |rdoc|
+  require 'syslogger'
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "syslogger #{Syslogger::VERSION}"
   rdoc.rdoc_files.include('README*')

data/lib/syslogger.rb

@@ -3,7 +3,7 @@ require 'logger'
 
 class Syslogger
   
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
   
   attr_reader :level, :ident, :options, :facility
   
@@ -71,7 +71,9 @@ class Syslogger
     progname ||= @ident
     Syslog.open(progname, @options, @facility) { |s| 
       s.mask = Syslog::LOG_UPTO(MAPPING[@level])
-      s.log(MAPPING[severity], (message || block.call).to_s) 
+      # substitute '%' for '%%' before logging
+      # so that syslog won't complain about malformed characters
+      s.log(MAPPING[severity], (message || block.call).to_s.gsub(/%/, '%%'))
     }
   end
   

data/spec/syslogger_spec.rb

@@ -51,6 +51,12 @@ describe "Syslogger" do
       syslog.should_receive(:log).with(Syslog::LOG_INFO, "message")
       @logger.add(Logger::INFO, "message", "progname") { "my 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%%")
+      @logger.add(Logger::INFO, "%me%ssage%")
+    end
   end # describe "add"
   
   describe ":level? methods" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +01:00
+date: 2011-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency