yell-adapters-syslog 0.7.0 → 0.8.0

data/lib/yell/adapters/syslog/version.rb

@@ -4,7 +4,7 @@ module Yell #:nodoc:
   module Adapters #:nodoc:
 
     class Syslog
-      VERSION = "0.7.0"
+      VERSION = "0.8.0"
 
     end
   end

data/lib/yell/adapters/syslog.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'syslog'
+
 module Yell #:nodoc:
   module Adapters #:nodoc:
 
@@ -10,15 +12,6 @@ module Yell #:nodoc:
       # `man syslog` to see the severities
       Severities = [7, 6, 4, 3, 2, 1]
 
-      # Map Syslog severities to internal represenation
-      #   'DEBUG'   => 7
-      #   'INFO'    => 6
-      #   'WARN'    => 4
-      #   'ERROR'   => 3
-      #   'FATAL'   => 2
-      #   'UNKNOWN' => 1
-      SeverityMap = Hash[ *(Yell::Severities.zip(Severities).flatten) ]
-
       # Map Syslog options to internal representation
       OptionMap = {
         :cons   => ::Syslog::LOG_CONS,
@@ -63,7 +56,7 @@ module Yell #:nodoc:
       end
 
       write do |event|
-        stream.log( SeverityMap[event.level], clean(event.message) )
+        stream.log( Severities[event.level], clean(event.message) )
       end
 
       close do

data/lib/yell-adapters-syslog.rb

@@ -21,10 +21,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-module Yell #:nodoc:
-end
-
-require 'syslog'
 require 'yell'
 
 require File.dirname(__FILE__) + '/yell/adapters/syslog'

data/spec/yell/adapters/syslog_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Yell::Adapters::Syslog do
+  let( :event ) { Yell::Event.new( 1, "Hello World" ) }
+
   before do
     Syslog.close if Syslog.opened?
   end
@@ -9,18 +11,18 @@ describe Yell::Adapters::Syslog do
     let( :adapter ) { Yell::Adapters::Syslog.new }
 
     it "should call Syslog correctly" do
-      mock( Syslog ).log( Yell::Adapters::Syslog::SeverityMap[subject], "Hello World" )
+      mock( Syslog ).log( Yell::Adapters::Syslog::Severities[subject], "Hello World" )
 
       adapter.write Yell::Event.new( subject, "Hello World" )
     end
   end
 
-  it_behaves_like( "a Syslog adapter" ) { subject { 'DEBUG' } }
-  it_behaves_like( "a Syslog adapter" ) { subject { 'INFO' } }
-  it_behaves_like( "a Syslog adapter" ) { subject { 'WARN' } }
-  it_behaves_like( "a Syslog adapter" ) { subject { 'ERROR' } }
-  it_behaves_like( "a Syslog adapter" ) { subject { 'FATAL' } }
-  it_behaves_like( "a Syslog adapter" ) { subject { 'UNKNOWN' } }
+  it_behaves_like( "a Syslog adapter" ) { subject { 0 } } # debug
+  it_behaves_like( "a Syslog adapter" ) { subject { 1 } } # info
+  it_behaves_like( "a Syslog adapter" ) { subject { 2 } } # warn
+  it_behaves_like( "a Syslog adapter" ) { subject { 3 } } # error
+  it_behaves_like( "a Syslog adapter" ) { subject { 4 } } # fatal
+  it_behaves_like( "a Syslog adapter" ) { subject { 5 } } # unknown
 
   context "a new Yell::Adapters::Syslog instance" do
     subject { Yell::Adapters::Syslog.new }
@@ -76,7 +78,7 @@ describe Yell::Adapters::Syslog do
       mock.proxy( Syslog ).open( "my ident", anything, anything )
 
       subject.ident = "my ident"
-      subject.write Yell::Event.new("INFO", "Hello World")
+      subject.write event
     end
   end
 
@@ -87,14 +89,14 @@ describe Yell::Adapters::Syslog do
       mock.proxy( Syslog ).open( anything, Syslog::LOG_NDELAY, anything )
 
       subject.options = :ndelay
-      subject.write Yell::Event.new("INFO", "Hello World")
+      subject.write event
     end
 
     it "should work with multiple params" do
       mock.proxy( Syslog ).open( anything, Syslog::LOG_PID|Syslog::LOG_NDELAY, anything )
 
       subject.options = [:pid, :ndelay]
-      subject.write Yell::Event.new("INFO", "Hello World")
+      subject.write event
     end
   end
 
@@ -105,14 +107,14 @@ describe Yell::Adapters::Syslog do
       mock.proxy( Syslog ).open( anything, anything, Syslog::LOG_USER )
 
       subject.facility = :user
-      subject.write Yell::Event.new("INFO", "Hello World")
+      subject.write event
     end
 
     it "should work with multiple params" do
       mock.proxy( Syslog ).open( anything, anything, Syslog::LOG_DAEMON|Syslog::LOG_USER )
 
       subject.facility = [:daemon, :user]
-      subject.write Yell::Event.new("INFO", "Hello World")
+      subject.write event
     end
   end
 

data/yell-adapters-syslog.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "yell", "~> 0.6"
+  s.add_runtime_dependency "yell", "~> 0.8.x"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rr"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell-adapters-syslog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
-  requirement: &70303402799860 !ruby/object:Gem::Requirement
+  requirement: &70362241216920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.8.x
   type: :runtime
   prerelease: false
-  version_requirements: *70303402799860
+  version_requirements: *70362241216920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303402799460 !ruby/object:Gem::Requirement
+  requirement: &70362241216520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303402799460
+  version_requirements: *70362241216520
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70303402799000 !ruby/object:Gem::Requirement
+  requirement: &70362239203280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303402799000
+  version_requirements: *70362239203280
 description: Syslog adapter for Yell
 email: 
 executables: []