logstasher 0.2.8 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmZkYWVkNWMxYzM5M2ViOWUyM2NhODE5NWY5YTc2YjA1ZWM4OWYyZA==
+  data.tar.gz: !binary |-
+    NzIzYjFjZDQ3ZWFmMmQzZTJkMzA5MzBhMGM4OGRhN2Q0MzBlMDM2OA==
+SHA512:
+  metadata.gz: !binary |-
+    MzVhODE3ZGZjNWYwNDUzMmMzZWNmMDk0Njg2NDMyYzhjOGM4OTlkYzNlNmJh
+    MGE2MjA4N2JjODM4YWYwYzdhMzhlZDc2OTM2NWI1ZTgzZmNmN2MwODUwMzgz
+    ZDA0ZTM0MTAyNjBmYzllNGM0NjA0ZjYyNzg3Yjk2ODQ3MTM0Njk=
+  data.tar.gz: !binary |-
+    YjJlY2FiZmJlYTMyY2M5NThjMzQyNjU5MTFiOTU4ODJhZGU0Y2NkZDM1YWE4
+    OWE5NDA5M2EwZjBlZTAyN2MxMGQyMDcyMDk0NWZlNTQzMmViYTMwMDdkMzA4
+    NjBlNDdiM2JiYTdiNDI0ZTBkZGU5MGM4MmIwMDJhNGM0YzQyYzE=

data/README.md

@@ -1,6 +1,7 @@
-# Logstasher - Awesome Logging for Rails [![Build Status](https://secure.travis-ci.org/shadabahmed/logstasher.png)](https://secure.travis-ci.org/shadabahmed/logstasher)
+# Logstasher [![Gem Version](https://badge.fury.io/rb/logstasher.png)](http://badge.fury.io/rb/logstasher) [![Build Status](https://secure.travis-ci.org/shadabahmed/logstasher.png)](https://secure.travis-ci.org/shadabahmed/logstasher)
+### Awesome Logging for Rails !!
 
-This gem is heavily inspired from [lograge](https://github.com/roidrage/lograge) but it's focused on one thing and one thing only. That's making your logs awesome like this:
+This gem is heavily inspired from [lograge](https://github.com/roidrage/lograge), but it's focused on one thing and one thing only. That's making your logs awesome like this:
 
 [![Awesome Logs](http://i.imgur.com/zZXWQNp.png)](http://i.imgur.com/zZXWQNp.png)
 

data/lib/logstasher.rb

@@ -47,7 +47,7 @@ module LogStasher
     app.config.action_dispatch.rack_cache[:verbose] = false if app.config.action_dispatch.rack_cache
     # Path instrumentation class to insert our hook
     require 'logstasher/rails_ext/action_controller/metal/instrumentation'
-    require 'logstash/event'
+    require 'logstash-event'
     self.suppress_app_logs(app)
     LogStasher::RequestLogSubscriber.attach_to :action_controller
     self.logger = app.config.logstasher.logger || Logger.new("#{Rails.root}/log/logstash_#{Rails.env}.log")

data/lib/logstasher/log_subscriber.rb

@@ -13,8 +13,9 @@ module LogStasher
       data.merge! extract_exception(payload)
       data.merge! extract_custom_fields(payload)
 
-      event = LogStash::Event.new('@fields' => data, '@tags' => ['request'])
-      event.tags << 'exception' if payload[:exception]
+      tags = ['request']
+      tags.push('exception') if payload[:exception]
+      event = LogStash::Event.new('@fields' => data, '@tags' => tags)
       LogStasher.logger << event.to_json + "\n"
     end
 

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/logstasher.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency "logstash-event"
+  s.add_runtime_dependency "logstash-event", ["~> 1.1.0"]
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"

data/spec/logstasher_logsubscriber_spec.rb

@@ -37,8 +37,8 @@ describe LogStasher::RequestLogSubscriber do
   describe '.process_action' do
     let!(:request_subscriber) { @request_subscriber ||= LogStasher::RequestLogSubscriber.new() }
     let(:payload) { {} }
-    let(:event)   { mock(:payload => payload) }
-    let(:logger)  { mock }
+    let(:event)   { double(:payload => payload) }
+    let(:logger)  { double }
     let(:json)    { "{\"@source\":\"unknown\",\"@tags\":[\"request\"],\"@fields\":{\"request\":true,\"status\":true,\"runtimes\":true,\"location\":true,\"exception\":true,\"custom\":true},\"@timestamp\":\"timestamp\"}\n" }
     before do
       LogStasher.stub(:logger => logger)
@@ -148,7 +148,7 @@ describe LogStasher::RequestLogSubscriber do
   end
 
   describe "with append_custom_params block specified" do
-    let(:request) { mock(:remote_ip => '10.0.0.1')}
+    let(:request) { double(:remote_ip => '10.0.0.1')}
     it "should add default custom data to the output" do
       request.stub(:params => event.payload[:params])
       LogStasher.add_default_fields_to_payload(event.payload, request)

data/spec/logstasher_spec.rb

@@ -35,7 +35,7 @@ describe LogStasher do
   describe '.appened_default_info_to_payload' do
     let(:params)  { {'a' => '1', 'b' => 2, 'action' => 'action', 'controller' => 'test'}.with_indifferent_access }
     let(:payload) { {:params => params} }
-    let(:request) { mock(:params => params, :remote_ip => '10.0.0.1')}
+    let(:request) { double(:params => params, :remote_ip => '10.0.0.1')}
     after do
       LogStasher.custom_fields = []
     end
@@ -58,16 +58,16 @@ describe LogStasher do
   end
 
   describe '.setup' do
-    let(:logger) { mock }
-    let(:logstasher_config) { mock(:logger => logger,:log_level => 'warn') }
-    let(:config) { mock(:logstasher => logstasher_config) }
-    let(:app) { mock(:config => config) }
+    let(:logger) { double }
+    let(:logstasher_config) { double(:logger => logger,:log_level => 'warn') }
+    let(:config) { double(:logstasher => logstasher_config) }
+    let(:app) { double(:config => config) }
     before do
-      config.stub(:action_dispatch => mock(:rack_cache => false))
+      config.stub(:action_dispatch => double(:rack_cache => false))
     end
     it 'defines a method in ActionController::Base' do
       LogStasher.should_receive(:require).with('logstasher/rails_ext/action_controller/metal/instrumentation')
-      LogStasher.should_receive(:require).with('logstash/event')
+      LogStasher.should_receive(:require).with('logstash-event')
       LogStasher.should_receive(:suppress_app_logs).with(app)
       LogStasher::RequestLogSubscriber.should_receive(:attach_to).with(:action_controller)
       logger.should_receive(:level=).with('warn')
@@ -78,8 +78,8 @@ describe LogStasher do
   end
 
   describe '.suppress_app_logs' do
-    let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => true))}
-    let(:app){ mock(:config => logstasher_config)}
+    let(:logstasher_config){ double(:logstasher => double(:suppress_app_log => true))}
+    let(:app){ double(:config => logstasher_config)}
     it 'removes existing subscription if enabled' do
       LogStasher.should_receive(:require).with('logstasher/rails_ext/rack/logger')
       LogStasher.should_receive(:remove_existing_log_subscriptions)
@@ -87,7 +87,7 @@ describe LogStasher do
     end
 
     context 'when disabled' do
-      let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => false)) }
+      let(:logstasher_config){ double(:logstasher => double(:suppress_app_log => false)) }
       it 'does not remove existing subscription' do
         LogStasher.should_not_receive(:remove_existing_log_subscriptions)
         LogStasher.suppress_app_logs(app)
@@ -95,7 +95,7 @@ describe LogStasher do
 
       describe "backward compatibility" do
         context 'with spelling "supress_app_log"' do
-          let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => nil, :supress_app_log => false)) }
+          let(:logstasher_config){ double(:logstasher => double(:suppress_app_log => nil, :supress_app_log => false)) }
           it 'does not remove existing subscription' do
             LogStasher.should_not_receive(:remove_existing_log_subscriptions)
             LogStasher.suppress_app_logs(app)
@@ -120,7 +120,7 @@ describe LogStasher do
   end
 
   describe '.log' do
-    let(:logger) { mock() }
+    let(:logger) { double() }
     before do
       LogStasher.logger = logger
       LogStash::Time.stub(:now => 'timestamp')

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ if ENV['COVERAGE']
   end
 end
 
-# Modify load path so you can require 'multi_config' directly.
+# Modify load path so you can require 'ogstasher directly.
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require 'rubygems'

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 0.2.8
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -101,33 +92,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/shadabahmed/logstasher
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3954603627372273553
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3954603627372273553
 requirements: []
 rubyforge_project: logstasher
-rubygems_version: 1.8.25
+rubygems_version: 2.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Awesome rails logs
 test_files:
 - spec/logstasher_logsubscriber_spec.rb