lager 0.2.0.9 → 1.0.0.1

data/VERSION

@@ -1 +1 @@
-0.2.0.9
+1.0.0.1

data/lib/lager.rb

@@ -38,21 +38,18 @@ require 'logger'
 #
 module Lager
   def self.version
-    vpath = File.join(File.dirname(__FILE__), '..', 'VERSION')
-    File.read(vpath).chomp
+    file = File.expand_path('../../VERSION', __FILE__)
+    File.read(file).chomp
   end
 
-  # create @lager
+  # create @lager from dest; return dest
   # if passed a Logger instance, set @lager to that instance and return
   # supports IO and String (filename, presumably) for log destination
   # (passed straight through to Logger.new)
   # supports symbols, strings, and integers for log level
   #
-  def log_to(dest = $stderr, level = nil)
-    if dest.is_a?(Logger)
-      @lager = dest
-      return
-    end
+  def log_to(dest, level = nil)
+    return (@lager = dest) if dest.is_a?(Logger)
     # use the old @lager's level by default, as appropriate
     level ||= (defined?(@lager) ? @lager.level : :warn)
     @lager = Logger.new dest
@@ -62,7 +59,7 @@ module Lager
       line << msg << "\n"
     }
     log_level level
-    nil # don't expose @lager here
+    dest # don't expose @lager here
   end
 
   # call without argument to get the log level
@@ -70,20 +67,28 @@ module Lager
   # :debug, 'debug', and Logger::DEBUG (0) are all supported
   #
   def log_level(level = nil)
+    raise "no @lager available" unless defined?(@lager)
+    return (self.log_level = level) if level
+    [:debug, :info, :warn, :error, :fatal][@lager.level] || :unknown
+  end
+
+  def log_level=(level)
     raise "no @lager available" unless defined?(@lager)
     case level
-    when nil
-      @lager.level
     when Symbol, String
       begin
         @lager.level = Logger.const_get(level.to_s.upcase)
       rescue NameError
-        raise "unknown log level #{level}"
+        @lager.unknown "unknown log level: #{level}"
       end
     when Numeric
-      @lager.level = level
+      if level < Logger::UNKNOWN
+        @lager.level = level
+      else
+        @lager.unknown "unknown log level: #{level}"
+      end
     else
-      raise "unknown log level: #{level}"
+      @lager.unknown "unknown log level: #{level} (#{level.class})"
     end
   end
 

data/test/lager.rb

@@ -4,7 +4,11 @@ require 'minitest/autorun'
 require 'tempfile'
 
 require_relative '../lib/lager'
-require_relative '../examples/foo' # useful Foo class
+
+# useful Foo class
+# calls log_to at require time
+#
+require_relative '../examples/foo'
 
 describe Lager do
   describe ".version" do
@@ -15,12 +19,12 @@ describe Lager do
 
   describe "#log_to" do
     it "must have created a Logger" do
-      # note, the useful Foo class has already called log_to in the class def
+      # note, the useful Foo class has already called log_to
       Foo.lager.must_be_instance_of(Logger)
     end
 
     it "must return nil" do
-      Foo.log_to.must_be_nil
+      Foo.log_to($stdout).must_equal $stdout
     end
 
     it "must use an existing Logger when provided" do
@@ -54,15 +58,46 @@ describe Lager do
     end
   end
 
-  describe "#log_level" do
-    it "must accept :debug as Logger::DEBUG" do
-      Foo.log_level :debug
-      Foo.log_level.must_equal Logger::DEBUG
+  describe "#log_level=" do
+    before do
+      Foo.log_level = :fatal
+    end
+
+    it "must accept :debug as :debug" do
+      Foo.log_level = :debug
+      Foo.log_level.must_equal :debug
+    end
+
+    it "must accept Logger::INFO as :info" do
+      Foo.log_level = Logger::INFO
+      Foo.log_level.must_equal :info
+    end
+
+    it "must accept 'warn' as :warn" do
+      Foo.log_level = 'warn'
+      Foo.log_level.must_equal :warn
+    end
+
+    def must_ignore level
+      lev = Foo.log_level
+      Foo.log_level = level
+      Foo.log_level.must_equal lev
+    end
+
+    it "must ignore a bad symbol" do
+      must_ignore :bedug
+    end
+
+    it "must ignore an unexpected object" do
+      must_ignore Array
+    end
+
+    it "must ignore a bad integer" do
+      must_ignore 42
     end
 
-    it "must accept Logger::INFO as Logger::INFO" do
-      Foo.log_level Logger::INFO
-      Foo.log_level.must_equal Logger::INFO
+    it "must ignore Logger::UNKNOWN" do
+      must_ignore Logger::UNKNOWN
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lager
 version: !ruby/object:Gem::Version
-  version: 0.2.0.9
+  version: 1.0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest