logstash_rails 0.0.6 → 0.0.7

data/Gemfile

@@ -12,4 +12,5 @@ end
 group :test do
   gem 'minitest', require: 'minitest/autorun'
   gem 'fakeredis'
+  gem 'mocha', require: false
 end

data/README.md

@@ -2,8 +2,24 @@
 
 Send Logstash events from a Rails application to Redis.
 
+## Installation
 
-## Usage
+In your applications Gemfile:
+
+```ruby
+gem 'logstash_rails'
+```
+
+For the latest version:
+
+```ruby
+gem 'logstash_rails', github: 'cmertz/logstash_rails'
+```
+
+Provide an initializer (e.g. config/initializers/logstash_rails.rb) for
+specific configuration.
+
+### Configuration
 
 **LogstashRails.config** takes a redis connection, the redis key for the list
 to push to and a flag that enables to catch all events (i.e. /.\*/)
@@ -30,6 +46,4 @@ end
 
 ## TODO
 
-* remove implicit mapping from event type names to formatter classes (i.e. make that an explicit lookup table)
-* reset config upon call to LogstashRails.config
-* add formatter for more events (e.g. actionmailer, actionview, ...)
+* more independent from Rails i.e. check defined?(Rails) and provide fallbacks (for logger and application name)

data/lib/logstash_rails/formatter.rb

@@ -1,41 +1,30 @@
 require 'logstash-event'
 require 'socket'
-require 'active_support/core_ext/string/inflections'
-
-Dir["#{File.dirname(__FILE__)}/formatter/*.rb"].each do |file|
-  require file
-end
 
 module LogstashRails
   module Formatter
 
-    def self.format(event_type, *args)
-      json_event(event_type, *args)
-    end
-
-    private
+    def self.format(event_type, start, finish, id, payload)
+      fields = {
+        process_id: $$,
+        host: Socket.gethostname
+      }
 
-    def self.json_event(event_type, start, finish, id, payload)
-      event = LogStash::Event.new
+      event = LogStash::Event.new(payload.merge!(fields))
 
-      event.message   = event_type
       event.timestamp = start
-      event.source    = Socket.gethostname
-
-      event.fields['pid'] = $$
-      event.fields['id']  = id
-
-      formatter(event_type).format(event, payload)
+      event.message   = event_type
+      event.source    = application_name
 
       event.to_json
     end
 
-    def self.formatter(event_type)
-      const_get(event_type.gsub('.','_').camelize.to_sym)
-    end
+    private
 
-    def self.can_handle?(event_type)
-      const_defined?(event_type.gsub('.','_').camelize.to_sym) rescue false
+    def self.application_name
+      if defined?(Rails)
+        Rails.application.class.parent_name
+      end
     end
 
   end

data/lib/logstash_rails/version.rb

@@ -1,3 +1,3 @@
 module LogstashRails
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/logstash_rails.rb

@@ -48,8 +48,6 @@ module LogstashRails
     private
 
     def push(event_type, *args)
-      return unless Formatter.can_handle?(event_type)
-
       begin
         @redis.rpush(@key, Formatter.format(event_type, *args))
       rescue

data/spec/error_spec.rb

@@ -1,38 +1,16 @@
 require 'spec_helper'
+require 'mocha/setup'
 
 describe 'error behaviour' do
 
-  before do
-    Redis::Connection::Memory.reset_all_databases
-    LogstashRails.config(redis)
-    ActiveSupport::Notifications.instrument("process_action.action_controller")
-  end
-
-  def redis
-    Redis.new
-  end
-
   it 'logs exception traces to the Rails logger' do
-    skip
-
-    Rails = Class.new do
-      def self.logger
-        @logger_mock ||= MiniTest::Mock.new
-      end
-    end
-
-    Rails.logger.expect(:error, nil, [String])
+    logger = MiniTest::Mock.new
+    logger.expect(:error, nil, [String])
+    LogstashRails.stubs(:log).returns(logger)
 
     LogstashRails.config(1)
 
     ActiveSupport::Notifications.instrument("process_action.action_controller")
   end
 
-  it 'survives weird event type names' do
-    skip
-
-    LogstashRails.config(redis)
-    ActiveSupport::Notifications.instrument("!!!")
-  end
-
 end

data/spec/subscription_spec.rb

@@ -18,14 +18,6 @@ describe LogstashRails do
     redis.lpop('logstash').wont_be_nil
   end
 
-  it 'does not handle unknown events' do
-    LogstashRails.config(redis)
-
-    ActiveSupport::Notifications.instrument("toto")
-
-    redis.lpop('logstash').must_be_nil
-  end
-
   it 'does not handle events unless told to' do
     LogstashRails.config(redis, 'logtstash', false)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -74,7 +74,6 @@ files:
 - Rakefile
 - lib/logstash_rails.rb
 - lib/logstash_rails/formatter.rb
-- lib/logstash_rails/formatter/process_action_action_controller.rb
 - lib/logstash_rails/version.rb
 - logstash_rails.gemspec
 - spec/config_spec.rb
@@ -97,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -258313220111572074
+      hash: -4390785812541147448
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -106,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -258313220111572074
+      hash: -4390785812541147448
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/logstash_rails/formatter/process_action_action_controller.rb

@@ -1,16 +0,0 @@
-module LogstashRails
-  module Formatter
-    class ProcessActionActionController
-
-      def self.format(event, payload)
-        event.fields['http_verb']  = payload[:method]
-        event.fields['controller'] = payload[:controller]
-        event.fields['action']     = payload[:action]
-        event.fields['path']       = payload[:path]
-        event.fields['status']     = payload[:status]
-        event.fields['params']     = payload[:params]
-      end
-
-    end
-  end
-end