lumber 0.11.0 → 0.11.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.11.1 (05/23/2012)
+-------------------
+
+document require statement for server <116b17d>
+use ttl when set in same post, only backup/restore levels from activate_levels, not set_levels <05140c1>
+
 0.11.0 (05/22/2012)
 -------------------
 

data/README.md

@@ -54,9 +54,10 @@ If you want to change the log level for a different environment, you can do so i
 
 Lumber also comes with a Sinatra UI for dynamically overriding log levels at runtime.  To use it, just run Lumber::Server as a rack application.  The easiest way to do this is to map it to a route in your rails routes.rb (make sure you password protect it):
 
+    require 'lumber/server'
     mount Lumber::Server, :at => "/lumber"
 
-This will allow you to temporarily set lower log levels for specific loggers - e.g. if you want a specific model to have DEBUG logging for the next hour.  For this to work, you need to activat
+This will allow you to temporarily set lower log levels for specific loggers - e.g. if you want a specific model to have DEBUG logging for the next hour.
 
 
 Copyright

data/lib/lumber/level_util.rb

@@ -33,8 +33,7 @@ module Lumber
     # @param [Hash] Logger fullname mapping to level name, e.g. {'rails::models::User' => 'DEBUG'}
     #
     def set_levels(levels)
-      backup_levels(levels.keys)
-      @cache_provider.write(LOG_LEVELS_KEY, levels, :expire_in => @ttl)
+      @cache_provider.write(LOG_LEVELS_KEY, levels, :expires_in => @ttl)
     end
     
     def get_levels()
@@ -50,6 +49,7 @@ module Lumber
       if levels.size == 0
         restore_levels
       else
+        backup_levels(levels.keys)
         levels.each do |name, level|
           logger = Lumber.find_or_create_logger(name)
           level_val = Log4r::LNAMES.index(level)

data/lib/lumber/server.rb

@@ -43,8 +43,8 @@ module Lumber
         @ttl = ttl
         erb :levels
       else
+        LevelUtil.ttl = ttl.to_i if ttl
         LevelUtil.set_levels(levels)
-        LevelUtil.ttl = ttl
         redirect url(:levels)
       end
       

data/lib/lumber/version.rb

@@ -1,3 +1,3 @@
 module Lumber
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/lumber.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency("rake")
   gem.add_development_dependency("rspec")
+  gem.add_development_dependency("rack-test")
   gem.add_development_dependency("capybara")
   gem.add_development_dependency("capybara-webkit")
   gem.add_development_dependency("awesome_print")

data/spec/level_util_spec.rb

@@ -32,18 +32,21 @@ describe Lumber::LevelUtil do
   it "creates logger if not yet defined" do
     Log4r::Logger["unknownlogger"].should be_nil
     LevelUtil.set_levels({"unknownlogger" => "DEBUG"})
+    LevelUtil.activate_levels
     Log4r::Logger["unknownlogger"].should_not be_nil
   end
   
   it "reuses logger if already defined" do
-    LevelUtil.set_levels({@name => "DEBUG"})
-    foo_logger = Log4r::Logger[@name]
+    foo_logger = Lumber.find_or_create_logger(@name)
     foo_logger.should_not be_nil
+
     LevelUtil.set_levels({@name => "INFO"})
+    LevelUtil.activate_levels
     Log4r::Logger[@name].should == foo_logger
   end
   
   it "activate level on logger" do
+    Lumber.find_or_create_logger(@name)
     LevelUtil.set_levels({@name => "ERROR"})
     Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
     LevelUtil.activate_levels
@@ -51,15 +54,16 @@ describe Lumber::LevelUtil do
   end
   
   it "restores levels when mapping expires" do
-    LevelUtil.set_levels({"bar" => "ERROR"})
-    Log4r::Logger["bar"].level.should == Log4r::LNAMES.index("DEBUG")
-    
+    Lumber.find_or_create_logger(@name)
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
+
+    LevelUtil.set_levels({@name => "ERROR"})
     LevelUtil.activate_levels
-    Log4r::Logger["bar"].level.should == Log4r::LNAMES.index("ERROR")
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("ERROR")
 
     LevelUtil.set_levels({})
     LevelUtil.activate_levels
-    Log4r::Logger["bar"].level.should == Log4r::LNAMES.index("DEBUG")
+    Log4r::Logger[@name].level.should == Log4r::LNAMES.index("DEBUG")
   end
   
   it "starts a monitor thread" do

data/spec/server_spec.rb

@@ -1,11 +1,16 @@
 require 'spec_helper'
 
 describe Lumber::Server, :type => :request do
-
+  include Rack::Test::Methods
+  
   before(:each) do
     Capybara.app = Lumber::Server.new
   end
 
+  def app
+    @app ||= Lumber::Server.new
+  end
+  
   it "should respond to it's url" do
     visit "/levels"
     page.should have_content('Logger Levels')
@@ -47,6 +52,13 @@ describe Lumber::Server, :type => :request do
 
     page.should have_selector('form')
   end
+  
+  it "uses ttl set in current request" do
+    Lumber.find_or_create_logger("foo")
+    LevelUtil.cache_provider.should_receive(:write).with(LevelUtil::LOG_LEVELS_KEY, {"foo" => "INFO"}, :expires_in => 55)
+
+    post "/levels", {'ttl' => 55, 'levels' => [{'name' => "foo", "level" => "INFO"}]}
+  end
     
   it "assigns level overrides", :js => true do
     LevelUtil.set_levels({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumber
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement