lograge 0.2.0 → 0.2.1

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 1.9.2
+  - 2.0.0
 script: bundle exec rspec

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 
 group :test do
   gem 'actionpack'
-  gem 'logstash-event'
+  gem 'logstash-event', '1.1.5'
 end

data/README.md

@@ -70,19 +70,47 @@ MyApp::Application.configure do
   # if it's a lambda then it must return a hash
   config.lograge.custom_options = lambda do |event|
     # capture some specific timing values you are interested in
-    {:name => "value", :timing => some_float.round(2)}
+    {:name => "value", :timing => some_float.round(2), :host => event.payload[:host]}
+  end
+end
+```
+
+You can then add custom variables to the event to be used in custom_options
+
+```ruby
+# app/controllers/application_controller.rb
+class ApplicationController < ActionController::Base
+  def append_info_to_payload(payload)
+    super
+    payload[:host] = request.host
+  end
+end
+```
+
+To further clean up your logging, you can also tell Lograge to skip log messages 
+meeting given criteria.  You can skip log messages generated from certain controller
+actions, or you can write a custom handler to skip messages based on data in the log event:
+
+```ruby
+# config/environments/production.rb
+MyApp::Application.configure do
+  config.lograge.enabled = true
+
+  config.lograge.ignore_actions = ['home#index', 'aController#anAction']
+  config.lograge.ignore_custom = lambda do |event|
+    # return true here if you want to ignore based on the event
   end
 end
 ```
 
 Lograge supports multiple output formats. The most common is the default
-lograge format described above. Alternatively, you can also generate JSON
-logs in the json_event format used by [Logstash](http://logstash.net/).
+lograge key-value format described above. Alternatively, you can also generate
+JSON logs in the json_event format used by [Logstash](http://logstash.net/).
 
 ```ruby
 # config/environments/production.rb
 MyApp::Application.configure do
-  config.lograge.log_format = :logstash
+  config.lograge.formatter = Lograge::Formatters::Logstash.new
 end
 ```
 
@@ -95,6 +123,26 @@ gem "logstash-event"
 
 Done.
 
+The available formatters are:
+
+```ruby
+  Lograge::Formatters::Cee.new
+  Lograge::Formatters::Graylog2.new
+  Lograge::Formatters::KeyValue.new  # default lograge format
+  Lograge::Formatters::Logstash.new
+  Lograge::Formatters::Raw.new       # Returns a ruby hash object
+```
+
+In addition to the formatters, you can manipulate the data your self by passing
+an object which responds to #call:
+
+```ruby
+# config/environments/production.rb
+MyApp::Application.configure do
+  config.lograge.formatter = ->(data) { "Called #{data[:controller]}" } # data is a ruby hash
+end
+```
+
 **Internals**
 
 Thanks to the notification system that was introduced in Rails 3, replacing the

data/lib/lograge.rb

@@ -1,9 +1,15 @@
 require 'lograge/version'
+require 'lograge/formatters/cee'
+require 'lograge/formatters/graylog2'
+require 'lograge/formatters/key_value'
+require 'lograge/formatters/logstash'
+require 'lograge/formatters/raw'
 require 'lograge/log_subscriber'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/ordered_options'
 
+
 module Lograge
   mattr_accessor :logger
 
@@ -24,13 +30,51 @@ module Lograge
     end
   end
 
+  # Set conditions for events that should be ignored
+  #
+  # Currently supported formats are:
+  #  - A single string representing a controller action, e.g. 'users#sign_in'
+  #  - An array of strings representing controller actions
+  #  - An object that responds to call with an event argument and returns
+  #    true iff the event should be ignored.
+  #
+  # The action ignores are given to 'ignore_actions'. The callable ignores 
+  # are given to 'ignore'.  Both methods can be called multiple times, which
+  # just adds more ignore conditions to a list that is checked before logging.
+
+  def self.ignore_actions(actions)
+    ignore(lambda do |event|
+      params = event.payload[:params]
+      Array(actions).include?("#{params['controller']}##{params['action']}")
+    end)
+  end
+
+  def self.ignore_tests
+    @@ignore_tests ||= []
+  end
+
+  def self.ignore(test)
+    ignore_tests.push(test) if test
+  end
+
+  def self.ignore_nothing
+    @@ignore_tests = []
+  end
+
+  def self.ignore?(event)
+    ignore_tests.any?{|ignore_test| ignore_test.call(event)}
+  end
+
+  # Loglines are emitted with this log level
+  mattr_accessor :log_level
+  self.log_level = :info
+
   # The emitted log format
   #
   # Currently supported formats are>
   #  - :lograge - The custom tense lograge format
   #  - :logstash - JSON formatted as a Logstash Event.
-  mattr_accessor :log_format
-  self.log_format = :lograge
+  mattr_accessor :formatter
 
   def self.remove_existing_log_subscriptions
     ActiveSupport::LogSubscriber.log_subscribers.each do |subscriber|
@@ -60,15 +104,19 @@ module Lograge
     Lograge.remove_existing_log_subscriptions
     Lograge::RequestLogSubscriber.attach_to :action_controller
     Lograge.custom_options = app.config.lograge.custom_options
-    Lograge.log_format = app.config.lograge.log_format || :lograge
-    case Lograge.log_format.to_s
-    when "logstash"
-      begin
-        require "logstash-event"
-      rescue LoadError
-        puts "You need to install the logstash-event gem to use the logstash output."
-        raise
-      end
+    Lograge.log_level = app.config.lograge.log_level || :info
+    self.support_deprecated_config(app) # TODO: Remove with version 1.0
+    Lograge.formatter = app.config.lograge.formatter || Lograge::Formatters::KeyValue.new
+    Lograge.ignore_actions(app.config.lograge.ignore_actions)
+    Lograge.ignore(app.config.lograge.ignore_custom)
+  end
+
+  # TODO: Remove with version 1.0
+  def self.support_deprecated_config(app)
+    if legacy_log_format = app.config.lograge.log_format
+      ActiveSupport::Deprecation.warn 'config.lograge.log_format is deprecated. Use config.lograge.formatter instead.', caller
+      legacy_log_format = :key_value if legacy_log_format == :lograge
+      app.config.lograge.formatter = "Lograge::Formatters::#{legacy_log_format.to_s.classify}".constantize.new
     end
   end
 end

data/lib/lograge/formatters/cee.rb

@@ -0,0 +1,9 @@
+module Lograge
+  module Formatters
+    class Cee
+      def call(data)
+        "@cee: #{JSON.dump(data)}"
+      end
+    end
+  end
+end

data/lib/lograge/formatters/graylog2.rb

@@ -0,0 +1,19 @@
+module Lograge
+  module Formatters
+    class Graylog2
+      def call(data)
+        # Cloning because we don't want to mess with the original when mutating keys.
+        my = data.clone
+
+        base = {
+          :short_message => "[#{my[:status]}] #{my[:method]} #{my[:path]} (#{my[:controller]}##{my[:action]})"
+        }
+
+        # Add underscore to every key to follow GELF additional field syntax.
+        my.keys.each { |k| my["_#{k}".to_sym] = my[k]; my.delete(k) }
+
+        my.merge(base)
+      end
+    end
+  end
+end

data/lib/lograge/formatters/key_value.rb

@@ -0,0 +1,29 @@
+module Lograge
+  module Formatters
+    class KeyValue
+      LOGRAGE_FIELDS = [
+        :method, :path, :format, :controller, :action, :status, :error,
+        :duration, :view, :db, :location
+      ]
+
+      def call(data)
+        fields  = LOGRAGE_FIELDS
+        fields += (data.keys - LOGRAGE_FIELDS)
+
+        event = fields.inject([]) do |message, key|
+          next message unless data.has_key?(key)
+          # Exactly preserve the previous output
+          # Parsing this can be ambigious if the error messages contains
+          # a single quote
+          data[key] = "'#{data[key]}'" if key == :error
+          # Ensure that we always have exactly two decimals
+          data[key] = "%.2f" % data[key] if data[key].is_a? Float
+
+          message << "#{key}=#{data[key]}"
+          message
+        end
+        event.join(" ")
+      end
+    end
+  end
+end

data/lib/lograge/formatters/logstash.rb

@@ -0,0 +1,19 @@
+module Lograge
+  module Formatters
+    class Logstash
+      def call(data)
+        load_dependencies
+        event = LogStash::Event.new("@fields" => data)
+        event.message = "[#{data[:status]}] #{data[:method]} #{data[:path]} (#{data[:controller]}##{data[:action]})"
+        event.to_json
+      end
+
+      def load_dependencies
+        require "logstash-event"
+      rescue LoadError
+        puts "You need to install the logstash-event gem to use the logstash output."
+        raise
+      end
+    end
+  end
+end

data/lib/lograge/formatters/raw.rb

@@ -0,0 +1,9 @@
+module Lograge
+  module Formatters
+    class Raw
+      def call(data)
+        data
+      end
+    end
+  end
+end

data/lib/lograge/log_subscriber.rb

@@ -1,9 +1,13 @@
+require 'json'
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
 module Lograge
   class RequestLogSubscriber < ActiveSupport::LogSubscriber
     def process_action(event)
+      return if Lograge.ignore?(event)
+      
       payload = event.payload
 
       data      = extract_request(payload)
@@ -12,49 +16,8 @@ module Lograge
       data.merge! location(event)
       data.merge! custom_options(event)
 
-      logger.info send(:"process_action_#{Lograge.log_format}", data)
-    end
-
-    LOGRAGE_FIELDS = [
-      :method, :path, :format, :controller, :action, :status, :error,
-      :duration, :view, :db, :location
-    ]
-    def process_action_lograge(data)
-      fields  = LOGRAGE_FIELDS
-      fields += (data.keys - LOGRAGE_FIELDS)
-
-      event = fields.inject([]) do |message, key|
-        next message unless data.has_key?(key)
-        # Exactly preserve the previous output
-        # Parsing this can be ambigious if the error messages contains
-        # a single quote
-        data[key] = "'#{data[key]}'" if key == :error
-        # Ensure that we always have exactly two decimals
-        data[key] = "%.2f" % data[key] if data[key].is_a? Float
-
-        message << "#{key}=#{data[key]}"
-        message
-      end
-      event.join(" ")
-    end
-
-    def process_action_logstash(data)
-      event = LogStash::Event.new("@fields" => data)
-      event.to_json
-    end
-
-    def process_action_graylog2(data)
-      # Cloning because we don't want to mess with the original when mutating keys.
-      my = data.clone
-
-      base = {
-        :short_message => "[#{my[:status]}] #{my[:method]} #{my[:path]} (#{my[:controller]}##{my[:action]})"
-      }
-
-      # Add underscore to every key to follow GELF additional field syntax.
-      my.keys.each { |k| my["_#{k}".to_sym] = my[k]; my.delete(k) }
-
-      my.merge(base)
+      formatted_message = Lograge.formatter.call(data)
+      logger.send(Lograge.log_level, formatted_message)
     end
 
     def redirect_to(event)
@@ -63,6 +26,10 @@ module Lograge
 
     private
 
+    def logger
+      Lograge.logger.presence or super
+    end
+
     def extract_request(payload)
       {
         :method => payload[:method],

data/lib/lograge/rails_ext/rack/logger.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 require 'rails/rack/logger'
 
 module Rails

data/lib/lograge/version.rb

@@ -1,3 +1,3 @@
 module Lograge
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lograge.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
   s.add_development_dependency "guard-rspec"
-  s.add_runtime_dependency "activesupport"
-  s.add_runtime_dependency "actionpack"
+  s.add_runtime_dependency "activesupport", '>= 3'
+  s.add_runtime_dependency "actionpack", '>= 3'
+  s.add_runtime_dependency "railties", '>= 3'
 end

data/spec/formatters/cee_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+require 'lograge'
+
+describe Lograge::Formatters::Cee do
+  it { expect( subject.call({})).to match(/^@cee/) }
+  it { expect(subject.call({ custom: 'data'})).to match('{"custom":"data"}') }
+end

data/spec/formatters/graylog2_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'lograge'
+
+describe Lograge::Formatters::Graylog2 do
+  let(:payload) do
+    {
+      custom: 'data',
+      status: 200,
+      method: 'GET',
+      path: '/',
+      controller: 'welcome',
+      action: 'index'
+    }
+  end
+  subject { described_class.new.call(payload) }
+  it { expect(subject[:_custom]).to eq('data') }
+  it { expect(subject[:short_message]).to eq('[200] GET / (welcome#index)') }
+end

data/spec/formatters/key_value_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'lograge'
+
+describe Lograge::Formatters::KeyValue do
+  let(:payload) do
+    {
+      custom: 'data',
+      status: 200,
+      method: 'GET',
+      path: '/',
+      controller: 'welcome',
+      action: 'index'
+    }
+  end
+  subject { described_class.new.call(payload) }
+
+  it { should include('method=GET') }
+  it { should include('path=/') }
+  it { should include('controller=welcome') }
+  it { should include('action=index') }
+  it { should include('status=200') }
+  it { should include('custom=data') }
+end

data/spec/formatters/logstash_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'lograge'
+
+describe Lograge::Formatters::Logstash do
+  let(:payload) do
+    {
+      custom: 'data',
+      status: 200,
+      method: 'GET',
+      path: '/',
+      controller: 'welcome',
+      action: 'index'
+    }
+  end
+  subject { described_class.new.call(payload) }
+  it { should match(/"@source":"unknown"/) }
+  it { should match(/"@tags":\[\]/) }
+  it { should match(/"@fields":{/) }
+  it { should match(/"custom":"data"/) }
+  it { should match(/"status":200/) }
+  it { should match(/"method":"GET"/) }
+  it { should match(/"path":"\/"/) }
+  it { should match(/"controller":"welcome"/) }
+  it { should match(/"action":"index"/) }
+end

data/spec/formatters/raw_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'lograge'
+
+describe Lograge::Formatters::Raw do
+  it { expect( subject.call({ custom: 'data' })).to eq({ custom: 'data' }) }
+end

data/spec/lograge_logsubscriber_spec.rb

@@ -8,15 +8,8 @@ require 'logger'
 describe Lograge::RequestLogSubscriber do
   let(:log_output) {StringIO.new}
   let(:logger) {
-    logger = Logger.new(log_output)
-    logger.formatter = ->(_, _, _, msg) {
-      msg
-    }
-    logger
+    Logger.new(log_output).tap {|logger| logger.formatter = ->(_, _, _, msg) { msg } }
   }
-  before do
-    Lograge::RequestLogSubscriber.logger = logger
-  end
 
   let(:subscriber) {Lograge::RequestLogSubscriber.new}
   let(:event) {
@@ -28,16 +21,46 @@ describe Lograge::RequestLogSubscriber do
       }
     )
   }
-
   let(:redirect) {
     ActiveSupport::Notifications::Event.new(
       'redirect_to.action_controller', Time.now, Time.now, 1, location: 'http://example.com', status: 302
     )
   }
 
+  before { Lograge.logger = logger }
+
+  describe "with custom_options configured for cee output" do
+    before do
+      Lograge::formatter = ->(data) { "My test: #{data}" }
+    end
+
+    it "should combine the hash properly for the output" do
+      Lograge.custom_options = {:data => "value"}
+      subscriber.process_action(event)
+      log_output.string.should =~ /^My test: {.*:data=>"value"/
+    end
+    it "should combine the output of a lambda properly" do
+      Lograge.custom_options = lambda {|event| {:data => "value"}}
+      subscriber.process_action(event)
+      log_output.string.should =~ /^My test: {.*:data=>"value"/
+    end
+    it "should work if the method returns nil" do
+      Lograge.custom_options = lambda {|event| nil}
+      subscriber.process_action(event)
+      log_output.string.should be_present
+    end
+  end
+
+  describe "when processing a redirect" do
+    it "should store the location in a thread local variable" do
+      subscriber.redirect_to(redirect)
+      Thread.current[:lograge_location].should == "http://example.com"
+    end
+  end
+
   describe "when processing an action with lograge output" do
     before do
-      Lograge::log_format = :lograge
+      Lograge.formatter = Lograge::Formatters::KeyValue.new
     end
 
     it "should include the URL in the log output" do
@@ -117,234 +140,101 @@ describe Lograge::RequestLogSubscriber do
     end
   end
 
-  describe "when processing an action with logstash output" do
+  describe "with custom_options configured for lograge output" do
     before do
-      require 'logstash-event'
-      Lograge::log_format = :logstash
+      Lograge.formatter = Lograge::Formatters::KeyValue.new
     end
 
-    it "should include the URL in the log output" do
-      subscriber.process_action(event)
-      log_output.string.should include('/home')
-    end
-
-    it "should start include the HTTP method" do
-      subscriber.process_action(event)
-      log_output.string.should include('"method":"GET"')
-    end
-
-    it "should include the status code" do
-      subscriber.process_action(event)
-      log_output.string.should include('"status":200')
-    end
-
-    it "should include the controller and action" do
-      subscriber.process_action(event)
-      log_output.string.should include('"controller":"home"')
-      log_output.string.should include('"action":"index"')
-    end
-
-    it "should include the duration" do
-      subscriber.process_action(event)
-      log_output.string.should =~ /"duration":\d+\.\d{0,2}/
-    end
-
-    it "should include the view rendering time" do
-      subscriber.process_action(event)
-      log_output.string.should =~ /"view":0.01/
-    end
-
-    it "should include the database rendering time" do
-      subscriber.process_action(event)
-      log_output.string.should =~ /"db":0.02/
-    end
-
-    it "should add a 500 status when an exception occurred" do
-      event.payload[:status] = nil
-      event.payload[:exception] = ['AbstractController::ActionNotFound', 'Route not found']
+    it "should combine the hash properly for the output" do
+      Lograge.custom_options = {:data => "value"}
       subscriber.process_action(event)
-      log_output.string.should =~ /"status":500/
-      log_output.string.should =~ /"error":"AbstractController::ActionNotFound:Route not found"/
+      log_output.string.should =~ / data=value/
     end
-
-    it "should return an unknown status when no status or exception is found" do
-      event.payload[:status] = nil
-      event.payload[:exception] = nil
+    it "should combine the output of a lambda properly" do
+      Lograge.custom_options = lambda {|event| {:data => "value"}}
       subscriber.process_action(event)
-      log_output.string.should =~ /"status":0/
-    end
-
-    describe "with a redirect" do
-      before do
-        Thread.current[:lograge_location] = "http://www.example.com"
-      end
-
-      it "should add the location to the log line" do
-        subscriber.process_action(event)
-        log_output.string.should =~ %r{"location":"http://www.example.com"}
-      end
-
-      it "should remove the thread local variable" do
-        subscriber.process_action(event)
-        Thread.current[:lograge_location].should == nil
-      end
+      log_output.string.should =~ / data=value/
     end
-
-    it "should not include a location by default" do
+    it "should work if the method returns nil" do
+      Lograge.custom_options = lambda {|event| nil}
       subscriber.process_action(event)
-      log_output.string.should_not =~ /"location":/
+      log_output.string.should be_present
     end
   end
 
-  describe "when processing an action with graylog2 output" do
+  describe "with ignore configured" do
     before do
-      Lograge::log_format = :graylog2
-    end
-
-    it "should include the URL in the log output" do
-      subscriber.process_action(event)
-      log_output.string.should include(':_path=>"/home"')
+      # Lograge::log_format = :lograge
+      Lograge::ignore_nothing # clear the old ignores before each test
     end
 
-    it "should start include the HTTP method" do
+    it "should not log ignored controller actions given a single ignored action" do
+      Lograge.ignore_actions 'home#index'
       subscriber.process_action(event)
-      log_output.string.should include(':_method=>"GET"')
+      log_output.string.should  be_blank
     end
 
-    it "should include the status code" do
-      subscriber.process_action(event)
-      log_output.string.should include(':_status=>200')    end
-
-    it "should include the controller and action" do
+    it "should not log ignored controller actions given a single ignored action after a custom ignore" do
+      Lograge.ignore(lambda {|event| false})
+      Lograge.ignore_actions 'home#index'
       subscriber.process_action(event)
-      log_output.string.should include(':_controller=>"home"')
-      log_output.string.should include(':_action=>"index"')
+      log_output.string.should be_blank
     end
 
-    it "should include the duration" do
+    it "should log non-ignored controller actions given a single ignored action" do
+      Lograge.ignore_actions 'foo#bar'
       subscriber.process_action(event)
-      log_output.string.should =~ /:_duration=>\d+\.\d{0,2}/
+      log_output.string.should_not be_blank
     end
 
-    it "should include the view rendering time" do
+    it "should not log ignored controller actions given multiple ignored actions" do
+      Lograge.ignore_actions ['foo#bar', 'home#index', 'bar#foo']
       subscriber.process_action(event)
-      log_output.string.should include(':_view=>0.01')
+      log_output.string.should be_blank
     end
 
-    it "should include the database rendering time" do
+    it "should log non-ignored controller actions given multiple ignored actions" do
+      Lograge.ignore_actions ['foo#bar', 'bar#foo']
       subscriber.process_action(event)
-      log_output.string.should include(':_db=>0.02')
+      log_output.string.should_not be_blank
     end
 
-    it "should add a 500 status when an exception occurred" do
-      event.payload[:status] = nil
-      event.payload[:exception] = ['AbstractController::ActionNotFound', 'Route not found']
+    it "should not log ignored events" do
+      Lograge.ignore(lambda do |event|
+        'GET' == event.payload[:method]
+      end)
       subscriber.process_action(event)
-      log_output.string.should include(':_status=>500')
-      log_output.string.should include(':_error=>"AbstractController::ActionNotFound:Route not found"')
-    end
-
-    it "should return an unknown status when no status or exception is found" do
-      event.payload[:status] = nil
-      event.payload[:exception] = nil
-      subscriber.process_action(event)
-      log_output.string.should include(':_status=>0')
-    end
-
-    describe "with a redirect" do
-      before do
-        Thread.current[:lograge_location] = "http://www.example.com"
-      end
-
-      it "should add the location to the log line" do
-        subscriber.process_action(event)
-        log_output.string.should include(':_location=>"http://www.example.com"')
-      end
-
-      it "should remove the thread local variable" do
-        subscriber.process_action(event)
-        Thread.current[:lograge_location].should == nil
-      end
+      log_output.string.should be_blank
     end
 
-    it "should not include a location by default" do
+    it "should log non-ignored events" do
+      Lograge.ignore(lambda do |event|
+        'foo' == event.payload[:method]
+      end)
       subscriber.process_action(event)
-      log_output.string.should_not =~ /"location":/
-    end
-  end
-
-  describe "with custom_options configured for graylog2 output" do
-    before do
-      Lograge::log_format = :graylog2
+      log_output.string.should_not be_blank
     end
 
-    it "should combine the hash properly for the output" do
-      Lograge.custom_options = {:data => "value"}
+    it "should not choke on nil ignore_actions input" do
+      Lograge.ignore_actions nil
       subscriber.process_action(event)
-      log_output.string.should include(':_data=>"value"')
+      log_output.string.should_not be_blank
     end
 
-    it "should combine the output of a lambda properly" do
-      Lograge.custom_options = lambda {|event| {:data => "value"}}
+    it "should not choke on nil ignore input" do
+      Lograge.ignore nil
       subscriber.process_action(event)
-      log_output.string.should include(':_data=>"value"')
-    end
-
-    it "should work if the method returns nil" do
-      Lograge.custom_options = lambda {|event| nil}
-      subscriber.process_action(event)
-      log_output.string.should be_present
+      log_output.string.should_not be_blank
     end
   end
 
-  describe "with custom_options configured for lograge output" do
-    before do
-      Lograge::log_format = :lograge
-    end
+  it "should fallback to ActiveSupport's logger if one isn't configured" do
+    Lograge.formatter = Lograge::Formatters::KeyValue.new
+    Lograge.logger = nil
+    ActiveSupport::LogSubscriber.logger = logger
 
-    it "should combine the hash properly for the output" do
-      Lograge.custom_options = {:data => "value"}
-      subscriber.process_action(event)
-      log_output.string.should =~ / data=value/
-    end
-    it "should combine the output of a lambda properly" do
-      Lograge.custom_options = lambda {|event| {:data => "value"}}
-      subscriber.process_action(event)
-      log_output.string.should =~ / data=value/
-    end
-    it "should work if the method returns nil" do
-      Lograge.custom_options = lambda {|event| nil}
-      subscriber.process_action(event)
-      log_output.string.should be_present
-    end
-  end
+    subscriber.process_action(event)
 
-  describe "with custom_options configured for logstash output" do
-    before do
-      Lograge::log_format = :logstash
-    end
-
-    it "should combine the hash properly for the output" do
-      Lograge.custom_options = {:data => "value"}
-      subscriber.process_action(event)
-      log_output.string.should =~ /"data":"value"/
-    end
-    it "should combine the output of a lambda properly" do
-      Lograge.custom_options = lambda {|event| {:data => "value"}}
-      subscriber.process_action(event)
-      log_output.string.should =~ /"data":"value"/
-    end
-    it "should work if the method returns nil" do
-      Lograge.custom_options = lambda {|event| nil}
-      subscriber.process_action(event)
-      log_output.string.should be_present
-    end
-  end
-
-  describe "when processing a redirect" do
-    it "should store the location in a thread local variable" do
-      subscriber.redirect_to(redirect)
-      Thread.current[:lograge_location].should == "http://example.com"
-    end
+    log_output.string.should be_present
   end
 end

data/spec/lograge_spec.rb

@@ -37,4 +37,48 @@ describe Lograge do
       listeners.size.should > 0
     end
   end
+
+  describe 'deprecated log_format interpreter' do
+    let(:app_config) do
+      double(config:
+        ActiveSupport::OrderedOptions.new.tap do |config|
+          config.action_dispatch = double(rack_cache: false)
+          config.lograge = ActiveSupport::OrderedOptions.new
+          config.lograge.log_format = format
+        end
+      )
+    end
+    before { ActiveSupport::Deprecation.silence { Lograge.setup(app_config) } }
+    subject { Lograge.formatter }
+
+    context ':cee' do
+      let(:format) { :cee }
+      it { should be_instance_of(Lograge::Formatters::Cee) }
+    end
+
+    context ':raw' do
+      let(:format) { :raw }
+      it { should be_instance_of(Lograge::Formatters::Raw) }
+    end
+
+    context ':logstash' do
+      let(:format) { :logstash }
+      it { should be_instance_of(Lograge::Formatters::Logstash) }
+    end
+
+    context ':graylog2' do
+      let(:format) { :graylog2 }
+      it { should be_instance_of(Lograge::Formatters::Graylog2) }
+    end
+
+    context ':lograge' do
+      let(:format) { :lograge }
+      it { should be_instance_of(Lograge::Formatters::KeyValue) }
+    end
+
+    context 'default' do
+      let(:format) { nil }
+      it { should be_instance_of(Lograge::Formatters::KeyValue) }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lograge
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Tame Rails' multi-line logging into a single line per request
 email:
 - meyer@paperplanes.de
@@ -90,11 +106,21 @@ files:
 - README.md
 - Rakefile
 - lib/lograge.rb
+- lib/lograge/formatters/cee.rb
+- lib/lograge/formatters/graylog2.rb
+- lib/lograge/formatters/key_value.rb
+- lib/lograge/formatters/logstash.rb
+- lib/lograge/formatters/raw.rb
 - lib/lograge/log_subscriber.rb
 - lib/lograge/rails_ext/rack/logger.rb
 - lib/lograge/railtie.rb
 - lib/lograge/version.rb
 - lograge.gemspec
+- spec/formatters/cee_spec.rb
+- spec/formatters/graylog2_spec.rb
+- spec/formatters/key_value_spec.rb
+- spec/formatters/logstash_spec.rb
+- spec/formatters/raw_spec.rb
 - spec/lograge_logsubscriber_spec.rb
 - spec/lograge_spec.rb
 - spec/spec_helper.rb
@@ -123,6 +149,11 @@ signing_key:
 specification_version: 3
 summary: Tame Rails' multi-line logging into a single line per request
 test_files:
+- spec/formatters/cee_spec.rb
+- spec/formatters/graylog2_spec.rb
+- spec/formatters/key_value_spec.rb
+- spec/formatters/logstash_spec.rb
+- spec/formatters/raw_spec.rb
 - spec/lograge_logsubscriber_spec.rb
 - spec/lograge_spec.rb
 - spec/spec_helper.rb