yell 0.8.0 → 0.9.0

data/lib/yell.rb

@@ -52,6 +52,10 @@ module Yell #:nodoc:
       ENV['YELL_ENV'] || ENV['RACK_ENV'] || 'development'
     end
 
+    def load!( file )
+      Yell.new Yell::Configuration.load!( file )
+    end
+
     def _deprecate( version, message, options = {} )
       warning = ["Deprecation Warning (since v#{version}): #{message}" ]
       warning << "  before: #{options[:before]}" if options[:before]
@@ -70,3 +74,5 @@ require File.dirname(__FILE__) + '/yell/formatter'
 require File.dirname(__FILE__) + '/yell/adapters'
 require File.dirname(__FILE__) + '/yell/logger'
 
+require File.dirname(__FILE__) + '/yell/configuration'
+

data/lib/yell/adapters.rb

@@ -4,7 +4,7 @@ module Yell #:nodoc:
 
   # NoSuchAdapter is raised whenever you want to instantiate an 
   # adapter that does not exist.
-  class NoSuchAdapter < StandardError; end
+  class UnregisteredAdapter < StandardError; end
 
   # This module provides the interface to attaching adapters to
   # the logger. You should not have to call the corresponding classes
@@ -35,7 +35,7 @@ module Yell #:nodoc:
           else @@adapters[name]
         end
 
-        raise NoSuchAdapter.new( name ) unless adapter
+        raise UnregisteredAdapter.new( name ) unless adapter
 
         adapter.new( options, &block )
       end

data/lib/yell/adapters/io.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'monitor'
-
 module Yell #:nodoc:
   module Adapters #:nodoc:
 

data/lib/yell/configuration.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require 'yaml'
+
+module Yell #:nodoc:
+
+  # The Configuration can be used to setup Yell before
+  # initializing an instance.
+  class Configuration
+
+    def self.load!( file )
+      YAML.load( ::File.read(file) )
+    end
+
+  end
+end
+

data/lib/yell/level.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 module Yell #:nodoc:
+   InterpretRegexp = /(at|gt|gte|lt|lte)?\.?(#{Yell::Severities.join('|')}})/i
 
   # The +Level+ class handles the severities for you in order to determine 
   # if an adapter should log or not.
@@ -63,8 +64,9 @@ module Yell #:nodoc:
 
       case severity
         when Array then at( *severity )
-        when Range then gte(severity.first).lte(severity.last)
-        when Integer, String, Symbol then gte(severity)
+        when Range then gte( severity.first ).lte( severity.last )
+        when Integer, Symbol then gte( severity )
+        when String then interpret!( severity )
       end
     end
 
@@ -117,6 +119,14 @@ module Yell #:nodoc:
 
     private
 
+    def interpret!( severities )
+      severities.split( ' ' ).each do |severity|
+        if m = InterpretRegexp.match(severity)
+          m[1].nil? ? __send__( :gte, m[2] ) : __send__( m[1], m[2] )
+        end
+      end
+    end
+
     def calculate!( modifier, severity ) #:nodoc:
       index = index_from( severity )
       return if index.nil?

data/lib/yell/logger.rb

@@ -37,6 +37,9 @@ module Yell #:nodoc:
       # extract options
       @options = args.last.is_a?(Hash) ? args.pop : {}
 
+      # adapters may be passed in the options
+      _extract_adapters!( @options )
+
       # check if filename was given as argument and put it into the @options
       if args.last.is_a?( String )
         @options[:filename] = args.pop unless @options[:filename]
@@ -46,10 +49,9 @@ module Yell #:nodoc:
       self.level = @options[:level]
 
       # extract adapter
-      self.adapter args.pop if args.any?
+      adapter args.pop if args.any?
 
       # eval the given block
-      # block.call(self) if block
       _call( &block ) if block
 
       # default adapter when none defined
@@ -79,7 +81,7 @@ module Yell #:nodoc:
     #
     # @raise [Yell::NoSuchAdapter] Will be thrown when the adapter is not defined
     def adapter( type = :file, *args, &block )
-      options = [@options, *args].inject( Hash.new ) do |h,c| 
+      options = [@options, *args].inject( Hash.new ) do |h, c|
         h.merge( c.is_a?(String) ? {:filename => c} : c  )
       end
 
@@ -147,6 +149,23 @@ module Yell #:nodoc:
       end
     end
 
+    # The :adapters key may be passed to the options hash. It may appear in 
+    # multiple variations:
+    #
+    # @example
+    #   options = { :adapters => [:stdout, :stderr] }
+    #
+    # @example
+    #   options = { :adapters => [:stdout => {:level => :info}, :stderr => {:level => :error}]
+    def _extract_adapters!( opts )
+      ( opts.delete( :adapters ) || [] ).each do |a|
+        case a
+          when String, Symbol then adapter( a )
+          else a.each { |n, o| adapter( n, o || {} ) }
+        end
+      end
+    end
+
     # Cycles all the adapters and writes the message
     def write( event )
       @adapters.each { |a| a.write(event) }

data/lib/yell/version.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 module Yell #:nodoc:
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 
 end
 

data/spec/fixtures/yell.yml

@@ -0,0 +1,7 @@
+:level: info
+
+:adapters:
+  - :stdout:
+      :level: "lt.error"
+  - :stderr:
+      :level: "gte.error"

data/spec/yell/adapters_spec.rb

@@ -28,8 +28,8 @@ describe Yell::Adapters do
     end
 
     context "given an unregistered adapter" do
-      it "should raise NoSuchAdapter" do
-        lambda { Yell::Adapters.new :unknown }.should raise_error Yell::NoSuchAdapter
+      it "should raise UnregisteredAdapter" do
+        lambda { Yell::Adapters.new :unknown }.should raise_error Yell::UnregisteredAdapter
       end
     end
   end

data/spec/yell/configuration_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Yell::Configuration do
+
+  describe ":load!" do
+    let( :file ) { File.expand_path File.dirname(__FILE__) + '/../fixtures/yell.yml' }
+    let( :configuration ) { Yell::Configuration.load!( file ) }
+
+    it "should return the hash from the given file" do
+      YAML.load( File.read(file) ).should == configuration
+    end
+  end
+
+end
+

data/spec/yell/level_spec.rb

@@ -66,6 +66,50 @@ describe Yell::Level do
     end
   end
 
+  context "given a String" do
+    let( :level ) { Yell::Level.new(subject) }
+
+    context "basic string" do
+      subject { 'error' }
+
+      it { level.at?(:debug).should be_false }
+      it { level.at?(:info).should be_false }
+      it { level.at?(:warn).should be_false }
+      it { level.at?(:error).should be_true }
+      it { level.at?(:fatal).should be_true }
+    end
+
+    context "complex string with outer boundaries" do
+      subject { 'gte.info lte.error' }
+
+      it { level.at?(:debug).should be_false }
+      it { level.at?(:info).should be_true }
+      it { level.at?(:warn).should be_true }
+      it { level.at?(:error).should be_true }
+      it { level.at?(:fatal).should be_false }
+    end
+
+    context "complex string with inner boundaries" do
+      subject { 'gt.info lt.error' }
+
+      it { level.at?(:debug).should be_false }
+      it { level.at?(:info).should be_false }
+      it { level.at?(:warn).should be_true }
+      it { level.at?(:error).should be_false }
+      it { level.at?(:fatal).should be_false }
+    end
+
+    context "complex string with precise boundaries" do
+      subject { 'at.info at.error' }
+
+      it { level.at?(:debug).should be_false }
+      it { level.at?(:info).should be_true }
+      it { level.at?(:warn).should be_false }
+      it { level.at?(:error).should be_true }
+      it { level.at?(:fatal).should be_false }
+    end
+  end
+
   context "given an Array" do
     let( :level ) { Yell::Level.new( [:debug, :warn, :fatal] ) }
 

data/spec/yell/logger_spec.rb

@@ -106,6 +106,29 @@ describe Yell::Logger do
     end
   end
 
+  context "initialize with :adapters option" do
+    let( :logger ) do
+      Yell::Logger.new :adapters => [ :stdout, { :stderr => {:level => :error} } ]
+    end
+
+    let( :adapters ) { logger.instance_variable_get :@adapters }
+    let( :stdout ) { adapters.first }
+    let( :stderr ) { adapters.last }
+
+    it "should define those adapters" do
+      adapters.size.should == 2
+
+      stdout.should be_kind_of Yell::Adapters::Stdout
+      stderr.should be_kind_of Yell::Adapters::Stderr
+    end
+
+    it "should pass :level to :stderr adapter" do
+      stderr.level.at?(:warn).should be_false
+      stderr.level.at?(:error).should be_true
+      stderr.level.at?(:fatal).should be_true
+    end
+  end
+
   context "caller's :file, :line and :method" do
     let( :adapter ) { Yell::Adapters::Stdout.new :format => "%F, %n: %M" }
     let( :logger ) { Yell::Logger.new { |l| l.adapter adapter } }

data/spec/yell_spec.rb

@@ -5,8 +5,8 @@ describe Yell do
 
   it { should be_kind_of Yell::Logger }
 
-  it "should raise NoSuchAdapter when adapter cant be loaded" do
-    lambda { Yell.new :unknownadapter }.should raise_error( Yell::NoSuchAdapter )
+  it "should raise UnregisteredAdapter when adapter cant be loaded" do
+    lambda { Yell.new :unknownadapter }.should raise_error( Yell::UnregisteredAdapter )
   end
 
   context :level do
@@ -21,4 +21,17 @@ describe Yell do
     it { should be_kind_of Yell::Formatter }
   end
 
+  context :load! do
+    subject { Yell.load!( File.dirname(__FILE__) + '/fixtures/yell.yml' ) }
+
+    let( :adapters ) { subject.instance_variable_get :@adapters }
+
+    it { should be_kind_of Yell::Logger }
+
+    it "should return a Yell instacne with the configuration for a file" do
+      adapters.first.should be_kind_of Yell::Adapters::Stdout
+      adapters.last.should be_kind_of Yell::Adapters::Stderr
+    end
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Rudolf Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 +02:00
+date: 2012-05-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,11 +84,13 @@ files:
 - lib/yell/adapters/file.rb
 - lib/yell/adapters/io.rb
 - lib/yell/adapters/streams.rb
+- lib/yell/configuration.rb
 - lib/yell/event.rb
 - lib/yell/formatter.rb
 - lib/yell/level.rb
 - lib/yell/logger.rb
 - lib/yell/version.rb
+- spec/fixtures/yell.yml
 - spec/spec_helper.rb
 - spec/yell/adapters/base_spec.rb
 - spec/yell/adapters/datefile_spec.rb
@@ -96,6 +98,7 @@ files:
 - spec/yell/adapters/io_spec.rb
 - spec/yell/adapters/streams_spec.rb
 - spec/yell/adapters_spec.rb
+- spec/yell/configuration_spec.rb
 - spec/yell/event_spec.rb
 - spec/yell/formatter_spec.rb
 - spec/yell/level_spec.rb
@@ -133,6 +136,7 @@ signing_key:
 specification_version: 3
 summary: Yell - Your Extensible Logging Library
 test_files: 
+- spec/fixtures/yell.yml
 - spec/spec_helper.rb
 - spec/yell/adapters/base_spec.rb
 - spec/yell/adapters/datefile_spec.rb
@@ -140,6 +144,7 @@ test_files:
 - spec/yell/adapters/io_spec.rb
 - spec/yell/adapters/streams_spec.rb
 - spec/yell/adapters_spec.rb
+- spec/yell/configuration_spec.rb
 - spec/yell/event_spec.rb
 - spec/yell/formatter_spec.rb
 - spec/yell/level_spec.rb