takihiro-simple_syslog_logger 0.0.4 → 0.0.5

data/lib/simple_syslog_logger.rb

@@ -3,21 +3,23 @@ require 'active_support'
 
 class SimpleSyslogLogger
 
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
+
+  DEFAULT_MAP = {
+    :fatal   => Syslog::LOG_ALERT,
+    :error   => Syslog::LOG_ERR,
+    :warn    => Syslog::LOG_WARNING,
+    :info    => Syslog::LOG_INFO,
+    :debug   => Syslog::LOG_DEBUG,
+    :unknown => Syslog::LOG_DEBUG,
+  }
 
   def initialize(ident='', options=nil, facility=nil)
     @syslog = Syslog.open(ident, options, facility)
-    @logger_map = {
-      :fatal   => Syslog::LOG_ALERT,
-      :error   => Syslog::LOG_ERR,
-      :warn    => Syslog::LOG_WARNING,
-      :info    => Syslog::LOG_INFO,
-      :debug   => Syslog::LOG_DEBUG,
-      :unknown => Syslog::LOG_DEBUG,
-    }
+    @logger_map = DEFAULT_MAP.dup
 
     self.level = @logger_map[:debug]
-    update_logger_map
+    update_log_methods
   end
 
   attr_reader :level
@@ -29,26 +31,12 @@ class SimpleSyslogLogger
 
   def level=(level)
     @level = level
-    @logger_map.each do |severity, syslog_severity|
-      instance_eval <<-SRC
-        def #{severity}?
-          #{syslog_severity <= @level ? 'true' : 'false'}
-        end
-      SRC
-    end
+    update_log_methods
   end
 
   def update_logger_map(map={})
     @logger_map.update(map)
-    @logger_map.each do |severity, syslog_severity|
-      instance_eval <<-SRC
-        def #{severity}(message = nil, progname = nil, &block)
-          #{syslog_severity <= @level ? 
-              "add(#{syslog_severity}, message, progname, &block)" :
-              'true'}
-        end
-      SRC
-    end
+    update_log_methods
   end
 
   cattr_accessor :silencer
@@ -71,4 +59,21 @@ class SimpleSyslogLogger
     @syslog = nil
   end
 
+  private
+  def update_log_methods
+    @logger_map.each do |severity, sval|
+      instance_eval <<-SRC
+        def #{severity}(message = nil, progname = nil, &block)
+          #{sval <= @level ? 
+              "add(#{sval}, message, progname, &block)" :
+              'true'}
+        end
+ 
+        def #{severity}?
+          #{sval <= @level ? 'true' : 'false'}
+        end
+      SRC
+    end
+  end
+
 end

data/spec/simple_syslog_logger_spec.rb

@@ -3,6 +3,10 @@ require 'spec'
 require 'simple_syslog_logger'
 
 describe SimpleSyslogLogger do
+    
+  SORTED_MAP = SimpleSyslogLogger::DEFAULT_MAP.to_a.sort do |p1, p2| 
+    p2[1] <=> p1[1]
+  end
 
   it 'should have version constant' do
     SimpleSyslogLogger::VERSION.should match(/\d+\.\d+\.\d+/)
@@ -25,14 +29,11 @@ describe SimpleSyslogLogger do
 
   describe 'level' do
 
-    before :all do
+    before :each do
+      Syslog.stub!(:open => stub('syslog'))
       @logger = SimpleSyslogLogger.new
     end
 
-    after :all do
-      @logger.close
-    end
-
     it 'should get current level' do
       @logger.should respond_to(:level)
     end
@@ -50,7 +51,7 @@ describe SimpleSyslogLogger do
       @logger = SimpleSyslogLogger.new
     end
 
-    [:fatal, :error, :warn, :info, :debug, :unknown].each do |severity|
+    SORTED_MAP.each do |severity, sval|
 
       it "should have ##{severity}" do
         @logger.should respond_to(severity)
@@ -64,6 +65,35 @@ describe SimpleSyslogLogger do
 
   end
 
+  SORTED_MAP.each do |severity, sval|
+  
+    describe "level is #{severity}" do
+ 
+      before :each do
+        @syslog_mock = mock('syslog')
+        Syslog.stub!(:open => @syslog_mock)
+        @logger = SimpleSyslogLogger.new
+        @logger.level = sval
+      end
+       
+      SORTED_MAP.each do |s, v|
+        if v <= sval
+          it "##{s.to_s.ljust(7)} is send log to syslog" do
+            @syslog_mock.should_receive(:log).with(v, an_instance_of(String))
+            @logger.send(s, 'message')
+          end
+        else
+          it "##{s.to_s.ljust(7)} is only return true" do
+            @syslog_mock.should_not_receive(:log)
+            @logger.send(s, 'message').should be_true
+          end
+        end
+      end
+
+    end
+
+  end
+
   describe 'silencer' do
 
     before :each do
@@ -92,7 +122,7 @@ describe SimpleSyslogLogger do
       @logger.level.should == Syslog::Constants::LOG_DEBUG
     end
 
-    it 'should send message which specify silence is meaningless in SimpleSyslogLogger' do
+    it 'should send message which specify silence is meaningless' do
       @logger.should_receive(:add).with(Syslog::LOG_DEBUG, an_instance_of(String))
       @logger.silence(Syslog::Constants::LOG_ERR) {|tmp_logger| }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: takihiro-simple_syslog_logger
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Hiroaki Takisawa
@@ -13,7 +13,7 @@ date: 2009-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: <activesupport>
+  name: activesupport
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement