slogger 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slogger (0.0.4)
+    slogger (0.0.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/slogger/common_logger.rb

@@ -12,14 +12,14 @@ module Slogger
   # That's all. The Rails application will log everything to the standard syslog.
   #
   class CommonLogger < Base
-
+    
     SEVERITIES = {
-      :unknow  => Syslog::LOG_EMERG,
-      :fatal   => Syslog::LOG_ALERT,
-      :error   => Syslog::LOG_ERR,
-      :warning => Syslog::LOG_WARNING,
+      :emerg   => Syslog::LOG_EMERG,
+      :alert   => Syslog::LOG_ALERT,
+      :err     => Syslog::LOG_ERR,
       :info    => Syslog::LOG_INFO,
-      :debug   => Syslog::LOG_DEBUG
+      :debug   => Syslog::LOG_DEBUG,
+      :warn    => Syslog::LOG_WARNING,
     }
 
     #
@@ -29,7 +29,7 @@ module Slogger
       :unknow  => :emerg,
       :fatal   => :alert,
       :error   => :err,
-      :warning => :warning,
+      :warn    => :warning,
       :info    => :info,
       :debug   => :debug
     }
@@ -44,7 +44,7 @@ module Slogger
     #
     # +app_name+::  The appliaction name to be logged
     # +severity+::  The log severity (according to standard Ruby Logger): :unknow, :fatal,
-    #                 :error, :warning, :info, or :debug. It can be changed at anytime.
+    #                 :error, :warn, :info, or :debug. It can be changed at anytime.
     # +facility+::  A typical syslog facility: :kernel, :user, :mail, :daemon, :auth,
     #                 :syslog, :lpr, :news, :uucp, :cron, :authpriv, :ftp,
     #                 :local0, :local1, :local2, :local3, :local4, :local5,
@@ -55,14 +55,26 @@ module Slogger
     def initialize(app_name, severity, facility)
       super app_name, severity, facility, SEVERITIES
     end
-
-    SEVERITIES.each_key do |severity|
-      define_method severity do |message, &block|
+    
+    def log(severity, message = nil, &block)
+      if block_given? and message != nil
+        super(severity, message, &block)
+      else
+        super(severity, (message || (block_given? && block.call) || @app_name), &nil)
+      end
+    end
+    
+    def add(severity, message = nil, &block)
+      log(BRIDGE_SEVERITIES[severity], message, &block)
+    end
+    
+    BRIDGE_SEVERITIES.each_key do |severity|
+      define_method severity do |message = nil, &block|
         log BRIDGE_SEVERITIES[severity], message, &block
       end
 
       define_method "#{severity}?" do
-        SEVERITIES[severity] <= SEVERITIES[@severity]
+        SEVERITIES[BRIDGE_SEVERITIES[severity]] <= SEVERITIES[BRIDGE_SEVERITIES[@severity]]
       end
     end
   end

data/lib/slogger/version.rb

@@ -2,7 +2,7 @@ module Slogger
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/slogger/common_logger_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "..", "/spec_helper")
 
 describe Slogger::CommonLogger do
   subject { Slogger::CommonLogger.new "test_app", :debug, :local0 }
-
+    
   describe "valid state" do
     it "should have an app_name attribute" do
       subject.app_name.should == "test_app"
@@ -42,8 +42,8 @@ describe Slogger::CommonLogger do
   describe "severity setup" do
     it "should be possible to change severity attribute" do
       subject.severity.should be :debug
-      subject.severity = :warning
-      subject.severity.should be :warning
+      subject.severity = :warn
+      subject.severity.should be :warn
       subject.severity = :info
       subject.severity.should be :info
     end
@@ -54,9 +54,16 @@ describe Slogger::CommonLogger do
   end
 
   describe "logging" do
-    describe "when is in WARNING severity" do
-      subject { Slogger::CommonLogger.new "test_app", :warning, :local0 }
-
+    describe "when is in WARN severity" do
+      subject { Slogger::CommonLogger.new "test_app", :warn, :local0 }
+      
+      it { should respond_to(:add) }
+      
+      it "should log ERROR messsages with the add method" do
+        Syslog.should_receive(:err).with('ERROR message').and_return(Syslog)
+        subject.add(:error, 'ERROR message')
+      end
+      
       it "should log UNKNOW messages" do
         Syslog.should_receive(:emerg).with(anything).and_return(Syslog)
 
@@ -74,11 +81,16 @@ describe Slogger::CommonLogger do
 
         subject.error "ERROR message"
       end
-
-      it "should log WARNING messages" do
+      
+      it "should log WARN messsages with the add method to the WARNING severity" do
+        Syslog.should_receive(:warning).with('WARN message').and_return(Syslog)
+        subject.add(:warn, 'WARN message')
+      end
+      
+      it "should log WARN messages to the WARNING severity" do        
         Syslog.should_receive(:warning).with(anything).and_return(Syslog)
 
-        subject.warning "WARNING message"
+        subject.warn "WARN message"
       end
 
       it "shouldn't log INFO messages" do
@@ -97,11 +109,26 @@ describe Slogger::CommonLogger do
         end
       end
     end
-
+    
+    describe "when no message is passed to the log method" do
+      it "should use the block to form the message" do
+        subject.severity = :info
+        
+        messenger = mock('messenger')
+        messenger.should_receive(:message).and_return('this is a message %{name}')
+        
+        Syslog.should_receive(:info).with('this is a message logger').and_return(Syslog)
+        
+        subject.info { messenger.message % {:name => 'logger'} }
+      end
+    end
+    
     describe "when a block is passed to log method" do
       it "should add spent time to the message" do
+        Syslog.should_receive(:info).with(/\[time: [0-9.]+\] a block wrapped by log/)
+        
         subject.info "a block wrapped by log" do
-          sleep(2)
+          sleep(1)
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slogger
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Leandro Silva
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -03:00
+date: 2011-08-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency