captivity 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,7 +1,29 @@
 = captivity
 
-Captivity is a simplistick Rack middleware for capturing and logging exceptions. It is a replacement for the CommonLogger
-middleware which I found lacking and abandoned. It's compatible with any Logger implementation.
+Captivity is a simplistick Rack middleware for capturing and logging exceptions and requests.
+It atcs like a wrapper for the Rack CommonLogger, but it fixes it's incompatibility
+with the Logger interface (request logs will be logged as INFO messages).
+
+== Usage
+
+In your rackup file, grab a logger (you can configure it dynamically) and feed it to the Captivity middleware
+
+  logger = if ENV['RACK_ENV'] == 'production'
+    Le.new('<YOUR_LOGENTRIES_KEY>', 'myserver/webapp1')
+  else
+    Logger.new(STDERR)
+  end
+  logger.level = Logger::INFO
+  use Captivity, logger
+
+Then, in your app, use the passed Logger object by using the "captivity.logger" env variable:
+
+  def logger
+    env["captivity.logger"]
+  end
+  
+  ...
+  logger.warn("Bad things are-a happenin'!")
 
 == Contributing to captivity
  

data/captivity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "captivity"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2012-07-08"
+  s.date = "2013-04-11"
   s.description = "A simple logging wrapper for Rack"
   s.email = "me@julik.nl"
   s.extra_rdoc_files = [

data/lib/captivity.rb

@@ -3,7 +3,7 @@ require 'logger'
 require 'rack/commonlogger'
 
 class Captivity
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   
   # Rack::CommonLogger is so ingeniously put together that
   # it does not honor the standard logger levels, it uses #write.
@@ -25,6 +25,7 @@ class Captivity
   # the defined Logger object in the "captivity.logger" of the env hash
   def call(env)
     env["captivity.logger"] = @logger
+    set_active_record_logger_if_present!
     @app.call(env)
   rescue StandardError, LoadError, SyntaxError => exception
     log_exception(exception)
@@ -34,6 +35,12 @@ class Captivity
   
   private
   
+  def set_active_record_logger_if_present!
+    if defined?(ActiveRecord)
+      ActiveRecord::Base.logger = @logger
+    end
+  end
+  
   def log_exception(exception)
     @logger.fatal(
       "\t#{exception.class} (#{exception.message}):\n    " +

data/test/test_captivity.rb

@@ -34,4 +34,19 @@ class TestCaptivity < Test::Unit::TestCase
     assert_match /GET \/boom/, stream.string
   end
   
+  def test_captivity_injects_env_variable
+    stream = StringIO.new
+    
+    @app = Rack::Builder.app do
+       use Captivity, stream
+       inner = lambda do |env|
+         env["captivity.logger"].error("Variable is present!") 
+         [200, {'Content-Type' => 'text/plain'}, 'OK']
+       end
+       run inner
+    end
+    
+    get '/boom'
+    assert_match /Variable is present/, stream.string
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captivity
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1991590435747958573
+      hash: 2974344955014551893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: